]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-3.0-3.18.3-201501211944.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.18.3-201501211944.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index 9de9813..1462492 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -3,9 +3,11 @@
6 *.bc
7 *.bin
8 *.bz2
9 +*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13 +*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17 @@ -15,6 +17,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -51,14 +54,17 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *.xz
32 *_MODULES
33 +*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37 *.9
38 -.*
39 +.[^g]*
40 +.gen*
41 .*.d
42 .mm
43 53c700_d.h
44 @@ -72,9 +78,11 @@ Image
45 Module.markers
46 Module.symvers
47 PENDING
48 +PERF*
49 SCCS
50 System.map*
51 TAGS
52 +TRACEEVENT-CFLAGS
53 aconf
54 af_names.h
55 aic7*reg.h*
56 @@ -83,6 +91,7 @@ aic7*seq.h*
57 aicasm
58 aicdb.h*
59 altivec*.c
60 +ashldi3.S
61 asm-offsets.h
62 asm_offsets.h
63 autoconf.h*
64 @@ -95,32 +104,40 @@ bounds.h
65 bsetup
66 btfixupprep
67 build
68 +builtin-policy.h
69 bvmlinux
70 bzImage*
71 capability_names.h
72 capflags.c
73 classlist.h*
74 +clut_vga16.c
75 +common-cmds.h
76 comp*.log
77 compile.h*
78 conf
79 config
80 config-*
81 config_data.h*
82 +config.c
83 config.mak
84 config.mak.autogen
85 +config.tmp
86 conmakehash
87 consolemap_deftbl.c*
88 cpustr.h
89 crc32table.h*
90 cscope.*
91 defkeymap.c
92 +devicetable-offsets.h
93 devlist.h*
94 dnotify_test
95 docproc
96 dslm
97 +dtc-lexer.lex.c
98 elf2ecoff
99 elfconfig.h*
100 evergreen_reg_safe.h
101 +exception_policy.conf
102 fixdep
103 flask.h
104 fore200e_mkfirm
105 @@ -128,12 +145,15 @@ fore200e_pca_fw.c*
106 gconf
107 gconf.glade.h
108 gen-devlist
109 +gen-kdb_cmds.c
110 gen_crc32table
111 gen_init_cpio
112 generated
113 genheaders
114 genksyms
115 *_gray256.c
116 +hash
117 +hid-example
118 hpet_example
119 hugepage-mmap
120 hugepage-shm
121 @@ -148,14 +168,14 @@ int32.c
122 int4.c
123 int8.c
124 kallsyms
125 -kconfig
126 +kern_constants.h
127 keywords.c
128 ksym.c*
129 ksym.h*
130 kxgettext
131 lex.c
132 lex.*.c
133 -linux
134 +lib1funcs.S
135 logo_*.c
136 logo_*_clut224.c
137 logo_*_mono.c
138 @@ -165,14 +185,15 @@ mach-types.h
139 machtypes.h
140 map
141 map_hugetlb
142 -media
143 mconf
144 +mdp
145 miboot*
146 mk_elfconfig
147 mkboot
148 mkbugboot
149 mkcpustr
150 mkdep
151 +mkpiggy
152 mkprep
153 mkregtable
154 mktables
155 @@ -188,6 +209,8 @@ oui.c*
156 page-types
157 parse.c
158 parse.h
159 +parse-events*
160 +pasyms.h
161 patches*
162 pca200e.bin
163 pca200e_ecd.bin2
164 @@ -197,6 +220,7 @@ perf-archive
165 piggyback
166 piggy.gzip
167 piggy.S
168 +pmu-*
169 pnmtologo
170 ppc_defs.h*
171 pss_boot.h
172 @@ -206,7 +230,12 @@ r200_reg_safe.h
173 r300_reg_safe.h
174 r420_reg_safe.h
175 r600_reg_safe.h
176 +randomize_layout_hash.h
177 +randomize_layout_seed.h
178 +realmode.lds
179 +realmode.relocs
180 recordmcount
181 +regdb.c
182 relocs
183 rlim_names.h
184 rn50_reg_safe.h
185 @@ -216,8 +245,12 @@ series
186 setup
187 setup.bin
188 setup.elf
189 +signing_key*
190 +size_overflow_hash.h
191 sImage
192 +slabinfo
193 sm_tbl*
194 +sortextable
195 split-include
196 syscalltab.h
197 tables.c
198 @@ -227,6 +260,7 @@ tftpboot.img
199 timeconst.h
200 times.h*
201 trix_boot.h
202 +user_constants.h
203 utsrelease.h*
204 vdso-syms.lds
205 vdso.lds
206 @@ -238,13 +272,17 @@ vdso32.lds
207 vdso32.so.dbg
208 vdso64.lds
209 vdso64.so.dbg
210 +vdsox32.lds
211 +vdsox32-syms.lds
212 version.h*
213 vmImage
214 vmlinux
215 vmlinux-*
216 vmlinux.aout
217 vmlinux.bin.all
218 +vmlinux.bin.bz2
219 vmlinux.lds
220 +vmlinux.relocs
221 vmlinuz
222 voffset.h
223 vsyscall.lds
224 @@ -252,9 +290,12 @@ vsyscall_32.lds
225 wanxlfw.inc
226 uImage
227 unifdef
228 +utsrelease.h
229 wakeup.bin
230 wakeup.elf
231 wakeup.lds
232 +x509*
233 zImage*
234 zconf.hash.c
235 +zconf.lex.c
236 zoffset.h
237 diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
238 index a311db8..415b28c 100644
239 --- a/Documentation/kbuild/makefiles.txt
240 +++ b/Documentation/kbuild/makefiles.txt
241 @@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
242 === 4 Host Program support
243 --- 4.1 Simple Host Program
244 --- 4.2 Composite Host Programs
245 - --- 4.3 Using C++ for host programs
246 - --- 4.4 Controlling compiler options for host programs
247 - --- 4.5 When host programs are actually built
248 - --- 4.6 Using hostprogs-$(CONFIG_FOO)
249 + --- 4.3 Defining shared libraries
250 + --- 4.4 Using C++ for host programs
251 + --- 4.5 Controlling compiler options for host programs
252 + --- 4.6 When host programs are actually built
253 + --- 4.7 Using hostprogs-$(CONFIG_FOO)
254
255 === 5 Kbuild clean infrastructure
256
257 @@ -642,7 +643,29 @@ Both possibilities are described in the following.
258 Finally, the two .o files are linked to the executable, lxdialog.
259 Note: The syntax <executable>-y is not permitted for host-programs.
260
261 ---- 4.3 Using C++ for host programs
262 +--- 4.3 Defining shared libraries
263 +
264 + Objects with extension .so are considered shared libraries, and
265 + will be compiled as position independent objects.
266 + Kbuild provides support for shared libraries, but the usage
267 + shall be restricted.
268 + In the following example the libkconfig.so shared library is used
269 + to link the executable conf.
270 +
271 + Example:
272 + #scripts/kconfig/Makefile
273 + hostprogs-y := conf
274 + conf-objs := conf.o libkconfig.so
275 + libkconfig-objs := expr.o type.o
276 +
277 + Shared libraries always require a corresponding -objs line, and
278 + in the example above the shared library libkconfig is composed by
279 + the two objects expr.o and type.o.
280 + expr.o and type.o will be built as position independent code and
281 + linked as a shared library libkconfig.so. C++ is not supported for
282 + shared libraries.
283 +
284 +--- 4.4 Using C++ for host programs
285
286 kbuild offers support for host programs written in C++. This was
287 introduced solely to support kconfig, and is not recommended
288 @@ -665,7 +688,7 @@ Both possibilities are described in the following.
289 qconf-cxxobjs := qconf.o
290 qconf-objs := check.o
291
292 ---- 4.4 Controlling compiler options for host programs
293 +--- 4.5 Controlling compiler options for host programs
294
295 When compiling host programs, it is possible to set specific flags.
296 The programs will always be compiled utilising $(HOSTCC) passed
297 @@ -693,7 +716,7 @@ Both possibilities are described in the following.
298 When linking qconf, it will be passed the extra option
299 "-L$(QTDIR)/lib".
300
301 ---- 4.5 When host programs are actually built
302 +--- 4.6 When host programs are actually built
303
304 Kbuild will only build host-programs when they are referenced
305 as a prerequisite.
306 @@ -724,7 +747,7 @@ Both possibilities are described in the following.
307 This will tell kbuild to build lxdialog even if not referenced in
308 any rule.
309
310 ---- 4.6 Using hostprogs-$(CONFIG_FOO)
311 +--- 4.7 Using hostprogs-$(CONFIG_FOO)
312
313 A typical pattern in a Kbuild file looks like this:
314
315 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
316 index 479f332..2475ac2 100644
317 --- a/Documentation/kernel-parameters.txt
318 +++ b/Documentation/kernel-parameters.txt
319 @@ -1182,6 +1182,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
320 Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
321 Default: 1024
322
323 + grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
324 + ignore grsecurity's /proc restrictions
325 +
326 +
327 hashdist= [KNL,NUMA] Large hashes allocated during boot
328 are distributed across NUMA nodes. Defaults on
329 for 64-bit NUMA, off otherwise.
330 @@ -2259,6 +2263,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
331 noexec=on: enable non-executable mappings (default)
332 noexec=off: disable non-executable mappings
333
334 + nopcid [X86-64]
335 + Disable PCID (Process-Context IDentifier) even if it
336 + is supported by the processor.
337 +
338 nosmap [X86]
339 Disable SMAP (Supervisor Mode Access Prevention)
340 even if it is supported by processor.
341 @@ -2551,6 +2559,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
342 the specified number of seconds. This is to be used if
343 your oopses keep scrolling off the screen.
344
345 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
346 + virtualization environments that don't cope well with the
347 + expand down segment used by UDEREF on X86-32 or the frequent
348 + page table updates on X86-64.
349 +
350 + pax_sanitize_slab=
351 + Format: { 0 | 1 | off | fast | full }
352 + Options '0' and '1' are only provided for backward
353 + compatibility, 'off' or 'fast' should be used instead.
354 + 0|off : disable slab object sanitization
355 + 1|fast: enable slab object sanitization excluding
356 + whitelisted slabs (default)
357 + full : sanitize all slabs, even the whitelisted ones
358 +
359 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
360 +
361 + pax_extra_latent_entropy
362 + Enable a very simple form of latent entropy extraction
363 + from the first 4GB of memory as the bootmem allocator
364 + passes the memory pages to the buddy allocator.
365 +
366 + pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
367 + when the processor supports PCID.
368 +
369 pcbit= [HW,ISDN]
370
371 pcd. [PARIDE]
372 diff --git a/Makefile b/Makefile
373 index 91cfe8d..ccf7329 100644
374 --- a/Makefile
375 +++ b/Makefile
376 @@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
377 HOSTCC = gcc
378 HOSTCXX = g++
379 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
380 -HOSTCXXFLAGS = -O2
381 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -std=gnu89 -fno-delete-null-pointer-checks
382 +HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
383 +HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
384
385 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
386 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
387 @@ -445,8 +447,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
388 # Rules shared between *config targets and build targets
389
390 # Basic helpers built in scripts/
391 -PHONY += scripts_basic
392 -scripts_basic:
393 +PHONY += scripts_basic gcc-plugins
394 +scripts_basic: gcc-plugins
395 $(Q)$(MAKE) $(build)=scripts/basic
396 $(Q)rm -f .tmp_quiet_recordmcount
397
398 @@ -620,6 +622,72 @@ endif
399 # Tell gcc to never replace conditional load with a non-conditional one
400 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
401
402 +ifndef DISABLE_PAX_PLUGINS
403 +ifeq ($(call cc-ifversion, -ge, 0408, y), y)
404 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
405 +else
406 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
407 +endif
408 +ifneq ($(PLUGINCC),)
409 +ifdef CONFIG_PAX_CONSTIFY_PLUGIN
410 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
411 +endif
412 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
413 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
414 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
415 +endif
416 +ifdef CONFIG_KALLOCSTAT_PLUGIN
417 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
418 +endif
419 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
420 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
421 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
422 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
423 +endif
424 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT
425 +RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
426 +ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
427 +RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
428 +endif
429 +endif
430 +ifdef CONFIG_CHECKER_PLUGIN
431 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
432 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
433 +endif
434 +endif
435 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
436 +ifdef CONFIG_PAX_SIZE_OVERFLOW
437 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
438 +endif
439 +ifdef CONFIG_PAX_LATENT_ENTROPY
440 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
441 +endif
442 +ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
443 +STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
444 +endif
445 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
446 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
447 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
448 +GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
449 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
450 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
451 +ifeq ($(KBUILD_EXTMOD),)
452 +gcc-plugins:
453 + $(Q)$(MAKE) $(build)=tools/gcc
454 +else
455 +gcc-plugins: ;
456 +endif
457 +else
458 +gcc-plugins:
459 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
460 + $(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.))
461 +else
462 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
463 +endif
464 + $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
465 +endif
466 +endif
467 +
468 ifdef CONFIG_READABLE_ASM
469 # Disable optimizations that make assembler listings hard to read.
470 # reorder blocks reorders the control in the function
471 @@ -712,7 +780,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
472 else
473 KBUILD_CFLAGS += -g
474 endif
475 -KBUILD_AFLAGS += -Wa,-gdwarf-2
476 +KBUILD_AFLAGS += -Wa,--gdwarf-2
477 endif
478 ifdef CONFIG_DEBUG_INFO_DWARF4
479 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
480 @@ -877,7 +945,7 @@ export mod_sign_cmd
481
482
483 ifeq ($(KBUILD_EXTMOD),)
484 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
485 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
486
487 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
488 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
489 @@ -924,6 +992,8 @@ endif
490
491 # The actual objects are generated when descending,
492 # make sure no implicit rule kicks in
493 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
496
497 # Handle descending into subdirectories listed in $(vmlinux-dirs)
498 @@ -933,7 +1003,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
499 # Error messages still appears in the original language
500
501 PHONY += $(vmlinux-dirs)
502 -$(vmlinux-dirs): prepare scripts
503 +$(vmlinux-dirs): gcc-plugins prepare scripts
504 $(Q)$(MAKE) $(build)=$@
505
506 define filechk_kernel.release
507 @@ -976,10 +1046,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
508
509 archprepare: archheaders archscripts prepare1 scripts_basic
510
511 +prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
512 +prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
513 prepare0: archprepare FORCE
514 $(Q)$(MAKE) $(build)=.
515
516 # All the preparing..
517 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
518 prepare: prepare0
519
520 # Generate some files
521 @@ -1094,6 +1167,8 @@ all: modules
522 # using awk while concatenating to the final file.
523
524 PHONY += modules
525 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
526 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
527 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
528 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
529 @$(kecho) ' Building modules, stage 2.';
530 @@ -1109,7 +1184,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
531
532 # Target to prepare building external modules
533 PHONY += modules_prepare
534 -modules_prepare: prepare scripts
535 +modules_prepare: gcc-plugins prepare scripts
536
537 # Target to install modules
538 PHONY += modules_install
539 @@ -1175,7 +1250,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
540 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
541 signing_key.priv signing_key.x509 x509.genkey \
542 extra_certificates signing_key.x509.keyid \
543 - signing_key.x509.signer include/linux/version.h
544 + signing_key.x509.signer include/linux/version.h \
545 + tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
546 + tools/gcc/size_overflow_plugin/size_overflow_hash.h \
547 + tools/gcc/randomize_layout_seed.h
548
549 # clean - Delete most, but leave enough to build external modules
550 #
551 @@ -1214,7 +1292,7 @@ distclean: mrproper
552 @find $(srctree) $(RCS_FIND_IGNORE) \
553 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
554 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
555 - -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
556 + -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
557 -type f -print | xargs rm -f
558
559
560 @@ -1380,6 +1458,8 @@ PHONY += $(module-dirs) modules
561 $(module-dirs): crmodverdir $(objtree)/Module.symvers
562 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
563
564 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
565 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
566 modules: $(module-dirs)
567 @$(kecho) ' Building modules, stage 2.';
568 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
569 @@ -1520,17 +1600,21 @@ else
570 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
571 endif
572
573 -%.s: %.c prepare scripts FORCE
574 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
575 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
576 +%.s: %.c gcc-plugins prepare scripts FORCE
577 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
578 %.i: %.c prepare scripts FORCE
579 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
580 -%.o: %.c prepare scripts FORCE
581 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
582 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
583 +%.o: %.c gcc-plugins prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585 %.lst: %.c prepare scripts FORCE
586 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
587 -%.s: %.S prepare scripts FORCE
588 +%.s: %.S gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590 -%.o: %.S prepare scripts FORCE
591 +%.o: %.S gcc-plugins prepare scripts FORCE
592 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
593 %.symtypes: %.c prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595 @@ -1542,11 +1626,15 @@ endif
596 $(build)=$(build-dir)
597 # Make sure the latest headers are built for Documentation
598 Documentation/: headers_install
599 -%/: prepare scripts FORCE
600 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
601 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
602 +%/: gcc-plugins prepare scripts FORCE
603 $(cmd_crmodverdir)
604 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
605 $(build)=$(build-dir)
606 -%.ko: prepare scripts FORCE
607 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
608 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
609 +%.ko: gcc-plugins prepare scripts FORCE
610 $(cmd_crmodverdir)
611 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
612 $(build)=$(build-dir) $(@:.ko=.o)
613 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
614 index 8f8eafb..3405f46 100644
615 --- a/arch/alpha/include/asm/atomic.h
616 +++ b/arch/alpha/include/asm/atomic.h
617 @@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
618 #define atomic_dec(v) atomic_sub(1,(v))
619 #define atomic64_dec(v) atomic64_sub(1,(v))
620
621 +#define atomic64_read_unchecked(v) atomic64_read(v)
622 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
623 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
624 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
625 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
626 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
627 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
628 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
629 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
630 +
631 #endif /* _ALPHA_ATOMIC_H */
632 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
633 index ad368a9..fbe0f25 100644
634 --- a/arch/alpha/include/asm/cache.h
635 +++ b/arch/alpha/include/asm/cache.h
636 @@ -4,19 +4,19 @@
637 #ifndef __ARCH_ALPHA_CACHE_H
638 #define __ARCH_ALPHA_CACHE_H
639
640 +#include <linux/const.h>
641
642 /* Bytes per L1 (data) cache line. */
643 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
644 -# define L1_CACHE_BYTES 64
645 # define L1_CACHE_SHIFT 6
646 #else
647 /* Both EV4 and EV5 are write-through, read-allocate,
648 direct-mapped, physical.
649 */
650 -# define L1_CACHE_BYTES 32
651 # define L1_CACHE_SHIFT 5
652 #endif
653
654 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
655 #define SMP_CACHE_BYTES L1_CACHE_BYTES
656
657 #endif
658 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
659 index 968d999..d36b2df 100644
660 --- a/arch/alpha/include/asm/elf.h
661 +++ b/arch/alpha/include/asm/elf.h
662 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
663
664 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
665
666 +#ifdef CONFIG_PAX_ASLR
667 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
668 +
669 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
670 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
671 +#endif
672 +
673 /* $0 is set by ld.so to a pointer to a function which might be
674 registered using atexit. This provides a mean for the dynamic
675 linker to call DT_FINI functions for shared libraries that have
676 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
677 index aab14a0..b4fa3e7 100644
678 --- a/arch/alpha/include/asm/pgalloc.h
679 +++ b/arch/alpha/include/asm/pgalloc.h
680 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
681 pgd_set(pgd, pmd);
682 }
683
684 +static inline void
685 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686 +{
687 + pgd_populate(mm, pgd, pmd);
688 +}
689 +
690 extern pgd_t *pgd_alloc(struct mm_struct *mm);
691
692 static inline void
693 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
694 index d8f9b7e..f6222fa 100644
695 --- a/arch/alpha/include/asm/pgtable.h
696 +++ b/arch/alpha/include/asm/pgtable.h
697 @@ -102,6 +102,17 @@ struct vm_area_struct;
698 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
699 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
700 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
701 +
702 +#ifdef CONFIG_PAX_PAGEEXEC
703 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
704 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
705 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
706 +#else
707 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
708 +# define PAGE_COPY_NOEXEC PAGE_COPY
709 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
710 +#endif
711 +
712 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
713
714 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
715 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
716 index 2fd00b7..cfd5069 100644
717 --- a/arch/alpha/kernel/module.c
718 +++ b/arch/alpha/kernel/module.c
719 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
720
721 /* The small sections were sorted to the end of the segment.
722 The following should definitely cover them. */
723 - gp = (u64)me->module_core + me->core_size - 0x8000;
724 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
725 got = sechdrs[me->arch.gotsecindex].sh_addr;
726
727 for (i = 0; i < n; i++) {
728 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
729 index f9c732e..78fbb0f 100644
730 --- a/arch/alpha/kernel/osf_sys.c
731 +++ b/arch/alpha/kernel/osf_sys.c
732 @@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
733 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
734
735 static unsigned long
736 -arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
737 - unsigned long limit)
738 +arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
739 + unsigned long limit, unsigned long flags)
740 {
741 struct vm_unmapped_area_info info;
742 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
743
744 info.flags = 0;
745 info.length = len;
746 @@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
747 info.high_limit = limit;
748 info.align_mask = 0;
749 info.align_offset = 0;
750 + info.threadstack_offset = offset;
751 return vm_unmapped_area(&info);
752 }
753
754 @@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
755 merely specific addresses, but regions of memory -- perhaps
756 this feature should be incorporated into all ports? */
757
758 +#ifdef CONFIG_PAX_RANDMMAP
759 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
760 +#endif
761 +
762 if (addr) {
763 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
764 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
765 if (addr != (unsigned long) -ENOMEM)
766 return addr;
767 }
768
769 /* Next, try allocating at TASK_UNMAPPED_BASE. */
770 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
771 - len, limit);
772 + addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
773 +
774 if (addr != (unsigned long) -ENOMEM)
775 return addr;
776
777 /* Finally, try allocating in low memory. */
778 - addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
779 + addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
780
781 return addr;
782 }
783 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
784 index 98838a0..b304fb4 100644
785 --- a/arch/alpha/mm/fault.c
786 +++ b/arch/alpha/mm/fault.c
787 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
788 __reload_thread(pcb);
789 }
790
791 +#ifdef CONFIG_PAX_PAGEEXEC
792 +/*
793 + * PaX: decide what to do with offenders (regs->pc = fault address)
794 + *
795 + * returns 1 when task should be killed
796 + * 2 when patched PLT trampoline was detected
797 + * 3 when unpatched PLT trampoline was detected
798 + */
799 +static int pax_handle_fetch_fault(struct pt_regs *regs)
800 +{
801 +
802 +#ifdef CONFIG_PAX_EMUPLT
803 + int err;
804 +
805 + do { /* PaX: patched PLT emulation #1 */
806 + unsigned int ldah, ldq, jmp;
807 +
808 + err = get_user(ldah, (unsigned int *)regs->pc);
809 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
810 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
811 +
812 + if (err)
813 + break;
814 +
815 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
816 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
817 + jmp == 0x6BFB0000U)
818 + {
819 + unsigned long r27, addr;
820 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
821 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
822 +
823 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
824 + err = get_user(r27, (unsigned long *)addr);
825 + if (err)
826 + break;
827 +
828 + regs->r27 = r27;
829 + regs->pc = r27;
830 + return 2;
831 + }
832 + } while (0);
833 +
834 + do { /* PaX: patched PLT emulation #2 */
835 + unsigned int ldah, lda, br;
836 +
837 + err = get_user(ldah, (unsigned int *)regs->pc);
838 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
839 + err |= get_user(br, (unsigned int *)(regs->pc+8));
840 +
841 + if (err)
842 + break;
843 +
844 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
845 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
846 + (br & 0xFFE00000U) == 0xC3E00000U)
847 + {
848 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
849 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
850 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
851 +
852 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
853 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
854 + return 2;
855 + }
856 + } while (0);
857 +
858 + do { /* PaX: unpatched PLT emulation */
859 + unsigned int br;
860 +
861 + err = get_user(br, (unsigned int *)regs->pc);
862 +
863 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
864 + unsigned int br2, ldq, nop, jmp;
865 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
866 +
867 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
868 + err = get_user(br2, (unsigned int *)addr);
869 + err |= get_user(ldq, (unsigned int *)(addr+4));
870 + err |= get_user(nop, (unsigned int *)(addr+8));
871 + err |= get_user(jmp, (unsigned int *)(addr+12));
872 + err |= get_user(resolver, (unsigned long *)(addr+16));
873 +
874 + if (err)
875 + break;
876 +
877 + if (br2 == 0xC3600000U &&
878 + ldq == 0xA77B000CU &&
879 + nop == 0x47FF041FU &&
880 + jmp == 0x6B7B0000U)
881 + {
882 + regs->r28 = regs->pc+4;
883 + regs->r27 = addr+16;
884 + regs->pc = resolver;
885 + return 3;
886 + }
887 + }
888 + } while (0);
889 +#endif
890 +
891 + return 1;
892 +}
893 +
894 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
895 +{
896 + unsigned long i;
897 +
898 + printk(KERN_ERR "PAX: bytes at PC: ");
899 + for (i = 0; i < 5; i++) {
900 + unsigned int c;
901 + if (get_user(c, (unsigned int *)pc+i))
902 + printk(KERN_CONT "???????? ");
903 + else
904 + printk(KERN_CONT "%08x ", c);
905 + }
906 + printk("\n");
907 +}
908 +#endif
909
910 /*
911 * This routine handles page faults. It determines the address,
912 @@ -133,8 +251,29 @@ retry:
913 good_area:
914 si_code = SEGV_ACCERR;
915 if (cause < 0) {
916 - if (!(vma->vm_flags & VM_EXEC))
917 + if (!(vma->vm_flags & VM_EXEC)) {
918 +
919 +#ifdef CONFIG_PAX_PAGEEXEC
920 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
921 + goto bad_area;
922 +
923 + up_read(&mm->mmap_sem);
924 + switch (pax_handle_fetch_fault(regs)) {
925 +
926 +#ifdef CONFIG_PAX_EMUPLT
927 + case 2:
928 + case 3:
929 + return;
930 +#endif
931 +
932 + }
933 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
934 + do_group_exit(SIGKILL);
935 +#else
936 goto bad_area;
937 +#endif
938 +
939 + }
940 } else if (!cause) {
941 /* Allow reads even for write-only mappings */
942 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
943 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
944 index 89c4b5c..847a7be 100644
945 --- a/arch/arm/Kconfig
946 +++ b/arch/arm/Kconfig
947 @@ -1740,7 +1740,7 @@ config ALIGNMENT_TRAP
948
949 config UACCESS_WITH_MEMCPY
950 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
951 - depends on MMU
952 + depends on MMU && !PAX_MEMORY_UDEREF
953 default y if CPU_FEROCEON
954 help
955 Implement faster copy_to_user and clear_user methods for CPU
956 @@ -2004,6 +2004,7 @@ config XIP_PHYS_ADDR
957 config KEXEC
958 bool "Kexec system call (EXPERIMENTAL)"
959 depends on (!SMP || PM_SLEEP_SMP)
960 + depends on !GRKERNSEC_KMEM
961 help
962 kexec is a system call that implements the ability to shutdown your
963 current kernel, and to start another kernel. It is like a reboot
964 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
965 index e22c119..eaa807d 100644
966 --- a/arch/arm/include/asm/atomic.h
967 +++ b/arch/arm/include/asm/atomic.h
968 @@ -18,17 +18,41 @@
969 #include <asm/barrier.h>
970 #include <asm/cmpxchg.h>
971
972 +#ifdef CONFIG_GENERIC_ATOMIC64
973 +#include <asm-generic/atomic64.h>
974 +#endif
975 +
976 #define ATOMIC_INIT(i) { (i) }
977
978 #ifdef __KERNEL__
979
980 +#ifdef CONFIG_THUMB2_KERNEL
981 +#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
982 +#else
983 +#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
984 +#endif
985 +
986 +#define _ASM_EXTABLE(from, to) \
987 +" .pushsection __ex_table,\"a\"\n"\
988 +" .align 3\n" \
989 +" .long " #from ", " #to"\n" \
990 +" .popsection"
991 +
992 /*
993 * On ARM, ordinary assignment (str instruction) doesn't clear the local
994 * strex/ldrex monitor on some implementations. The reason we can use it for
995 * atomic_set() is the clrex or dummy strex done on every exception return.
996 */
997 #define atomic_read(v) ACCESS_ONCE((v)->counter)
998 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
999 +{
1000 + return ACCESS_ONCE(v->counter);
1001 +}
1002 #define atomic_set(v,i) (((v)->counter) = (i))
1003 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1004 +{
1005 + v->counter = i;
1006 +}
1007
1008 #if __LINUX_ARM_ARCH__ >= 6
1009
1010 @@ -38,26 +62,50 @@
1011 * to ensure that the update happens.
1012 */
1013
1014 -#define ATOMIC_OP(op, c_op, asm_op) \
1015 -static inline void atomic_##op(int i, atomic_t *v) \
1016 +#ifdef CONFIG_PAX_REFCOUNT
1017 +#define __OVERFLOW_POST \
1018 + " bvc 3f\n" \
1019 + "2: " REFCOUNT_TRAP_INSN "\n"\
1020 + "3:\n"
1021 +#define __OVERFLOW_POST_RETURN \
1022 + " bvc 3f\n" \
1023 +" mov %0, %1\n" \
1024 + "2: " REFCOUNT_TRAP_INSN "\n"\
1025 + "3:\n"
1026 +#define __OVERFLOW_EXTABLE \
1027 + "4:\n" \
1028 + _ASM_EXTABLE(2b, 4b)
1029 +#else
1030 +#define __OVERFLOW_POST
1031 +#define __OVERFLOW_POST_RETURN
1032 +#define __OVERFLOW_EXTABLE
1033 +#endif
1034 +
1035 +#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1036 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1037 { \
1038 unsigned long tmp; \
1039 int result; \
1040 \
1041 prefetchw(&v->counter); \
1042 - __asm__ __volatile__("@ atomic_" #op "\n" \
1043 + __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1044 "1: ldrex %0, [%3]\n" \
1045 " " #asm_op " %0, %0, %4\n" \
1046 + post_op \
1047 " strex %1, %0, [%3]\n" \
1048 " teq %1, #0\n" \
1049 -" bne 1b" \
1050 +" bne 1b\n" \
1051 + extable \
1052 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1053 : "r" (&v->counter), "Ir" (i) \
1054 : "cc"); \
1055 } \
1056
1057 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1058 -static inline int atomic_##op##_return(int i, atomic_t *v) \
1059 +#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
1060 + __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1061 +
1062 +#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1063 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1064 { \
1065 unsigned long tmp; \
1066 int result; \
1067 @@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1068 smp_mb(); \
1069 prefetchw(&v->counter); \
1070 \
1071 - __asm__ __volatile__("@ atomic_" #op "_return\n" \
1072 + __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1073 "1: ldrex %0, [%3]\n" \
1074 " " #asm_op " %0, %0, %4\n" \
1075 + post_op \
1076 " strex %1, %0, [%3]\n" \
1077 " teq %1, #0\n" \
1078 -" bne 1b" \
1079 +" bne 1b\n" \
1080 + extable \
1081 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1082 : "r" (&v->counter), "Ir" (i) \
1083 : "cc"); \
1084 @@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1085 return result; \
1086 }
1087
1088 +#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
1089 + __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1090 +
1091 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1092 {
1093 int oldval;
1094 @@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1095 __asm__ __volatile__ ("@ atomic_add_unless\n"
1096 "1: ldrex %0, [%4]\n"
1097 " teq %0, %5\n"
1098 -" beq 2f\n"
1099 -" add %1, %0, %6\n"
1100 +" beq 4f\n"
1101 +" adds %1, %0, %6\n"
1102 +
1103 +#ifdef CONFIG_PAX_REFCOUNT
1104 +" bvc 3f\n"
1105 +"2: " REFCOUNT_TRAP_INSN "\n"
1106 +"3:\n"
1107 +#endif
1108 +
1109 " strex %2, %1, [%4]\n"
1110 " teq %2, #0\n"
1111 " bne 1b\n"
1112 -"2:"
1113 +"4:"
1114 +
1115 +#ifdef CONFIG_PAX_REFCOUNT
1116 + _ASM_EXTABLE(2b, 4b)
1117 +#endif
1118 +
1119 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1120 : "r" (&v->counter), "r" (u), "r" (a)
1121 : "cc");
1122 @@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1123 return oldval;
1124 }
1125
1126 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1127 +{
1128 + unsigned long oldval, res;
1129 +
1130 + smp_mb();
1131 +
1132 + do {
1133 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1134 + "ldrex %1, [%3]\n"
1135 + "mov %0, #0\n"
1136 + "teq %1, %4\n"
1137 + "strexeq %0, %5, [%3]\n"
1138 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1139 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
1140 + : "cc");
1141 + } while (res);
1142 +
1143 + smp_mb();
1144 +
1145 + return oldval;
1146 +}
1147 +
1148 #else /* ARM_ARCH_6 */
1149
1150 #ifdef CONFIG_SMP
1151 #error SMP not supported on pre-ARMv6 CPUs
1152 #endif
1153
1154 -#define ATOMIC_OP(op, c_op, asm_op) \
1155 -static inline void atomic_##op(int i, atomic_t *v) \
1156 +#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1157 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1158 { \
1159 unsigned long flags; \
1160 \
1161 @@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1162 raw_local_irq_restore(flags); \
1163 } \
1164
1165 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1166 -static inline int atomic_##op##_return(int i, atomic_t *v) \
1167 +#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1168 + __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1169 +
1170 +#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1171 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1172 { \
1173 unsigned long flags; \
1174 int val; \
1175 @@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1176 return val; \
1177 }
1178
1179 +#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1180 + __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1181 +
1182 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1183 {
1184 int ret;
1185 @@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1186 return ret;
1187 }
1188
1189 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1190 +{
1191 + return atomic_cmpxchg((atomic_t *)v, old, new);
1192 +}
1193 +
1194 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1195 {
1196 int c, old;
1197 @@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1198
1199 #undef ATOMIC_OPS
1200 #undef ATOMIC_OP_RETURN
1201 +#undef __ATOMIC_OP_RETURN
1202 #undef ATOMIC_OP
1203 +#undef __ATOMIC_OP
1204
1205 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1206 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1207 +{
1208 + return xchg(&v->counter, new);
1209 +}
1210
1211 #define atomic_inc(v) atomic_add(1, v)
1212 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1213 +{
1214 + atomic_add_unchecked(1, v);
1215 +}
1216 #define atomic_dec(v) atomic_sub(1, v)
1217 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1218 +{
1219 + atomic_sub_unchecked(1, v);
1220 +}
1221
1222 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1223 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1224 +{
1225 + return atomic_add_return_unchecked(1, v) == 0;
1226 +}
1227 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1228 #define atomic_inc_return(v) (atomic_add_return(1, v))
1229 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1230 +{
1231 + return atomic_add_return_unchecked(1, v);
1232 +}
1233 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1234 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1235
1236 @@ -216,6 +336,14 @@ typedef struct {
1237 long long counter;
1238 } atomic64_t;
1239
1240 +#ifdef CONFIG_PAX_REFCOUNT
1241 +typedef struct {
1242 + long long counter;
1243 +} atomic64_unchecked_t;
1244 +#else
1245 +typedef atomic64_t atomic64_unchecked_t;
1246 +#endif
1247 +
1248 #define ATOMIC64_INIT(i) { (i) }
1249
1250 #ifdef CONFIG_ARM_LPAE
1251 @@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1252 return result;
1253 }
1254
1255 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1256 +{
1257 + long long result;
1258 +
1259 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1260 +" ldrd %0, %H0, [%1]"
1261 + : "=&r" (result)
1262 + : "r" (&v->counter), "Qo" (v->counter)
1263 + );
1264 +
1265 + return result;
1266 +}
1267 +
1268 static inline void atomic64_set(atomic64_t *v, long long i)
1269 {
1270 __asm__ __volatile__("@ atomic64_set\n"
1271 @@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1272 : "r" (&v->counter), "r" (i)
1273 );
1274 }
1275 +
1276 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1277 +{
1278 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1279 +" strd %2, %H2, [%1]"
1280 + : "=Qo" (v->counter)
1281 + : "r" (&v->counter), "r" (i)
1282 + );
1283 +}
1284 #else
1285 static inline long long atomic64_read(const atomic64_t *v)
1286 {
1287 @@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1288 return result;
1289 }
1290
1291 +static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1292 +{
1293 + long long result;
1294 +
1295 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1296 +" ldrexd %0, %H0, [%1]"
1297 + : "=&r" (result)
1298 + : "r" (&v->counter), "Qo" (v->counter)
1299 + );
1300 +
1301 + return result;
1302 +}
1303 +
1304 static inline void atomic64_set(atomic64_t *v, long long i)
1305 {
1306 long long tmp;
1307 @@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1308 : "r" (&v->counter), "r" (i)
1309 : "cc");
1310 }
1311 +
1312 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1313 +{
1314 + long long tmp;
1315 +
1316 + prefetchw(&v->counter);
1317 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1318 +"1: ldrexd %0, %H0, [%2]\n"
1319 +" strexd %0, %3, %H3, [%2]\n"
1320 +" teq %0, #0\n"
1321 +" bne 1b"
1322 + : "=&r" (tmp), "=Qo" (v->counter)
1323 + : "r" (&v->counter), "r" (i)
1324 + : "cc");
1325 +}
1326 #endif
1327
1328 -#define ATOMIC64_OP(op, op1, op2) \
1329 -static inline void atomic64_##op(long long i, atomic64_t *v) \
1330 +#undef __OVERFLOW_POST_RETURN
1331 +#define __OVERFLOW_POST_RETURN \
1332 + " bvc 3f\n" \
1333 +" mov %0, %1\n" \
1334 +" mov %H0, %H1\n" \
1335 + "2: " REFCOUNT_TRAP_INSN "\n"\
1336 + "3:\n"
1337 +
1338 +#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1339 +static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1340 { \
1341 long long result; \
1342 unsigned long tmp; \
1343 \
1344 prefetchw(&v->counter); \
1345 - __asm__ __volatile__("@ atomic64_" #op "\n" \
1346 + __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1347 "1: ldrexd %0, %H0, [%3]\n" \
1348 " " #op1 " %Q0, %Q0, %Q4\n" \
1349 " " #op2 " %R0, %R0, %R4\n" \
1350 + post_op \
1351 " strexd %1, %0, %H0, [%3]\n" \
1352 " teq %1, #0\n" \
1353 -" bne 1b" \
1354 +" bne 1b\n" \
1355 + extable \
1356 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1357 : "r" (&v->counter), "r" (i) \
1358 : "cc"); \
1359 } \
1360
1361 -#define ATOMIC64_OP_RETURN(op, op1, op2) \
1362 -static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1363 +#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1364 + __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1365 +
1366 +#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1367 +static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1368 { \
1369 long long result; \
1370 unsigned long tmp; \
1371 @@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1372 smp_mb(); \
1373 prefetchw(&v->counter); \
1374 \
1375 - __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1376 + __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1377 "1: ldrexd %0, %H0, [%3]\n" \
1378 " " #op1 " %Q0, %Q0, %Q4\n" \
1379 " " #op2 " %R0, %R0, %R4\n" \
1380 + post_op \
1381 " strexd %1, %0, %H0, [%3]\n" \
1382 " teq %1, #0\n" \
1383 -" bne 1b" \
1384 +" bne 1b\n" \
1385 + extable \
1386 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1387 : "r" (&v->counter), "r" (i) \
1388 : "cc"); \
1389 @@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1390 return result; \
1391 }
1392
1393 +#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1394 + __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1395 +
1396 #define ATOMIC64_OPS(op, op1, op2) \
1397 ATOMIC64_OP(op, op1, op2) \
1398 ATOMIC64_OP_RETURN(op, op1, op2)
1399 @@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1400
1401 #undef ATOMIC64_OPS
1402 #undef ATOMIC64_OP_RETURN
1403 +#undef __ATOMIC64_OP_RETURN
1404 #undef ATOMIC64_OP
1405 +#undef __ATOMIC64_OP
1406 +#undef __OVERFLOW_EXTABLE
1407 +#undef __OVERFLOW_POST_RETURN
1408 +#undef __OVERFLOW_POST
1409
1410 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1411 long long new)
1412 @@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1413 return oldval;
1414 }
1415
1416 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1417 + long long new)
1418 +{
1419 + long long oldval;
1420 + unsigned long res;
1421 +
1422 + smp_mb();
1423 +
1424 + do {
1425 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1426 + "ldrexd %1, %H1, [%3]\n"
1427 + "mov %0, #0\n"
1428 + "teq %1, %4\n"
1429 + "teqeq %H1, %H4\n"
1430 + "strexdeq %0, %5, %H5, [%3]"
1431 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1432 + : "r" (&ptr->counter), "r" (old), "r" (new)
1433 + : "cc");
1434 + } while (res);
1435 +
1436 + smp_mb();
1437 +
1438 + return oldval;
1439 +}
1440 +
1441 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1442 {
1443 long long result;
1444 @@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1445 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1446 {
1447 long long result;
1448 - unsigned long tmp;
1449 + u64 tmp;
1450
1451 smp_mb();
1452 prefetchw(&v->counter);
1453
1454 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1455 -"1: ldrexd %0, %H0, [%3]\n"
1456 -" subs %Q0, %Q0, #1\n"
1457 -" sbc %R0, %R0, #0\n"
1458 +"1: ldrexd %1, %H1, [%3]\n"
1459 +" subs %Q0, %Q1, #1\n"
1460 +" sbcs %R0, %R1, #0\n"
1461 +
1462 +#ifdef CONFIG_PAX_REFCOUNT
1463 +" bvc 3f\n"
1464 +" mov %Q0, %Q1\n"
1465 +" mov %R0, %R1\n"
1466 +"2: " REFCOUNT_TRAP_INSN "\n"
1467 +"3:\n"
1468 +#endif
1469 +
1470 " teq %R0, #0\n"
1471 -" bmi 2f\n"
1472 +" bmi 4f\n"
1473 " strexd %1, %0, %H0, [%3]\n"
1474 " teq %1, #0\n"
1475 " bne 1b\n"
1476 -"2:"
1477 +"4:\n"
1478 +
1479 +#ifdef CONFIG_PAX_REFCOUNT
1480 + _ASM_EXTABLE(2b, 4b)
1481 +#endif
1482 +
1483 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1484 : "r" (&v->counter)
1485 : "cc");
1486 @@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1487 " teq %0, %5\n"
1488 " teqeq %H0, %H5\n"
1489 " moveq %1, #0\n"
1490 -" beq 2f\n"
1491 +" beq 4f\n"
1492 " adds %Q0, %Q0, %Q6\n"
1493 -" adc %R0, %R0, %R6\n"
1494 +" adcs %R0, %R0, %R6\n"
1495 +
1496 +#ifdef CONFIG_PAX_REFCOUNT
1497 +" bvc 3f\n"
1498 +"2: " REFCOUNT_TRAP_INSN "\n"
1499 +"3:\n"
1500 +#endif
1501 +
1502 " strexd %2, %0, %H0, [%4]\n"
1503 " teq %2, #0\n"
1504 " bne 1b\n"
1505 -"2:"
1506 +"4:\n"
1507 +
1508 +#ifdef CONFIG_PAX_REFCOUNT
1509 + _ASM_EXTABLE(2b, 4b)
1510 +#endif
1511 +
1512 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1513 : "r" (&v->counter), "r" (u), "r" (a)
1514 : "cc");
1515 @@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1516
1517 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1518 #define atomic64_inc(v) atomic64_add(1LL, (v))
1519 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1520 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1521 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1522 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1523 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1524 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1525 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1526 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1527 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1528 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1529 diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1530 index c6a3e73..35cca85 100644
1531 --- a/arch/arm/include/asm/barrier.h
1532 +++ b/arch/arm/include/asm/barrier.h
1533 @@ -63,7 +63,7 @@
1534 do { \
1535 compiletime_assert_atomic_type(*p); \
1536 smp_mb(); \
1537 - ACCESS_ONCE(*p) = (v); \
1538 + ACCESS_ONCE_RW(*p) = (v); \
1539 } while (0)
1540
1541 #define smp_load_acquire(p) \
1542 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1543 index 75fe66b..ba3dee4 100644
1544 --- a/arch/arm/include/asm/cache.h
1545 +++ b/arch/arm/include/asm/cache.h
1546 @@ -4,8 +4,10 @@
1547 #ifndef __ASMARM_CACHE_H
1548 #define __ASMARM_CACHE_H
1549
1550 +#include <linux/const.h>
1551 +
1552 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1553 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1554 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1555
1556 /*
1557 * Memory returned by kmalloc() may be used for DMA, so we must make
1558 @@ -24,5 +26,6 @@
1559 #endif
1560
1561 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1562 +#define __read_only __attribute__ ((__section__(".data..read_only")))
1563
1564 #endif
1565 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1566 index 10e78d0..dc8505d 100644
1567 --- a/arch/arm/include/asm/cacheflush.h
1568 +++ b/arch/arm/include/asm/cacheflush.h
1569 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
1570 void (*dma_unmap_area)(const void *, size_t, int);
1571
1572 void (*dma_flush_range)(const void *, const void *);
1573 -};
1574 +} __no_const;
1575
1576 /*
1577 * Select the calling method
1578 diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1579 index 5233151..87a71fa 100644
1580 --- a/arch/arm/include/asm/checksum.h
1581 +++ b/arch/arm/include/asm/checksum.h
1582 @@ -37,7 +37,19 @@ __wsum
1583 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1584
1585 __wsum
1586 -csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1587 +__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1588 +
1589 +static inline __wsum
1590 +csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1591 +{
1592 + __wsum ret;
1593 + pax_open_userland();
1594 + ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1595 + pax_close_userland();
1596 + return ret;
1597 +}
1598 +
1599 +
1600
1601 /*
1602 * Fold a partial checksum without adding pseudo headers
1603 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1604 index abb2c37..96db950 100644
1605 --- a/arch/arm/include/asm/cmpxchg.h
1606 +++ b/arch/arm/include/asm/cmpxchg.h
1607 @@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1608
1609 #define xchg(ptr,x) \
1610 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1611 +#define xchg_unchecked(ptr,x) \
1612 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1613
1614 #include <asm-generic/cmpxchg-local.h>
1615
1616 diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1617 index 6ddbe44..b5e38b1 100644
1618 --- a/arch/arm/include/asm/domain.h
1619 +++ b/arch/arm/include/asm/domain.h
1620 @@ -48,18 +48,37 @@
1621 * Domain types
1622 */
1623 #define DOMAIN_NOACCESS 0
1624 -#define DOMAIN_CLIENT 1
1625 #ifdef CONFIG_CPU_USE_DOMAINS
1626 +#define DOMAIN_USERCLIENT 1
1627 +#define DOMAIN_KERNELCLIENT 1
1628 #define DOMAIN_MANAGER 3
1629 +#define DOMAIN_VECTORS DOMAIN_USER
1630 #else
1631 +
1632 +#ifdef CONFIG_PAX_KERNEXEC
1633 #define DOMAIN_MANAGER 1
1634 +#define DOMAIN_KERNEXEC 3
1635 +#else
1636 +#define DOMAIN_MANAGER 1
1637 +#endif
1638 +
1639 +#ifdef CONFIG_PAX_MEMORY_UDEREF
1640 +#define DOMAIN_USERCLIENT 0
1641 +#define DOMAIN_UDEREF 1
1642 +#define DOMAIN_VECTORS DOMAIN_KERNEL
1643 +#else
1644 +#define DOMAIN_USERCLIENT 1
1645 +#define DOMAIN_VECTORS DOMAIN_USER
1646 +#endif
1647 +#define DOMAIN_KERNELCLIENT 1
1648 +
1649 #endif
1650
1651 #define domain_val(dom,type) ((type) << (2*(dom)))
1652
1653 #ifndef __ASSEMBLY__
1654
1655 -#ifdef CONFIG_CPU_USE_DOMAINS
1656 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1657 static inline void set_domain(unsigned val)
1658 {
1659 asm volatile(
1660 @@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1661 isb();
1662 }
1663
1664 -#define modify_domain(dom,type) \
1665 - do { \
1666 - struct thread_info *thread = current_thread_info(); \
1667 - unsigned int domain = thread->cpu_domain; \
1668 - domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1669 - thread->cpu_domain = domain | domain_val(dom, type); \
1670 - set_domain(thread->cpu_domain); \
1671 - } while (0)
1672 -
1673 +extern void modify_domain(unsigned int dom, unsigned int type);
1674 #else
1675 static inline void set_domain(unsigned val) { }
1676 static inline void modify_domain(unsigned dom, unsigned type) { }
1677 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1678 index afb9caf..9a0bac0 100644
1679 --- a/arch/arm/include/asm/elf.h
1680 +++ b/arch/arm/include/asm/elf.h
1681 @@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1682 the loader. We need to make sure that it is out of the way of the program
1683 that it will "exec", and that there is sufficient room for the brk. */
1684
1685 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1686 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1687 +
1688 +#ifdef CONFIG_PAX_ASLR
1689 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1690 +
1691 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1692 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1693 +#endif
1694
1695 /* When the program starts, a1 contains a pointer to a function to be
1696 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1697 @@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1698 extern void elf_set_personality(const struct elf32_hdr *);
1699 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1700
1701 -struct mm_struct;
1702 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1703 -#define arch_randomize_brk arch_randomize_brk
1704 -
1705 #ifdef CONFIG_MMU
1706 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1707 struct linux_binprm;
1708 diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1709 index de53547..52b9a28 100644
1710 --- a/arch/arm/include/asm/fncpy.h
1711 +++ b/arch/arm/include/asm/fncpy.h
1712 @@ -81,7 +81,9 @@
1713 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1714 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1715 \
1716 + pax_open_kernel(); \
1717 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1718 + pax_close_kernel(); \
1719 flush_icache_range((unsigned long)(dest_buf), \
1720 (unsigned long)(dest_buf) + (size)); \
1721 \
1722 diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1723 index 53e69da..3fdc896 100644
1724 --- a/arch/arm/include/asm/futex.h
1725 +++ b/arch/arm/include/asm/futex.h
1726 @@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1727 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1728 return -EFAULT;
1729
1730 + pax_open_userland();
1731 +
1732 smp_mb();
1733 /* Prefetching cannot fault */
1734 prefetchw(uaddr);
1735 @@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1736 : "cc", "memory");
1737 smp_mb();
1738
1739 + pax_close_userland();
1740 +
1741 *uval = val;
1742 return ret;
1743 }
1744 @@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1745 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1746 return -EFAULT;
1747
1748 + pax_open_userland();
1749 +
1750 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1751 "1: " TUSER(ldr) " %1, [%4]\n"
1752 " teq %1, %2\n"
1753 @@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1755 : "cc", "memory");
1756
1757 + pax_close_userland();
1758 +
1759 *uval = val;
1760 return ret;
1761 }
1762 @@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1763 return -EFAULT;
1764
1765 pagefault_disable(); /* implies preempt_disable() */
1766 + pax_open_userland();
1767
1768 switch (op) {
1769 case FUTEX_OP_SET:
1770 @@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1771 ret = -ENOSYS;
1772 }
1773
1774 + pax_close_userland();
1775 pagefault_enable(); /* subsumes preempt_enable() */
1776
1777 if (!ret) {
1778 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1779 index 83eb2f7..ed77159 100644
1780 --- a/arch/arm/include/asm/kmap_types.h
1781 +++ b/arch/arm/include/asm/kmap_types.h
1782 @@ -4,6 +4,6 @@
1783 /*
1784 * This is the "bare minimum". AIO seems to require this.
1785 */
1786 -#define KM_TYPE_NR 16
1787 +#define KM_TYPE_NR 17
1788
1789 #endif
1790 diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1791 index 9e614a1..3302cca 100644
1792 --- a/arch/arm/include/asm/mach/dma.h
1793 +++ b/arch/arm/include/asm/mach/dma.h
1794 @@ -22,7 +22,7 @@ struct dma_ops {
1795 int (*residue)(unsigned int, dma_t *); /* optional */
1796 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1797 const char *type;
1798 -};
1799 +} __do_const;
1800
1801 struct dma_struct {
1802 void *addr; /* single DMA address */
1803 diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1804 index f98c7f3..e5c626d 100644
1805 --- a/arch/arm/include/asm/mach/map.h
1806 +++ b/arch/arm/include/asm/mach/map.h
1807 @@ -23,17 +23,19 @@ struct map_desc {
1808
1809 /* types 0-3 are defined in asm/io.h */
1810 enum {
1811 - MT_UNCACHED = 4,
1812 - MT_CACHECLEAN,
1813 - MT_MINICLEAN,
1814 + MT_UNCACHED_RW = 4,
1815 + MT_CACHECLEAN_RO,
1816 + MT_MINICLEAN_RO,
1817 MT_LOW_VECTORS,
1818 MT_HIGH_VECTORS,
1819 - MT_MEMORY_RWX,
1820 + __MT_MEMORY_RWX,
1821 MT_MEMORY_RW,
1822 - MT_ROM,
1823 - MT_MEMORY_RWX_NONCACHED,
1824 + MT_MEMORY_RX,
1825 + MT_ROM_RX,
1826 + MT_MEMORY_RW_NONCACHED,
1827 + MT_MEMORY_RX_NONCACHED,
1828 MT_MEMORY_RW_DTCM,
1829 - MT_MEMORY_RWX_ITCM,
1830 + MT_MEMORY_RX_ITCM,
1831 MT_MEMORY_RW_SO,
1832 MT_MEMORY_DMA_READY,
1833 };
1834 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1835 index 891a56b..48f337e 100644
1836 --- a/arch/arm/include/asm/outercache.h
1837 +++ b/arch/arm/include/asm/outercache.h
1838 @@ -36,7 +36,7 @@ struct outer_cache_fns {
1839
1840 /* This is an ARM L2C thing */
1841 void (*write_sec)(unsigned long, unsigned);
1842 -};
1843 +} __no_const;
1844
1845 extern struct outer_cache_fns outer_cache;
1846
1847 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1848 index 4355f0e..cd9168e 100644
1849 --- a/arch/arm/include/asm/page.h
1850 +++ b/arch/arm/include/asm/page.h
1851 @@ -23,6 +23,7 @@
1852
1853 #else
1854
1855 +#include <linux/compiler.h>
1856 #include <asm/glue.h>
1857
1858 /*
1859 @@ -114,7 +115,7 @@ struct cpu_user_fns {
1860 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1861 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1862 unsigned long vaddr, struct vm_area_struct *vma);
1863 -};
1864 +} __no_const;
1865
1866 #ifdef MULTI_USER
1867 extern struct cpu_user_fns cpu_user;
1868 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1869 index 78a7793..e3dc06c 100644
1870 --- a/arch/arm/include/asm/pgalloc.h
1871 +++ b/arch/arm/include/asm/pgalloc.h
1872 @@ -17,6 +17,7 @@
1873 #include <asm/processor.h>
1874 #include <asm/cacheflush.h>
1875 #include <asm/tlbflush.h>
1876 +#include <asm/system_info.h>
1877
1878 #define check_pgt_cache() do { } while (0)
1879
1880 @@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1881 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1882 }
1883
1884 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1885 +{
1886 + pud_populate(mm, pud, pmd);
1887 +}
1888 +
1889 #else /* !CONFIG_ARM_LPAE */
1890
1891 /*
1892 @@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1893 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1894 #define pmd_free(mm, pmd) do { } while (0)
1895 #define pud_populate(mm,pmd,pte) BUG()
1896 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1897
1898 #endif /* CONFIG_ARM_LPAE */
1899
1900 @@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1901 __free_page(pte);
1902 }
1903
1904 +static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1905 +{
1906 +#ifdef CONFIG_ARM_LPAE
1907 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1908 +#else
1909 + if (addr & SECTION_SIZE)
1910 + pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1911 + else
1912 + pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913 +#endif
1914 + flush_pmd_entry(pmdp);
1915 +}
1916 +
1917 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1918 pmdval_t prot)
1919 {
1920 @@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1921 static inline void
1922 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1923 {
1924 - __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1925 + __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1926 }
1927 #define pmd_pgtable(pmd) pmd_page(pmd)
1928
1929 diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1930 index 5cfba15..f415e1a 100644
1931 --- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1932 +++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1933 @@ -20,12 +20,15 @@
1934 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1935 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1936 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1937 +#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1938 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1939 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1940 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1941 +
1942 /*
1943 * - section
1944 */
1945 +#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1946 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1947 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1948 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1949 @@ -37,6 +40,7 @@
1950 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1951 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1952 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1953 +#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1954
1955 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1956 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1957 @@ -66,6 +70,7 @@
1958 * - extended small page/tiny page
1959 */
1960 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1961 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1962 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1963 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1964 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1965 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1966 index f027941..f36ce30 100644
1967 --- a/arch/arm/include/asm/pgtable-2level.h
1968 +++ b/arch/arm/include/asm/pgtable-2level.h
1969 @@ -126,6 +126,9 @@
1970 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1971 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1972
1973 +/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1974 +#define L_PTE_PXN (_AT(pteval_t, 0))
1975 +
1976 /*
1977 * These are the memory types, defined to be compatible with
1978 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1979 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1980 index 9fd61c7..f8f1cff 100644
1981 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1982 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1983 @@ -76,6 +76,7 @@
1984 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1985 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1986 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1987 +#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1988 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1989
1990 /*
1991 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1992 index a31ecdad..95e98d4 100644
1993 --- a/arch/arm/include/asm/pgtable-3level.h
1994 +++ b/arch/arm/include/asm/pgtable-3level.h
1995 @@ -81,6 +81,7 @@
1996 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1997 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1998 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1999 +#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2000 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2001 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2002 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2003 @@ -92,10 +93,12 @@
2004 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2005 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2006 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2007 +#define PMD_SECT_RDONLY PMD_SECT_AP2
2008
2009 /*
2010 * To be used in assembly code with the upper page attributes.
2011 */
2012 +#define L_PTE_PXN_HIGH (1 << (53 - 32))
2013 #define L_PTE_XN_HIGH (1 << (54 - 32))
2014 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2015
2016 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2017 index 3b30062..01a5f9d 100644
2018 --- a/arch/arm/include/asm/pgtable.h
2019 +++ b/arch/arm/include/asm/pgtable.h
2020 @@ -33,6 +33,9 @@
2021 #include <asm/pgtable-2level.h>
2022 #endif
2023
2024 +#define ktla_ktva(addr) (addr)
2025 +#define ktva_ktla(addr) (addr)
2026 +
2027 /*
2028 * Just any arbitrary offset to the start of the vmalloc VM area: the
2029 * current 8MB value just means that there will be a 8MB "hole" after the
2030 @@ -48,6 +51,9 @@
2031 #define LIBRARY_TEXT_START 0x0c000000
2032
2033 #ifndef __ASSEMBLY__
2034 +extern pteval_t __supported_pte_mask;
2035 +extern pmdval_t __supported_pmd_mask;
2036 +
2037 extern void __pte_error(const char *file, int line, pte_t);
2038 extern void __pmd_error(const char *file, int line, pmd_t);
2039 extern void __pgd_error(const char *file, int line, pgd_t);
2040 @@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2041 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2042 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2043
2044 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
2045 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2046 +
2047 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2048 +#include <asm/domain.h>
2049 +#include <linux/thread_info.h>
2050 +#include <linux/preempt.h>
2051 +
2052 +static inline int test_domain(int domain, int domaintype)
2053 +{
2054 + return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2055 +}
2056 +#endif
2057 +
2058 +#ifdef CONFIG_PAX_KERNEXEC
2059 +static inline unsigned long pax_open_kernel(void) {
2060 +#ifdef CONFIG_ARM_LPAE
2061 + /* TODO */
2062 +#else
2063 + preempt_disable();
2064 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2065 + modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2066 +#endif
2067 + return 0;
2068 +}
2069 +
2070 +static inline unsigned long pax_close_kernel(void) {
2071 +#ifdef CONFIG_ARM_LPAE
2072 + /* TODO */
2073 +#else
2074 + BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2075 + /* DOMAIN_MANAGER = "client" under KERNEXEC */
2076 + modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2077 + preempt_enable_no_resched();
2078 +#endif
2079 + return 0;
2080 +}
2081 +#else
2082 +static inline unsigned long pax_open_kernel(void) { return 0; }
2083 +static inline unsigned long pax_close_kernel(void) { return 0; }
2084 +#endif
2085 +
2086 /*
2087 * This is the lowest virtual address we can permit any user space
2088 * mapping to be mapped at. This is particularly important for
2089 @@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2090 /*
2091 * The pgprot_* and protection_map entries will be fixed up in runtime
2092 * to include the cachable and bufferable bits based on memory policy,
2093 - * as well as any architecture dependent bits like global/ASID and SMP
2094 - * shared mapping bits.
2095 + * as well as any architecture dependent bits like global/ASID, PXN,
2096 + * and SMP shared mapping bits.
2097 */
2098 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2099
2100 @@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2101 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2102 {
2103 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2104 - L_PTE_NONE | L_PTE_VALID;
2105 + L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2106 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2107 return pte;
2108 }
2109 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2110 index c25ef3e..735f14b 100644
2111 --- a/arch/arm/include/asm/psci.h
2112 +++ b/arch/arm/include/asm/psci.h
2113 @@ -32,7 +32,7 @@ struct psci_operations {
2114 int (*affinity_info)(unsigned long target_affinity,
2115 unsigned long lowest_affinity_level);
2116 int (*migrate_info_type)(void);
2117 -};
2118 +} __no_const;
2119
2120 extern struct psci_operations psci_ops;
2121 extern struct smp_operations psci_smp_ops;
2122 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2123 index 18f5a55..5072a40 100644
2124 --- a/arch/arm/include/asm/smp.h
2125 +++ b/arch/arm/include/asm/smp.h
2126 @@ -107,7 +107,7 @@ struct smp_operations {
2127 int (*cpu_disable)(unsigned int cpu);
2128 #endif
2129 #endif
2130 -};
2131 +} __no_const;
2132
2133 struct of_cpu_method {
2134 const char *method;
2135 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2136 index ce73ab6..7310f8a 100644
2137 --- a/arch/arm/include/asm/thread_info.h
2138 +++ b/arch/arm/include/asm/thread_info.h
2139 @@ -78,9 +78,9 @@ struct thread_info {
2140 .flags = 0, \
2141 .preempt_count = INIT_PREEMPT_COUNT, \
2142 .addr_limit = KERNEL_DS, \
2143 - .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2144 - domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2145 - domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2146 + .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2147 + domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2148 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2149 .restart_block = { \
2150 .fn = do_no_restart_syscall, \
2151 }, \
2152 @@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2153 #define TIF_SYSCALL_AUDIT 9
2154 #define TIF_SYSCALL_TRACEPOINT 10
2155 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2156 -#define TIF_NOHZ 12 /* in adaptive nohz mode */
2157 +/* within 8 bits of TIF_SYSCALL_TRACE
2158 + * to meet flexible second operand requirements
2159 + */
2160 +#define TIF_GRSEC_SETXID 12
2161 +#define TIF_NOHZ 13 /* in adaptive nohz mode */
2162 #define TIF_USING_IWMMXT 17
2163 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2164 #define TIF_RESTORE_SIGMASK 20
2165 @@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2166 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2167 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2168 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2169 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2170
2171 /* Checks for any syscall work in entry-common.S */
2172 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2173 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2174 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2175
2176 /*
2177 * Change these and you break ASM code in entry-common.S
2178 diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2179 index 5f833f7..76e6644 100644
2180 --- a/arch/arm/include/asm/tls.h
2181 +++ b/arch/arm/include/asm/tls.h
2182 @@ -3,6 +3,7 @@
2183
2184 #include <linux/compiler.h>
2185 #include <asm/thread_info.h>
2186 +#include <asm/pgtable.h>
2187
2188 #ifdef __ASSEMBLY__
2189 #include <asm/asm-offsets.h>
2190 @@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2191 * at 0xffff0fe0 must be used instead. (see
2192 * entry-armv.S for details)
2193 */
2194 + pax_open_kernel();
2195 *((unsigned int *)0xffff0ff0) = val;
2196 + pax_close_kernel();
2197 #endif
2198 }
2199
2200 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201 index 4767eb9..bf00668 100644
2202 --- a/arch/arm/include/asm/uaccess.h
2203 +++ b/arch/arm/include/asm/uaccess.h
2204 @@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208 +#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212 @@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216 - modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217 + modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224 +
2225 +static inline void pax_open_userland(void)
2226 +{
2227 +
2228 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2229 + if (segment_eq(get_fs(), USER_DS)) {
2230 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231 + modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232 + }
2233 +#endif
2234 +
2235 +}
2236 +
2237 +static inline void pax_close_userland(void)
2238 +{
2239 +
2240 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2241 + if (segment_eq(get_fs(), USER_DS)) {
2242 + BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243 + modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244 + }
2245 +#endif
2246 +
2247 +}
2248 +
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252 @@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256 + int __e; \
2257 might_fault(); \
2258 - __get_user_check(x,p); \
2259 + pax_open_userland(); \
2260 + __e = __get_user_check(x,p); \
2261 + pax_close_userland(); \
2262 + __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266 @@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270 + int __e; \
2271 might_fault(); \
2272 - __put_user_check(x,p); \
2273 + pax_open_userland(); \
2274 + __e = __put_user_check(x,p); \
2275 + pax_close_userland(); \
2276 + __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280 @@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284 +#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288 @@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292 + pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294 + pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300 + pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302 + pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306 @@ -368,13 +409,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310 + pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312 + pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318 + pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320 + pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324 @@ -474,11 +519,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332 +
2333 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334 +{
2335 + unsigned long ret;
2336 +
2337 + check_object_size(to, n, false);
2338 + pax_open_userland();
2339 + ret = ___copy_from_user(to, from, n);
2340 + pax_close_userland();
2341 + return ret;
2342 +}
2343 +
2344 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345 +{
2346 + unsigned long ret;
2347 +
2348 + check_object_size(from, n, true);
2349 + pax_open_userland();
2350 + ret = ___copy_to_user(to, from, n);
2351 + pax_close_userland();
2352 + return ret;
2353 +}
2354 +
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356 -extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357 +extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359 +
2360 +static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361 +{
2362 + unsigned long ret;
2363 + pax_open_userland();
2364 + ret = ___clear_user(addr, n);
2365 + pax_close_userland();
2366 + return ret;
2367 +}
2368 +
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372 @@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376 + if ((long)n < 0)
2377 + return n;
2378 +
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382 @@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386 + if ((long)n < 0)
2387 + return n;
2388 +
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393 index 5af0ed1..cea83883 100644
2394 --- a/arch/arm/include/uapi/asm/ptrace.h
2395 +++ b/arch/arm/include/uapi/asm/ptrace.h
2396 @@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400 -#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401 +#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406 index a88671c..1cc895e 100644
2407 --- a/arch/arm/kernel/armksyms.c
2408 +++ b/arch/arm/kernel/armksyms.c
2409 @@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413 -EXPORT_SYMBOL(csum_partial_copy_from_user);
2414 +EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418 @@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422 -EXPORT_SYMBOL(__copy_from_user);
2423 -EXPORT_SYMBOL(__copy_to_user);
2424 -EXPORT_SYMBOL(__clear_user);
2425 +EXPORT_SYMBOL(___copy_from_user);
2426 +EXPORT_SYMBOL(___copy_to_user);
2427 +EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432 index 2f5555d..d493c91 100644
2433 --- a/arch/arm/kernel/entry-armv.S
2434 +++ b/arch/arm/kernel/entry-armv.S
2435 @@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439 + .macro pax_enter_kernel
2440 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441 + @ make aligned space for saved DACR
2442 + sub sp, sp, #8
2443 + @ save regs
2444 + stmdb sp!, {r1, r2}
2445 + @ read DACR from cpu_domain into r1
2446 + mov r2, sp
2447 + @ assume 8K pages, since we have to split the immediate in two
2448 + bic r2, r2, #(0x1fc0)
2449 + bic r2, r2, #(0x3f)
2450 + ldr r1, [r2, #TI_CPU_DOMAIN]
2451 + @ store old DACR on stack
2452 + str r1, [sp, #8]
2453 +#ifdef CONFIG_PAX_KERNEXEC
2454 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457 +#endif
2458 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2459 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461 +#endif
2462 + @ write r1 to current_thread_info()->cpu_domain
2463 + str r1, [r2, #TI_CPU_DOMAIN]
2464 + @ write r1 to DACR
2465 + mcr p15, 0, r1, c3, c0, 0
2466 + @ instruction sync
2467 + instr_sync
2468 + @ restore regs
2469 + ldmia sp!, {r1, r2}
2470 +#endif
2471 + .endm
2472 +
2473 + .macro pax_open_userland
2474 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2475 + @ save regs
2476 + stmdb sp!, {r0, r1}
2477 + @ read DACR from cpu_domain into r1
2478 + mov r0, sp
2479 + @ assume 8K pages, since we have to split the immediate in two
2480 + bic r0, r0, #(0x1fc0)
2481 + bic r0, r0, #(0x3f)
2482 + ldr r1, [r0, #TI_CPU_DOMAIN]
2483 + @ set current DOMAIN_USER to DOMAIN_CLIENT
2484 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486 + @ write r1 to current_thread_info()->cpu_domain
2487 + str r1, [r0, #TI_CPU_DOMAIN]
2488 + @ write r1 to DACR
2489 + mcr p15, 0, r1, c3, c0, 0
2490 + @ instruction sync
2491 + instr_sync
2492 + @ restore regs
2493 + ldmia sp!, {r0, r1}
2494 +#endif
2495 + .endm
2496 +
2497 + .macro pax_close_userland
2498 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2499 + @ save regs
2500 + stmdb sp!, {r0, r1}
2501 + @ read DACR from cpu_domain into r1
2502 + mov r0, sp
2503 + @ assume 8K pages, since we have to split the immediate in two
2504 + bic r0, r0, #(0x1fc0)
2505 + bic r0, r0, #(0x3f)
2506 + ldr r1, [r0, #TI_CPU_DOMAIN]
2507 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509 + @ write r1 to current_thread_info()->cpu_domain
2510 + str r1, [r0, #TI_CPU_DOMAIN]
2511 + @ write r1 to DACR
2512 + mcr p15, 0, r1, c3, c0, 0
2513 + @ instruction sync
2514 + instr_sync
2515 + @ restore regs
2516 + ldmia sp!, {r0, r1}
2517 +#endif
2518 + .endm
2519 +
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523 @@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527 +
2528 + pax_enter_kernel
2529 +
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535 +
2536 mov r1, #\reason
2537 .endm
2538
2539 @@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0, trace=1
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543 +
2544 + pax_enter_kernel
2545 +
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547 +
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551 @@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556 + @ offset sp by 8 as done in pax_enter_kernel
2557 + add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558 +#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560 +#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564 @@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2565 .macro usr_entry, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568 +
2569 + pax_enter_kernel_user
2570 +
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574 @@ -478,7 +575,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578 + pax_open_userland
2579 1: ldrt r0, [r4]
2580 + pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584 @@ -512,11 +611,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588 + pax_open_userland
2589 2: ldrht r5, [r4]
2590 + pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594 + pax_open_userland
2595 3: ldrht r0, [r2]
2596 + pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600 @@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604 -4: str r4, [sp, #S_PC] @ retry current instruction
2605 +4: pax_close_userland
2606 + str r4, [sp, #S_PC] @ retry current instruction
2607 ret r9
2608 .popsection
2609 .pushsection __ex_table,"a"
2610 @@ -766,7 +870,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614 -#ifdef CONFIG_CPU_USE_DOMAINS
2615 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619 @@ -775,7 +879,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623 -#ifdef CONFIG_CPU_USE_DOMAINS
2624 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629 index 6bb09d4..113e875 100644
2630 --- a/arch/arm/kernel/entry-common.S
2631 +++ b/arch/arm/kernel/entry-common.S
2632 @@ -11,18 +11,46 @@
2633 #include <asm/assembler.h>
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636 +#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639 +#include "entry-header.S"
2640 +
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646 + @ save regs
2647 + stmdb sp!, {r1, r2}
2648 + @ read DACR from cpu_domain into r1
2649 + mov r2, sp
2650 + @ assume 8K pages, since we have to split the immediate in two
2651 + bic r2, r2, #(0x1fc0)
2652 + bic r2, r2, #(0x3f)
2653 + ldr r1, [r2, #TI_CPU_DOMAIN]
2654 +#ifdef CONFIG_PAX_KERNEXEC
2655 + @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658 +#endif
2659 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2660 + @ set current DOMAIN_USER to DOMAIN_UDEREF
2661 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662 + orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663 +#endif
2664 + @ write r1 to current_thread_info()->cpu_domain
2665 + str r1, [r2, #TI_CPU_DOMAIN]
2666 + @ write r1 to DACR
2667 + mcr p15, 0, r1, c3, c0, 0
2668 + @ instruction sync
2669 + instr_sync
2670 + @ restore regs
2671 + ldmia sp!, {r1, r2}
2672 +#endif
2673 .endm
2674 #endif
2675
2676 -#include "entry-header.S"
2677 -
2678 -
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682 @@ -406,6 +434,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686 + /*
2687 + * do this here to avoid a performance hit of wrapping the code above
2688 + * that directly dereferences userland to parse the SWI instruction
2689 + */
2690 + pax_enter_kernel_user
2691 +
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696 index 4176df7..a901f8d 100644
2697 --- a/arch/arm/kernel/entry-header.S
2698 +++ b/arch/arm/kernel/entry-header.S
2699 @@ -196,6 +196,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703 + .macro pax_enter_kernel_user
2704 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705 + @ save regs
2706 + stmdb sp!, {r0, r1}
2707 + @ read DACR from cpu_domain into r1
2708 + mov r0, sp
2709 + @ assume 8K pages, since we have to split the immediate in two
2710 + bic r0, r0, #(0x1fc0)
2711 + bic r0, r0, #(0x3f)
2712 + ldr r1, [r0, #TI_CPU_DOMAIN]
2713 +#ifdef CONFIG_PAX_MEMORY_UDEREF
2714 + @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715 + bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716 +#endif
2717 +#ifdef CONFIG_PAX_KERNEXEC
2718 + @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719 + bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720 + orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721 +#endif
2722 + @ write r1 to current_thread_info()->cpu_domain
2723 + str r1, [r0, #TI_CPU_DOMAIN]
2724 + @ write r1 to DACR
2725 + mcr p15, 0, r1, c3, c0, 0
2726 + @ instruction sync
2727 + instr_sync
2728 + @ restore regs
2729 + ldmia sp!, {r0, r1}
2730 +#endif
2731 + .endm
2732 +
2733 + .macro pax_exit_kernel
2734 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735 + @ save regs
2736 + stmdb sp!, {r0, r1}
2737 + @ read old DACR from stack into r1
2738 + ldr r1, [sp, #(8 + S_SP)]
2739 + sub r1, r1, #8
2740 + ldr r1, [r1]
2741 +
2742 + @ write r1 to current_thread_info()->cpu_domain
2743 + mov r0, sp
2744 + @ assume 8K pages, since we have to split the immediate in two
2745 + bic r0, r0, #(0x1fc0)
2746 + bic r0, r0, #(0x3f)
2747 + str r1, [r0, #TI_CPU_DOMAIN]
2748 + @ write r1 to DACR
2749 + mcr p15, 0, r1, c3, c0, 0
2750 + @ instruction sync
2751 + instr_sync
2752 + @ restore regs
2753 + ldmia sp!, {r0, r1}
2754 +#endif
2755 + .endm
2756 +
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760 @@ -215,6 +269,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764 +
2765 + pax_exit_kernel
2766 +
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2769 @ We must avoid clrex due to Cortex-A15 erratum #830321
2770 @@ -290,6 +347,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774 +
2775 + pax_exit_kernel
2776 +
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779
2780 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781 index b37752a..ff5cb72 100644
2782 --- a/arch/arm/kernel/fiq.c
2783 +++ b/arch/arm/kernel/fiq.c
2784 @@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788 + pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790 + pax_close_kernel();
2791 +
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796 index 664eee8..f470938 100644
2797 --- a/arch/arm/kernel/head.S
2798 +++ b/arch/arm/kernel/head.S
2799 @@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803 - domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804 + domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809 index 6a4dffe..4a86a70 100644
2810 --- a/arch/arm/kernel/module.c
2811 +++ b/arch/arm/kernel/module.c
2812 @@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816 -void *module_alloc(unsigned long size)
2817 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819 + if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820 + return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822 - GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823 + GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826 +
2827 +void *module_alloc(unsigned long size)
2828 +{
2829 +
2830 +#ifdef CONFIG_PAX_KERNEXEC
2831 + return __module_alloc(size, PAGE_KERNEL);
2832 +#else
2833 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2834 +#endif
2835 +
2836 +}
2837 +
2838 +#ifdef CONFIG_PAX_KERNEXEC
2839 +void module_free_exec(struct module *mod, void *module_region)
2840 +{
2841 + module_free(mod, module_region);
2842 +}
2843 +EXPORT_SYMBOL(module_free_exec);
2844 +
2845 +void *module_alloc_exec(unsigned long size)
2846 +{
2847 + return __module_alloc(size, PAGE_KERNEL_EXEC);
2848 +}
2849 +EXPORT_SYMBOL(module_alloc_exec);
2850 +#endif
2851 #endif
2852
2853 int
2854 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855 index 07314af..c46655c 100644
2856 --- a/arch/arm/kernel/patch.c
2857 +++ b/arch/arm/kernel/patch.c
2858 @@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862 + pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866 @@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870 + pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875 index fe972a2..a772d83 100644
2876 --- a/arch/arm/kernel/process.c
2877 +++ b/arch/arm/kernel/process.c
2878 @@ -207,6 +207,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882 + BUG();
2883 }
2884
2885 /*
2886 @@ -220,7 +221,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890 -void machine_restart(char *cmd)
2891 +__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895 @@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899 - print_symbol("PC is at %s\n", instruction_pointer(regs));
2900 - print_symbol("LR is at %s\n", regs->ARM_lr);
2901 + printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902 + printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906 @@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910 -unsigned long arch_randomize_brk(struct mm_struct *mm)
2911 -{
2912 - unsigned long range_end = mm->brk + 0x02000000;
2913 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914 -}
2915 -
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919 @@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923 - gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928 @@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2929 return is_gate_vma(vma) ? "[vectors]" : NULL;
2930 }
2931
2932 -/* If possible, provide a placement hint at a random offset from the
2933 - * stack for the signal page.
2934 - */
2935 -static unsigned long sigpage_addr(const struct mm_struct *mm,
2936 - unsigned int npages)
2937 -{
2938 - unsigned long offset;
2939 - unsigned long first;
2940 - unsigned long last;
2941 - unsigned long addr;
2942 - unsigned int slots;
2943 -
2944 - first = PAGE_ALIGN(mm->start_stack);
2945 -
2946 - last = TASK_SIZE - (npages << PAGE_SHIFT);
2947 -
2948 - /* No room after stack? */
2949 - if (first > last)
2950 - return 0;
2951 -
2952 - /* Just enough room? */
2953 - if (first == last)
2954 - return first;
2955 -
2956 - slots = ((last - first) >> PAGE_SHIFT) + 1;
2957 -
2958 - offset = get_random_int() % slots;
2959 -
2960 - addr = first + (offset << PAGE_SHIFT);
2961 -
2962 - return addr;
2963 -}
2964 -
2965 -static struct page *signal_page;
2966 -extern struct page *get_signal_page(void);
2967 -
2968 -static const struct vm_special_mapping sigpage_mapping = {
2969 - .name = "[sigpage]",
2970 - .pages = &signal_page,
2971 -};
2972 -
2973 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2974 {
2975 struct mm_struct *mm = current->mm;
2976 - struct vm_area_struct *vma;
2977 - unsigned long addr;
2978 - unsigned long hint;
2979 - int ret = 0;
2980 -
2981 - if (!signal_page)
2982 - signal_page = get_signal_page();
2983 - if (!signal_page)
2984 - return -ENOMEM;
2985
2986 down_write(&mm->mmap_sem);
2987 - hint = sigpage_addr(mm, 1);
2988 - addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2989 - if (IS_ERR_VALUE(addr)) {
2990 - ret = addr;
2991 - goto up_fail;
2992 - }
2993 -
2994 - vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2995 - VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2996 - &sigpage_mapping);
2997 -
2998 - if (IS_ERR(vma)) {
2999 - ret = PTR_ERR(vma);
3000 - goto up_fail;
3001 - }
3002 -
3003 - mm->context.sigpage = addr;
3004 -
3005 - up_fail:
3006 + mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3007 up_write(&mm->mmap_sem);
3008 - return ret;
3009 + return 0;
3010 }
3011 #endif
3012 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3013 index f73891b..cf3004e 100644
3014 --- a/arch/arm/kernel/psci.c
3015 +++ b/arch/arm/kernel/psci.c
3016 @@ -28,7 +28,7 @@
3017 #include <asm/psci.h>
3018 #include <asm/system_misc.h>
3019
3020 -struct psci_operations psci_ops;
3021 +struct psci_operations psci_ops __read_only;
3022
3023 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3024 typedef int (*psci_initcall_t)(const struct device_node *);
3025 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3026 index ef9119f..31995a3 100644
3027 --- a/arch/arm/kernel/ptrace.c
3028 +++ b/arch/arm/kernel/ptrace.c
3029 @@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3030 regs->ARM_ip = ip;
3031 }
3032
3033 +#ifdef CONFIG_GRKERNSEC_SETXID
3034 +extern void gr_delayed_cred_worker(void);
3035 +#endif
3036 +
3037 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3038 {
3039 current_thread_info()->syscall = scno;
3040
3041 +#ifdef CONFIG_GRKERNSEC_SETXID
3042 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3043 + gr_delayed_cred_worker();
3044 +#endif
3045 +
3046 /* Do the secure computing check first; failures should be fast. */
3047 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3048 if (secure_computing() == -1)
3049 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3050 index 306e1ac..1b477ed 100644
3051 --- a/arch/arm/kernel/setup.c
3052 +++ b/arch/arm/kernel/setup.c
3053 @@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3054 unsigned int elf_hwcap2 __read_mostly;
3055 EXPORT_SYMBOL(elf_hwcap2);
3056
3057 +pteval_t __supported_pte_mask __read_only;
3058 +pmdval_t __supported_pmd_mask __read_only;
3059
3060 #ifdef MULTI_CPU
3061 -struct processor processor __read_mostly;
3062 +struct processor processor __read_only;
3063 #endif
3064 #ifdef MULTI_TLB
3065 -struct cpu_tlb_fns cpu_tlb __read_mostly;
3066 +struct cpu_tlb_fns cpu_tlb __read_only;
3067 #endif
3068 #ifdef MULTI_USER
3069 -struct cpu_user_fns cpu_user __read_mostly;
3070 +struct cpu_user_fns cpu_user __read_only;
3071 #endif
3072 #ifdef MULTI_CACHE
3073 -struct cpu_cache_fns cpu_cache __read_mostly;
3074 +struct cpu_cache_fns cpu_cache __read_only;
3075 #endif
3076 #ifdef CONFIG_OUTER_CACHE
3077 -struct outer_cache_fns outer_cache __read_mostly;
3078 +struct outer_cache_fns outer_cache __read_only;
3079 EXPORT_SYMBOL(outer_cache);
3080 #endif
3081
3082 @@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3083 asm("mrc p15, 0, %0, c0, c1, 4"
3084 : "=r" (mmfr0));
3085 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3086 - (mmfr0 & 0x000000f0) >= 0x00000030)
3087 + (mmfr0 & 0x000000f0) >= 0x00000030) {
3088 cpu_arch = CPU_ARCH_ARMv7;
3089 - else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3090 + if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3091 + __supported_pte_mask |= L_PTE_PXN;
3092 + __supported_pmd_mask |= PMD_PXNTABLE;
3093 + }
3094 + } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3095 (mmfr0 & 0x000000f0) == 0x00000020)
3096 cpu_arch = CPU_ARCH_ARMv6;
3097 else
3098 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3099 index bd19834..e4d8c66 100644
3100 --- a/arch/arm/kernel/signal.c
3101 +++ b/arch/arm/kernel/signal.c
3102 @@ -24,8 +24,6 @@
3103
3104 extern const unsigned long sigreturn_codes[7];
3105
3106 -static unsigned long signal_return_offset;
3107 -
3108 #ifdef CONFIG_CRUNCH
3109 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3110 {
3111 @@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3112 * except when the MPU has protected the vectors
3113 * page from PL0
3114 */
3115 - retcode = mm->context.sigpage + signal_return_offset +
3116 - (idx << 2) + thumb;
3117 + retcode = mm->context.sigpage + (idx << 2) + thumb;
3118 } else
3119 #endif
3120 {
3121 @@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3122 } while (thread_flags & _TIF_WORK_MASK);
3123 return 0;
3124 }
3125 -
3126 -struct page *get_signal_page(void)
3127 -{
3128 - unsigned long ptr;
3129 - unsigned offset;
3130 - struct page *page;
3131 - void *addr;
3132 -
3133 - page = alloc_pages(GFP_KERNEL, 0);
3134 -
3135 - if (!page)
3136 - return NULL;
3137 -
3138 - addr = page_address(page);
3139 -
3140 - /* Give the signal return code some randomness */
3141 - offset = 0x200 + (get_random_int() & 0x7fc);
3142 - signal_return_offset = offset;
3143 -
3144 - /*
3145 - * Copy signal return handlers into the vector page, and
3146 - * set sigreturn to be a pointer to these.
3147 - */
3148 - memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3149 -
3150 - ptr = (unsigned long)addr + offset;
3151 - flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3152 -
3153 - return page;
3154 -}
3155 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3156 index a8e32aa..b2f7198 100644
3157 --- a/arch/arm/kernel/smp.c
3158 +++ b/arch/arm/kernel/smp.c
3159 @@ -76,7 +76,7 @@ enum ipi_msg_type {
3160
3161 static DECLARE_COMPLETION(cpu_running);
3162
3163 -static struct smp_operations smp_ops;
3164 +static struct smp_operations smp_ops __read_only;
3165
3166 void __init smp_set_ops(struct smp_operations *ops)
3167 {
3168 diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3169 index 7a3be1d..b00c7de 100644
3170 --- a/arch/arm/kernel/tcm.c
3171 +++ b/arch/arm/kernel/tcm.c
3172 @@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3173 .virtual = ITCM_OFFSET,
3174 .pfn = __phys_to_pfn(ITCM_OFFSET),
3175 .length = 0,
3176 - .type = MT_MEMORY_RWX_ITCM,
3177 + .type = MT_MEMORY_RX_ITCM,
3178 }
3179 };
3180
3181 @@ -267,7 +267,9 @@ no_dtcm:
3182 start = &__sitcm_text;
3183 end = &__eitcm_text;
3184 ram = &__itcm_start;
3185 + pax_open_kernel();
3186 memcpy(start, ram, itcm_code_sz);
3187 + pax_close_kernel();
3188 pr_debug("CPU ITCM: copied code from %p - %p\n",
3189 start, end);
3190 itcm_present = true;
3191 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3192 index 9f5d818..e013427 100644
3193 --- a/arch/arm/kernel/traps.c
3194 +++ b/arch/arm/kernel/traps.c
3195 @@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3196 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3197 {
3198 #ifdef CONFIG_KALLSYMS
3199 - printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3200 + printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3201 #else
3202 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3203 #endif
3204 @@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3205 static int die_owner = -1;
3206 static unsigned int die_nest_count;
3207
3208 +extern void gr_handle_kernel_exploit(void);
3209 +
3210 static unsigned long oops_begin(void)
3211 {
3212 int cpu;
3213 @@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3214 panic("Fatal exception in interrupt");
3215 if (panic_on_oops)
3216 panic("Fatal exception");
3217 +
3218 + gr_handle_kernel_exploit();
3219 +
3220 if (signr)
3221 do_exit(signr);
3222 }
3223 @@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3224 kuser_init(vectors_base);
3225
3226 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3227 - modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3228 +
3229 +#ifndef CONFIG_PAX_MEMORY_UDEREF
3230 + modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3231 +#endif
3232 +
3233 #else /* ifndef CONFIG_CPU_V7M */
3234 /*
3235 * on V7-M there is no need to copy the vector table to a dedicated
3236 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3237 index 8e95aa4..595dfc8 100644
3238 --- a/arch/arm/kernel/vmlinux.lds.S
3239 +++ b/arch/arm/kernel/vmlinux.lds.S
3240 @@ -8,7 +8,11 @@
3241 #include <asm/thread_info.h>
3242 #include <asm/memory.h>
3243 #include <asm/page.h>
3244 -
3245 +
3246 +#ifdef CONFIG_PAX_KERNEXEC
3247 +#include <asm/pgtable.h>
3248 +#endif
3249 +
3250 #define PROC_INFO \
3251 . = ALIGN(4); \
3252 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3253 @@ -34,7 +38,7 @@
3254 #endif
3255
3256 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3257 - defined(CONFIG_GENERIC_BUG)
3258 + defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3259 #define ARM_EXIT_KEEP(x) x
3260 #define ARM_EXIT_DISCARD(x)
3261 #else
3262 @@ -90,6 +94,11 @@ SECTIONS
3263 _text = .;
3264 HEAD_TEXT
3265 }
3266 +
3267 +#ifdef CONFIG_PAX_KERNEXEC
3268 + . = ALIGN(1<<SECTION_SHIFT);
3269 +#endif
3270 +
3271 .text : { /* Real text segment */
3272 _stext = .; /* Text and read-only data */
3273 __exception_text_start = .;
3274 @@ -112,6 +121,8 @@ SECTIONS
3275 ARM_CPU_KEEP(PROC_INFO)
3276 }
3277
3278 + _etext = .; /* End of text section */
3279 +
3280 RO_DATA(PAGE_SIZE)
3281
3282 . = ALIGN(4);
3283 @@ -142,7 +153,9 @@ SECTIONS
3284
3285 NOTES
3286
3287 - _etext = .; /* End of text and rodata section */
3288 +#ifdef CONFIG_PAX_KERNEXEC
3289 + . = ALIGN(1<<SECTION_SHIFT);
3290 +#endif
3291
3292 #ifndef CONFIG_XIP_KERNEL
3293 . = ALIGN(PAGE_SIZE);
3294 @@ -221,6 +234,11 @@ SECTIONS
3295 #else
3296 . = ALIGN(THREAD_SIZE);
3297 __init_end = .;
3298 +
3299 +#ifdef CONFIG_PAX_KERNEXEC
3300 + . = ALIGN(1<<SECTION_SHIFT);
3301 +#endif
3302 +
3303 __data_loc = .;
3304 #endif
3305
3306 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3307 index 9e193c8..3560fe6 100644
3308 --- a/arch/arm/kvm/arm.c
3309 +++ b/arch/arm/kvm/arm.c
3310 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3311 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3312
3313 /* The VMID used in the VTTBR */
3314 -static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3315 +static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3316 static u8 kvm_next_vmid;
3317 static DEFINE_SPINLOCK(kvm_vmid_lock);
3318
3319 @@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3320 */
3321 static bool need_new_vmid_gen(struct kvm *kvm)
3322 {
3323 - return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3324 + return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3325 }
3326
3327 /**
3328 @@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3329
3330 /* First user of a new VMID generation? */
3331 if (unlikely(kvm_next_vmid == 0)) {
3332 - atomic64_inc(&kvm_vmid_gen);
3333 + atomic64_inc_unchecked(&kvm_vmid_gen);
3334 kvm_next_vmid = 1;
3335
3336 /*
3337 @@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3338 kvm_call_hyp(__kvm_flush_vm_context);
3339 }
3340
3341 - kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3342 + kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3343 kvm->arch.vmid = kvm_next_vmid;
3344 kvm_next_vmid++;
3345
3346 @@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3347 /**
3348 * Initialize Hyp-mode and memory mappings on all CPUs.
3349 */
3350 -int kvm_arch_init(void *opaque)
3351 +int kvm_arch_init(const void *opaque)
3352 {
3353 int err;
3354 int ret, cpu;
3355 diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3356 index 14a0d98..7771a7d 100644
3357 --- a/arch/arm/lib/clear_user.S
3358 +++ b/arch/arm/lib/clear_user.S
3359 @@ -12,14 +12,14 @@
3360
3361 .text
3362
3363 -/* Prototype: int __clear_user(void *addr, size_t sz)
3364 +/* Prototype: int ___clear_user(void *addr, size_t sz)
3365 * Purpose : clear some user memory
3366 * Params : addr - user memory address to clear
3367 * : sz - number of bytes to clear
3368 * Returns : number of bytes NOT cleared
3369 */
3370 ENTRY(__clear_user_std)
3371 -WEAK(__clear_user)
3372 +WEAK(___clear_user)
3373 stmfd sp!, {r1, lr}
3374 mov r2, #0
3375 cmp r1, #4
3376 @@ -44,7 +44,7 @@ WEAK(__clear_user)
3377 USER( strnebt r2, [r0])
3378 mov r0, #0
3379 ldmfd sp!, {r1, pc}
3380 -ENDPROC(__clear_user)
3381 +ENDPROC(___clear_user)
3382 ENDPROC(__clear_user_std)
3383
3384 .pushsection .fixup,"ax"
3385 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3386 index 66a477a..bee61d3 100644
3387 --- a/arch/arm/lib/copy_from_user.S
3388 +++ b/arch/arm/lib/copy_from_user.S
3389 @@ -16,7 +16,7 @@
3390 /*
3391 * Prototype:
3392 *
3393 - * size_t __copy_from_user(void *to, const void *from, size_t n)
3394 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
3395 *
3396 * Purpose:
3397 *
3398 @@ -84,11 +84,11 @@
3399
3400 .text
3401
3402 -ENTRY(__copy_from_user)
3403 +ENTRY(___copy_from_user)
3404
3405 #include "copy_template.S"
3406
3407 -ENDPROC(__copy_from_user)
3408 +ENDPROC(___copy_from_user)
3409
3410 .pushsection .fixup,"ax"
3411 .align 0
3412 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3413 index 6ee2f67..d1cce76 100644
3414 --- a/arch/arm/lib/copy_page.S
3415 +++ b/arch/arm/lib/copy_page.S
3416 @@ -10,6 +10,7 @@
3417 * ASM optimised string functions
3418 */
3419 #include <linux/linkage.h>
3420 +#include <linux/const.h>
3421 #include <asm/assembler.h>
3422 #include <asm/asm-offsets.h>
3423 #include <asm/cache.h>
3424 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3425 index d066df6..df28194 100644
3426 --- a/arch/arm/lib/copy_to_user.S
3427 +++ b/arch/arm/lib/copy_to_user.S
3428 @@ -16,7 +16,7 @@
3429 /*
3430 * Prototype:
3431 *
3432 - * size_t __copy_to_user(void *to, const void *from, size_t n)
3433 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
3434 *
3435 * Purpose:
3436 *
3437 @@ -88,11 +88,11 @@
3438 .text
3439
3440 ENTRY(__copy_to_user_std)
3441 -WEAK(__copy_to_user)
3442 +WEAK(___copy_to_user)
3443
3444 #include "copy_template.S"
3445
3446 -ENDPROC(__copy_to_user)
3447 +ENDPROC(___copy_to_user)
3448 ENDPROC(__copy_to_user_std)
3449
3450 .pushsection .fixup,"ax"
3451 diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3452 index 7d08b43..f7ca7ea 100644
3453 --- a/arch/arm/lib/csumpartialcopyuser.S
3454 +++ b/arch/arm/lib/csumpartialcopyuser.S
3455 @@ -57,8 +57,8 @@
3456 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3457 */
3458
3459 -#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3460 -#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3461 +#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3462 +#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3463
3464 #include "csumpartialcopygeneric.S"
3465
3466 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3467 index 312d43e..21d2322 100644
3468 --- a/arch/arm/lib/delay.c
3469 +++ b/arch/arm/lib/delay.c
3470 @@ -29,7 +29,7 @@
3471 /*
3472 * Default to the loop-based delay implementation.
3473 */
3474 -struct arm_delay_ops arm_delay_ops = {
3475 +struct arm_delay_ops arm_delay_ops __read_only = {
3476 .delay = __loop_delay,
3477 .const_udelay = __loop_const_udelay,
3478 .udelay = __loop_udelay,
3479 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3480 index 3e58d71..029817c 100644
3481 --- a/arch/arm/lib/uaccess_with_memcpy.c
3482 +++ b/arch/arm/lib/uaccess_with_memcpy.c
3483 @@ -136,7 +136,7 @@ out:
3484 }
3485
3486 unsigned long
3487 -__copy_to_user(void __user *to, const void *from, unsigned long n)
3488 +___copy_to_user(void __user *to, const void *from, unsigned long n)
3489 {
3490 /*
3491 * This test is stubbed out of the main function above to keep
3492 @@ -190,7 +190,7 @@ out:
3493 return n;
3494 }
3495
3496 -unsigned long __clear_user(void __user *addr, unsigned long n)
3497 +unsigned long ___clear_user(void __user *addr, unsigned long n)
3498 {
3499 /* See rational for this in __copy_to_user() above. */
3500 if (n < 64)
3501 diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3502 index 9610792..4dfb851 100644
3503 --- a/arch/arm/mach-at91/setup.c
3504 +++ b/arch/arm/mach-at91/setup.c
3505 @@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3506
3507 desc->pfn = __phys_to_pfn(base);
3508 desc->length = length;
3509 - desc->type = MT_MEMORY_RWX_NONCACHED;
3510 + desc->type = MT_MEMORY_RW_NONCACHED;
3511
3512 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3513 base, length, desc->virtual);
3514 diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3515 index 7f352de..6dc0929 100644
3516 --- a/arch/arm/mach-keystone/keystone.c
3517 +++ b/arch/arm/mach-keystone/keystone.c
3518 @@ -27,7 +27,7 @@
3519
3520 #include "keystone.h"
3521
3522 -static struct notifier_block platform_nb;
3523 +static notifier_block_no_const platform_nb;
3524 static unsigned long keystone_dma_pfn_offset __read_mostly;
3525
3526 static int keystone_platform_notifier(struct notifier_block *nb,
3527 diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3528 index c31f4c0..c86224d 100644
3529 --- a/arch/arm/mach-mvebu/coherency.c
3530 +++ b/arch/arm/mach-mvebu/coherency.c
3531 @@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3532
3533 /*
3534 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3535 - * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3536 + * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3537 * is needed as a workaround for a deadlock issue between the PCIe
3538 * interface and the cache controller.
3539 */
3540 @@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3541 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3542
3543 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3544 - mtype = MT_UNCACHED;
3545 + mtype = MT_UNCACHED_RW;
3546
3547 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3548 }
3549 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3550 index 97767a2..9233746 100644
3551 --- a/arch/arm/mach-omap2/board-n8x0.c
3552 +++ b/arch/arm/mach-omap2/board-n8x0.c
3553 @@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3554 }
3555 #endif
3556
3557 -struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3558 +struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3559 .late_init = n8x0_menelaus_late_init,
3560 };
3561
3562 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3563 index 5fa3755..1e8c247 100644
3564 --- a/arch/arm/mach-omap2/gpmc.c
3565 +++ b/arch/arm/mach-omap2/gpmc.c
3566 @@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3567 };
3568
3569 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3570 -static struct irq_chip gpmc_irq_chip;
3571 static int gpmc_irq_start;
3572
3573 static struct resource gpmc_mem_root;
3574 @@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3575
3576 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3577
3578 +static struct irq_chip gpmc_irq_chip = {
3579 + .name = "gpmc",
3580 + .irq_startup = gpmc_irq_noop_ret,
3581 + .irq_enable = gpmc_irq_enable,
3582 + .irq_disable = gpmc_irq_disable,
3583 + .irq_shutdown = gpmc_irq_noop,
3584 + .irq_ack = gpmc_irq_noop,
3585 + .irq_mask = gpmc_irq_noop,
3586 + .irq_unmask = gpmc_irq_noop,
3587 +
3588 +};
3589 +
3590 static int gpmc_setup_irq(void)
3591 {
3592 int i;
3593 @@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3594 return gpmc_irq_start;
3595 }
3596
3597 - gpmc_irq_chip.name = "gpmc";
3598 - gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3599 - gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3600 - gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3601 - gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3602 - gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3603 - gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3604 - gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3605 -
3606 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3607 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3608
3609 diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3610 index 6944ae3..bc587ca 100644
3611 --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3612 +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3613 @@ -86,7 +86,7 @@ struct cpu_pm_ops {
3614 void (*resume)(void);
3615 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3616 void (*hotplug_restart)(void);
3617 -};
3618 +} __no_const;
3619
3620 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3621 static struct powerdomain *mpuss_pd;
3622 @@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3623 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3624 {}
3625
3626 -struct cpu_pm_ops omap_pm_ops = {
3627 +static struct cpu_pm_ops omap_pm_ops __read_only = {
3628 .finish_suspend = default_finish_suspend,
3629 .resume = dummy_cpu_resume,
3630 .scu_prepare = dummy_scu_prepare,
3631 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3632 index f961c46..4a453dc 100644
3633 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
3634 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3635 @@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3636 return NOTIFY_OK;
3637 }
3638
3639 -static struct notifier_block __refdata irq_hotplug_notifier = {
3640 +static struct notifier_block irq_hotplug_notifier = {
3641 .notifier_call = irq_cpu_hotplug_notify,
3642 };
3643
3644 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3645 index 8c58b71..95b655f 100644
3646 --- a/arch/arm/mach-omap2/omap_device.c
3647 +++ b/arch/arm/mach-omap2/omap_device.c
3648 @@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3649 struct platform_device __init *omap_device_build(const char *pdev_name,
3650 int pdev_id,
3651 struct omap_hwmod *oh,
3652 - void *pdata, int pdata_len)
3653 + const void *pdata, int pdata_len)
3654 {
3655 struct omap_hwmod *ohs[] = { oh };
3656
3657 @@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3658 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3659 int pdev_id,
3660 struct omap_hwmod **ohs,
3661 - int oh_cnt, void *pdata,
3662 + int oh_cnt, const void *pdata,
3663 int pdata_len)
3664 {
3665 int ret = -ENOMEM;
3666 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3667 index 78c02b3..c94109a 100644
3668 --- a/arch/arm/mach-omap2/omap_device.h
3669 +++ b/arch/arm/mach-omap2/omap_device.h
3670 @@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3671 /* Core code interface */
3672
3673 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3674 - struct omap_hwmod *oh, void *pdata,
3675 + struct omap_hwmod *oh, const void *pdata,
3676 int pdata_len);
3677
3678 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3679 struct omap_hwmod **oh, int oh_cnt,
3680 - void *pdata, int pdata_len);
3681 + const void *pdata, int pdata_len);
3682
3683 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3684 struct omap_hwmod **ohs, int oh_cnt);
3685 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3686 index 716247e..8df346d 100644
3687 --- a/arch/arm/mach-omap2/omap_hwmod.c
3688 +++ b/arch/arm/mach-omap2/omap_hwmod.c
3689 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3690 int (*init_clkdm)(struct omap_hwmod *oh);
3691 void (*update_context_lost)(struct omap_hwmod *oh);
3692 int (*get_context_lost)(struct omap_hwmod *oh);
3693 -};
3694 +} __no_const;
3695
3696 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3697 -static struct omap_hwmod_soc_ops soc_ops;
3698 +static struct omap_hwmod_soc_ops soc_ops __read_only;
3699
3700 /* omap_hwmod_list contains all registered struct omap_hwmods */
3701 static LIST_HEAD(omap_hwmod_list);
3702 diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3703 index 95fee54..cfa9cf1 100644
3704 --- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3705 +++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3706 @@ -10,6 +10,7 @@
3707
3708 #include <linux/kernel.h>
3709 #include <linux/init.h>
3710 +#include <asm/pgtable.h>
3711
3712 #include "powerdomain.h"
3713
3714 @@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3715
3716 void __init am43xx_powerdomains_init(void)
3717 {
3718 - omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3719 + pax_open_kernel();
3720 + *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3721 + pax_close_kernel();
3722 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3723 pwrdm_register_pwrdms(powerdomains_am43xx);
3724 pwrdm_complete_init();
3725 diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3726 index ff0a68c..b312aa0 100644
3727 --- a/arch/arm/mach-omap2/wd_timer.c
3728 +++ b/arch/arm/mach-omap2/wd_timer.c
3729 @@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3730 struct omap_hwmod *oh;
3731 char *oh_name = "wd_timer2";
3732 char *dev_name = "omap_wdt";
3733 - struct omap_wd_timer_platform_data pdata;
3734 + static struct omap_wd_timer_platform_data pdata = {
3735 + .read_reset_sources = prm_read_reset_sources
3736 + };
3737
3738 if (!cpu_class_is_omap2() || of_have_populated_dt())
3739 return 0;
3740 @@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3741 return -EINVAL;
3742 }
3743
3744 - pdata.read_reset_sources = prm_read_reset_sources;
3745 -
3746 pdev = omap_device_build(dev_name, id, oh, &pdata,
3747 sizeof(struct omap_wd_timer_platform_data));
3748 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3749 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3750 index b30bf5c..d0825bf 100644
3751 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3752 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3753 @@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3754 bool entered_lp2 = false;
3755
3756 if (tegra_pending_sgi())
3757 - ACCESS_ONCE(abort_flag) = true;
3758 + ACCESS_ONCE_RW(abort_flag) = true;
3759
3760 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3761
3762 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3763 index 2dea8b5..6499da2 100644
3764 --- a/arch/arm/mach-ux500/setup.h
3765 +++ b/arch/arm/mach-ux500/setup.h
3766 @@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3767 .type = MT_DEVICE, \
3768 }
3769
3770 -#define __MEM_DEV_DESC(x, sz) { \
3771 - .virtual = IO_ADDRESS(x), \
3772 - .pfn = __phys_to_pfn(x), \
3773 - .length = sz, \
3774 - .type = MT_MEMORY_RWX, \
3775 -}
3776 -
3777 extern struct smp_operations ux500_smp_ops;
3778 extern void ux500_cpu_die(unsigned int cpu);
3779
3780 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3781 index 7eb94e6..799ad3e 100644
3782 --- a/arch/arm/mm/Kconfig
3783 +++ b/arch/arm/mm/Kconfig
3784 @@ -446,6 +446,7 @@ config CPU_32v5
3785
3786 config CPU_32v6
3787 bool
3788 + select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3789 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3790
3791 config CPU_32v6K
3792 @@ -600,6 +601,7 @@ config CPU_CP15_MPU
3793
3794 config CPU_USE_DOMAINS
3795 bool
3796 + depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3797 help
3798 This option enables or disables the use of domain switching
3799 via the set_fs() function.
3800 @@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3801
3802 config KUSER_HELPERS
3803 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3804 - depends on MMU
3805 + depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3806 default y
3807 help
3808 Warning: disabling this option may break user programs.
3809 @@ -812,7 +814,7 @@ config KUSER_HELPERS
3810 See Documentation/arm/kernel_user_helpers.txt for details.
3811
3812 However, the fixed address nature of these helpers can be used
3813 - by ROP (return orientated programming) authors when creating
3814 + by ROP (Return Oriented Programming) authors when creating
3815 exploits.
3816
3817 If all of the binaries and libraries which run on your platform
3818 diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3819 index 83792f4..c25d36b 100644
3820 --- a/arch/arm/mm/alignment.c
3821 +++ b/arch/arm/mm/alignment.c
3822 @@ -216,10 +216,12 @@ union offset_union {
3823 #define __get16_unaligned_check(ins,val,addr) \
3824 do { \
3825 unsigned int err = 0, v, a = addr; \
3826 + pax_open_userland(); \
3827 __get8_unaligned_check(ins,v,a,err); \
3828 val = v << ((BE) ? 8 : 0); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 8); \
3831 + pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835 @@ -233,6 +235,7 @@ union offset_union {
3836 #define __get32_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v, a = addr; \
3839 + pax_open_userland(); \
3840 __get8_unaligned_check(ins,v,a,err); \
3841 val = v << ((BE) ? 24 : 0); \
3842 __get8_unaligned_check(ins,v,a,err); \
3843 @@ -241,6 +244,7 @@ union offset_union {
3844 val |= v << ((BE) ? 8 : 16); \
3845 __get8_unaligned_check(ins,v,a,err); \
3846 val |= v << ((BE) ? 0 : 24); \
3847 + pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851 @@ -254,6 +258,7 @@ union offset_union {
3852 #define __put16_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855 + pax_open_userland(); \
3856 __asm__( FIRST_BYTE_16 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859 @@ -273,6 +278,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863 + pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867 @@ -286,6 +292,7 @@ union offset_union {
3868 #define __put32_unaligned_check(ins,val,addr) \
3869 do { \
3870 unsigned int err = 0, v = val, a = addr; \
3871 + pax_open_userland(); \
3872 __asm__( FIRST_BYTE_32 \
3873 ARM( "1: "ins" %1, [%2], #1\n" ) \
3874 THUMB( "1: "ins" %1, [%2]\n" ) \
3875 @@ -315,6 +322,7 @@ union offset_union {
3876 " .popsection\n" \
3877 : "=r" (err), "=&r" (v), "=&r" (a) \
3878 : "0" (err), "1" (v), "2" (a)); \
3879 + pax_close_userland(); \
3880 if (err) \
3881 goto fault; \
3882 } while (0)
3883 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3884 index 5e65ca8..879e7b3 100644
3885 --- a/arch/arm/mm/cache-l2x0.c
3886 +++ b/arch/arm/mm/cache-l2x0.c
3887 @@ -42,7 +42,7 @@ struct l2c_init_data {
3888 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3889 void (*save)(void __iomem *);
3890 struct outer_cache_fns outer_cache;
3891 -};
3892 +} __do_const;
3893
3894 #define CACHE_LINE_SIZE 32
3895
3896 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3897 index 6eb97b3..ac509f6 100644
3898 --- a/arch/arm/mm/context.c
3899 +++ b/arch/arm/mm/context.c
3900 @@ -43,7 +43,7 @@
3901 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3902
3903 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3904 -static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3905 +static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3906 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3907
3908 static DEFINE_PER_CPU(atomic64_t, active_asids);
3909 @@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3910 {
3911 static u32 cur_idx = 1;
3912 u64 asid = atomic64_read(&mm->context.id);
3913 - u64 generation = atomic64_read(&asid_generation);
3914 + u64 generation = atomic64_read_unchecked(&asid_generation);
3915
3916 if (asid != 0 && is_reserved_asid(asid)) {
3917 /*
3918 @@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3919 */
3920 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3921 if (asid == NUM_USER_ASIDS) {
3922 - generation = atomic64_add_return(ASID_FIRST_VERSION,
3923 + generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3924 &asid_generation);
3925 flush_context(cpu);
3926 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3927 @@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3928 cpu_set_reserved_ttbr0();
3929
3930 asid = atomic64_read(&mm->context.id);
3931 - if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3932 + if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3933 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3934 goto switch_mm_fastpath;
3935
3936 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3937 /* Check that our ASID belongs to the current generation. */
3938 asid = atomic64_read(&mm->context.id);
3939 - if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3940 + if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3941 asid = new_context(mm, cpu);
3942 atomic64_set(&mm->context.id, asid);
3943 }
3944 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3945 index eb8830a..e8ff52e 100644
3946 --- a/arch/arm/mm/fault.c
3947 +++ b/arch/arm/mm/fault.c
3948 @@ -25,6 +25,7 @@
3949 #include <asm/system_misc.h>
3950 #include <asm/system_info.h>
3951 #include <asm/tlbflush.h>
3952 +#include <asm/sections.h>
3953
3954 #include "fault.h"
3955
3956 @@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3957 if (fixup_exception(regs))
3958 return;
3959
3960 +#ifdef CONFIG_PAX_MEMORY_UDEREF
3961 + if (addr < TASK_SIZE) {
3962 + if (current->signal->curr_ip)
3963 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
3964 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3965 + else
3966 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3967 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3968 + }
3969 +#endif
3970 +
3971 +#ifdef CONFIG_PAX_KERNEXEC
3972 + if ((fsr & FSR_WRITE) &&
3973 + (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3974 + (MODULES_VADDR <= addr && addr < MODULES_END)))
3975 + {
3976 + if (current->signal->curr_ip)
3977 + 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),
3978 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3979 + else
3980 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3981 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3982 + }
3983 +#endif
3984 +
3985 /*
3986 * No handler, we'll have to terminate things with extreme prejudice.
3987 */
3988 @@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3989 }
3990 #endif
3991
3992 +#ifdef CONFIG_PAX_PAGEEXEC
3993 + if (fsr & FSR_LNX_PF) {
3994 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3995 + do_group_exit(SIGKILL);
3996 + }
3997 +#endif
3998 +
3999 tsk->thread.address = addr;
4000 tsk->thread.error_code = fsr;
4001 tsk->thread.trap_no = 14;
4002 @@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4003 }
4004 #endif /* CONFIG_MMU */
4005
4006 +#ifdef CONFIG_PAX_PAGEEXEC
4007 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4008 +{
4009 + long i;
4010 +
4011 + printk(KERN_ERR "PAX: bytes at PC: ");
4012 + for (i = 0; i < 20; i++) {
4013 + unsigned char c;
4014 + if (get_user(c, (__force unsigned char __user *)pc+i))
4015 + printk(KERN_CONT "?? ");
4016 + else
4017 + printk(KERN_CONT "%02x ", c);
4018 + }
4019 + printk("\n");
4020 +
4021 + printk(KERN_ERR "PAX: bytes at SP-4: ");
4022 + for (i = -1; i < 20; i++) {
4023 + unsigned long c;
4024 + if (get_user(c, (__force unsigned long __user *)sp+i))
4025 + printk(KERN_CONT "???????? ");
4026 + else
4027 + printk(KERN_CONT "%08lx ", c);
4028 + }
4029 + printk("\n");
4030 +}
4031 +#endif
4032 +
4033 /*
4034 * First Level Translation Fault Handler
4035 *
4036 @@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4037 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4038 struct siginfo info;
4039
4040 +#ifdef CONFIG_PAX_MEMORY_UDEREF
4041 + if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4042 + if (current->signal->curr_ip)
4043 + 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),
4044 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4045 + else
4046 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4047 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4048 + goto die;
4049 + }
4050 +#endif
4051 +
4052 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4053 return;
4054
4055 +die:
4056 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4057 inf->name, fsr, addr);
4058
4059 @@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4060 ifsr_info[nr].name = name;
4061 }
4062
4063 +asmlinkage int sys_sigreturn(struct pt_regs *regs);
4064 +asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4065 +
4066 asmlinkage void __exception
4067 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4068 {
4069 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4070 struct siginfo info;
4071 + unsigned long pc = instruction_pointer(regs);
4072 +
4073 + if (user_mode(regs)) {
4074 + unsigned long sigpage = current->mm->context.sigpage;
4075 +
4076 + if (sigpage <= pc && pc < sigpage + 7*4) {
4077 + if (pc < sigpage + 3*4)
4078 + sys_sigreturn(regs);
4079 + else
4080 + sys_rt_sigreturn(regs);
4081 + return;
4082 + }
4083 + if (pc == 0xffff0f60UL) {
4084 + /*
4085 + * PaX: __kuser_cmpxchg64 emulation
4086 + */
4087 + // TODO
4088 + //regs->ARM_pc = regs->ARM_lr;
4089 + //return;
4090 + }
4091 + if (pc == 0xffff0fa0UL) {
4092 + /*
4093 + * PaX: __kuser_memory_barrier emulation
4094 + */
4095 + // dmb(); implied by the exception
4096 + regs->ARM_pc = regs->ARM_lr;
4097 + return;
4098 + }
4099 + if (pc == 0xffff0fc0UL) {
4100 + /*
4101 + * PaX: __kuser_cmpxchg emulation
4102 + */
4103 + // TODO
4104 + //long new;
4105 + //int op;
4106 +
4107 + //op = FUTEX_OP_SET << 28;
4108 + //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4109 + //regs->ARM_r0 = old != new;
4110 + //regs->ARM_pc = regs->ARM_lr;
4111 + //return;
4112 + }
4113 + if (pc == 0xffff0fe0UL) {
4114 + /*
4115 + * PaX: __kuser_get_tls emulation
4116 + */
4117 + regs->ARM_r0 = current_thread_info()->tp_value[0];
4118 + regs->ARM_pc = regs->ARM_lr;
4119 + return;
4120 + }
4121 + }
4122 +
4123 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4124 + else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4125 + if (current->signal->curr_ip)
4126 + 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),
4127 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129 + else
4130 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4131 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4132 + pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4133 + goto die;
4134 + }
4135 +#endif
4136 +
4137 +#ifdef CONFIG_PAX_REFCOUNT
4138 + if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4139 +#ifdef CONFIG_THUMB2_KERNEL
4140 + unsigned short bkpt;
4141 +
4142 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4143 +#else
4144 + unsigned int bkpt;
4145 +
4146 + if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4147 +#endif
4148 + current->thread.error_code = ifsr;
4149 + current->thread.trap_no = 0;
4150 + pax_report_refcount_overflow(regs);
4151 + fixup_exception(regs);
4152 + return;
4153 + }
4154 + }
4155 +#endif
4156
4157 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4158 return;
4159
4160 +die:
4161 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4162 inf->name, ifsr, addr);
4163
4164 diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4165 index cf08bdf..772656c 100644
4166 --- a/arch/arm/mm/fault.h
4167 +++ b/arch/arm/mm/fault.h
4168 @@ -3,6 +3,7 @@
4169
4170 /*
4171 * Fault status register encodings. We steal bit 31 for our own purposes.
4172 + * Set when the FSR value is from an instruction fault.
4173 */
4174 #define FSR_LNX_PF (1 << 31)
4175 #define FSR_WRITE (1 << 11)
4176 @@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4177 }
4178 #endif
4179
4180 +/* valid for LPAE and !LPAE */
4181 +static inline int is_xn_fault(unsigned int fsr)
4182 +{
4183 + return ((fsr_fs(fsr) & 0x3c) == 0xc);
4184 +}
4185 +
4186 +static inline int is_domain_fault(unsigned int fsr)
4187 +{
4188 + return ((fsr_fs(fsr) & 0xD) == 0x9);
4189 +}
4190 +
4191 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4192 unsigned long search_exception_table(unsigned long addr);
4193
4194 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4195 index 9481f85..6dae261 100644
4196 --- a/arch/arm/mm/init.c
4197 +++ b/arch/arm/mm/init.c
4198 @@ -31,6 +31,8 @@
4199 #include <asm/setup.h>
4200 #include <asm/tlb.h>
4201 #include <asm/fixmap.h>
4202 +#include <asm/system_info.h>
4203 +#include <asm/cp15.h>
4204
4205 #include <asm/mach/arch.h>
4206 #include <asm/mach/map.h>
4207 @@ -619,7 +621,46 @@ void free_initmem(void)
4208 {
4209 #ifdef CONFIG_HAVE_TCM
4210 extern char __tcm_start, __tcm_end;
4211 +#endif
4212
4213 +#ifdef CONFIG_PAX_KERNEXEC
4214 + unsigned long addr;
4215 + pgd_t *pgd;
4216 + pud_t *pud;
4217 + pmd_t *pmd;
4218 + int cpu_arch = cpu_architecture();
4219 + unsigned int cr = get_cr();
4220 +
4221 + if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4222 + /* make pages tables, etc before .text NX */
4223 + for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4224 + pgd = pgd_offset_k(addr);
4225 + pud = pud_offset(pgd, addr);
4226 + pmd = pmd_offset(pud, addr);
4227 + __section_update(pmd, addr, PMD_SECT_XN);
4228 + }
4229 + /* make init NX */
4230 + for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4231 + pgd = pgd_offset_k(addr);
4232 + pud = pud_offset(pgd, addr);
4233 + pmd = pmd_offset(pud, addr);
4234 + __section_update(pmd, addr, PMD_SECT_XN);
4235 + }
4236 + /* make kernel code/rodata RX */
4237 + for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4238 + pgd = pgd_offset_k(addr);
4239 + pud = pud_offset(pgd, addr);
4240 + pmd = pmd_offset(pud, addr);
4241 +#ifdef CONFIG_ARM_LPAE
4242 + __section_update(pmd, addr, PMD_SECT_RDONLY);
4243 +#else
4244 + __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4245 +#endif
4246 + }
4247 + }
4248 +#endif
4249 +
4250 +#ifdef CONFIG_HAVE_TCM
4251 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4252 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4253 #endif
4254 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4255 index d1e5ad7..84dcbf2 100644
4256 --- a/arch/arm/mm/ioremap.c
4257 +++ b/arch/arm/mm/ioremap.c
4258 @@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4259 unsigned int mtype;
4260
4261 if (cached)
4262 - mtype = MT_MEMORY_RWX;
4263 + mtype = MT_MEMORY_RX;
4264 else
4265 - mtype = MT_MEMORY_RWX_NONCACHED;
4266 + mtype = MT_MEMORY_RX_NONCACHED;
4267
4268 return __arm_ioremap_caller(phys_addr, size, mtype,
4269 __builtin_return_address(0));
4270 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4271 index 5e85ed3..b10a7ed 100644
4272 --- a/arch/arm/mm/mmap.c
4273 +++ b/arch/arm/mm/mmap.c
4274 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4275 struct vm_area_struct *vma;
4276 int do_align = 0;
4277 int aliasing = cache_is_vipt_aliasing();
4278 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4279 struct vm_unmapped_area_info info;
4280
4281 /*
4282 @@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4283 if (len > TASK_SIZE)
4284 return -ENOMEM;
4285
4286 +#ifdef CONFIG_PAX_RANDMMAP
4287 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4288 +#endif
4289 +
4290 if (addr) {
4291 if (do_align)
4292 addr = COLOUR_ALIGN(addr, pgoff);
4293 @@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4294 addr = PAGE_ALIGN(addr);
4295
4296 vma = find_vma(mm, addr);
4297 - if (TASK_SIZE - len >= addr &&
4298 - (!vma || addr + len <= vma->vm_start))
4299 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4300 return addr;
4301 }
4302
4303 @@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4304 info.high_limit = TASK_SIZE;
4305 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4306 info.align_offset = pgoff << PAGE_SHIFT;
4307 + info.threadstack_offset = offset;
4308 return vm_unmapped_area(&info);
4309 }
4310
4311 @@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4312 unsigned long addr = addr0;
4313 int do_align = 0;
4314 int aliasing = cache_is_vipt_aliasing();
4315 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4316 struct vm_unmapped_area_info info;
4317
4318 /*
4319 @@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4320 return addr;
4321 }
4322
4323 +#ifdef CONFIG_PAX_RANDMMAP
4324 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4325 +#endif
4326 +
4327 /* requesting a specific address */
4328 if (addr) {
4329 if (do_align)
4330 @@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4331 else
4332 addr = PAGE_ALIGN(addr);
4333 vma = find_vma(mm, addr);
4334 - if (TASK_SIZE - len >= addr &&
4335 - (!vma || addr + len <= vma->vm_start))
4336 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4337 return addr;
4338 }
4339
4340 @@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4341 info.high_limit = mm->mmap_base;
4342 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4343 info.align_offset = pgoff << PAGE_SHIFT;
4344 + info.threadstack_offset = offset;
4345 addr = vm_unmapped_area(&info);
4346
4347 /*
4348 @@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4349 {
4350 unsigned long random_factor = 0UL;
4351
4352 +#ifdef CONFIG_PAX_RANDMMAP
4353 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4354 +#endif
4355 +
4356 /* 8 bits of randomness in 20 address space bits */
4357 if ((current->flags & PF_RANDOMIZE) &&
4358 !(current->personality & ADDR_NO_RANDOMIZE))
4359 @@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4360
4361 if (mmap_is_legacy()) {
4362 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4363 +
4364 +#ifdef CONFIG_PAX_RANDMMAP
4365 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4366 + mm->mmap_base += mm->delta_mmap;
4367 +#endif
4368 +
4369 mm->get_unmapped_area = arch_get_unmapped_area;
4370 } else {
4371 mm->mmap_base = mmap_base(random_factor);
4372 +
4373 +#ifdef CONFIG_PAX_RANDMMAP
4374 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4375 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4376 +#endif
4377 +
4378 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4379 }
4380 }
4381 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4382 index 9f98cec..115fcb6 100644
4383 --- a/arch/arm/mm/mmu.c
4384 +++ b/arch/arm/mm/mmu.c
4385 @@ -40,6 +40,22 @@
4386 #include "mm.h"
4387 #include "tcm.h"
4388
4389 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4390 +void modify_domain(unsigned int dom, unsigned int type)
4391 +{
4392 + struct thread_info *thread = current_thread_info();
4393 + unsigned int domain = thread->cpu_domain;
4394 + /*
4395 + * DOMAIN_MANAGER might be defined to some other value,
4396 + * use the arch-defined constant
4397 + */
4398 + domain &= ~domain_val(dom, 3);
4399 + thread->cpu_domain = domain | domain_val(dom, type);
4400 + set_domain(thread->cpu_domain);
4401 +}
4402 +EXPORT_SYMBOL(modify_domain);
4403 +#endif
4404 +
4405 /*
4406 * empty_zero_page is a special page that is used for
4407 * zero-initialized data and COW.
4408 @@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4409 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4410 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4411
4412 -static struct mem_type mem_types[] = {
4413 +#ifdef CONFIG_PAX_KERNEXEC
4414 +#define L_PTE_KERNEXEC L_PTE_RDONLY
4415 +#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4416 +#else
4417 +#define L_PTE_KERNEXEC L_PTE_DIRTY
4418 +#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4419 +#endif
4420 +
4421 +static struct mem_type mem_types[] __read_only = {
4422 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4423 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4424 L_PTE_SHARED,
4425 @@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4426 .prot_sect = PROT_SECT_DEVICE,
4427 .domain = DOMAIN_IO,
4428 },
4429 - [MT_UNCACHED] = {
4430 + [MT_UNCACHED_RW] = {
4431 .prot_pte = PROT_PTE_DEVICE,
4432 .prot_l1 = PMD_TYPE_TABLE,
4433 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4434 .domain = DOMAIN_IO,
4435 },
4436 - [MT_CACHECLEAN] = {
4437 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4438 + [MT_CACHECLEAN_RO] = {
4439 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4440 .domain = DOMAIN_KERNEL,
4441 },
4442 #ifndef CONFIG_ARM_LPAE
4443 - [MT_MINICLEAN] = {
4444 - .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4445 + [MT_MINICLEAN_RO] = {
4446 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449 #endif
4450 @@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4452 L_PTE_RDONLY,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454 - .domain = DOMAIN_USER,
4455 + .domain = DOMAIN_VECTORS,
4456 },
4457 [MT_HIGH_VECTORS] = {
4458 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4459 L_PTE_USER | L_PTE_RDONLY,
4460 .prot_l1 = PMD_TYPE_TABLE,
4461 - .domain = DOMAIN_USER,
4462 + .domain = DOMAIN_VECTORS,
4463 },
4464 - [MT_MEMORY_RWX] = {
4465 + [__MT_MEMORY_RWX] = {
4466 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469 @@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4470 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4471 .domain = DOMAIN_KERNEL,
4472 },
4473 - [MT_ROM] = {
4474 - .prot_sect = PMD_TYPE_SECT,
4475 + [MT_MEMORY_RX] = {
4476 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4477 + .prot_l1 = PMD_TYPE_TABLE,
4478 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4479 + .domain = DOMAIN_KERNEL,
4480 + },
4481 + [MT_ROM_RX] = {
4482 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485 - [MT_MEMORY_RWX_NONCACHED] = {
4486 + [MT_MEMORY_RW_NONCACHED] = {
4487 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4488 L_PTE_MT_BUFFERABLE,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493 + [MT_MEMORY_RX_NONCACHED] = {
4494 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4495 + L_PTE_MT_BUFFERABLE,
4496 + .prot_l1 = PMD_TYPE_TABLE,
4497 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498 + .domain = DOMAIN_KERNEL,
4499 + },
4500 [MT_MEMORY_RW_DTCM] = {
4501 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4502 L_PTE_XN,
4503 @@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4504 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4505 .domain = DOMAIN_KERNEL,
4506 },
4507 - [MT_MEMORY_RWX_ITCM] = {
4508 - .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4509 + [MT_MEMORY_RX_ITCM] = {
4510 + .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4511 .prot_l1 = PMD_TYPE_TABLE,
4512 + .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4513 .domain = DOMAIN_KERNEL,
4514 },
4515 [MT_MEMORY_RW_SO] = {
4516 @@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4517 * Mark cache clean areas and XIP ROM read only
4518 * from SVC mode and no access from userspace.
4519 */
4520 - mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521 - mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523 + mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4524 +#ifdef CONFIG_PAX_KERNEXEC
4525 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527 + mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4528 +#endif
4529 + mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4531 #endif
4532
4533 /*
4534 @@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4535 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4536 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4537 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4538 - mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4539 - mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4540 + mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4541 + mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4542 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4543 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4544 + mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4545 + mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4546 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4547 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4548 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4549 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4550 + mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4551 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4552 + mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4553 }
4554 }
4555
4556 @@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4557 if (cpu_arch >= CPU_ARCH_ARMv6) {
4558 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4559 /* Non-cacheable Normal is XCB = 001 */
4560 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4561 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4562 + PMD_SECT_BUFFERED;
4563 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4564 PMD_SECT_BUFFERED;
4565 } else {
4566 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4567 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4568 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4569 + PMD_SECT_TEX(1);
4570 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4571 PMD_SECT_TEX(1);
4572 }
4573 } else {
4574 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4577 }
4578
4579 #ifdef CONFIG_ARM_LPAE
4580 @@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4581 vecs_pgprot |= PTE_EXT_AF;
4582 #endif
4583
4584 + user_pgprot |= __supported_pte_mask;
4585 +
4586 for (i = 0; i < 16; i++) {
4587 pteval_t v = pgprot_val(protection_map[i]);
4588 protection_map[i] = __pgprot(v | user_pgprot);
4589 @@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4590
4591 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4592 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4593 - mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4594 - mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4595 + mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4596 + mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4597 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4598 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4599 + mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4600 + mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4601 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4602 - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4603 - mem_types[MT_ROM].prot_sect |= cp->pmd;
4604 + mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4605 + mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4606 + mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4607
4608 switch (cp->pmd) {
4609 case PMD_SECT_WT:
4610 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4611 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4612 break;
4613 case PMD_SECT_WB:
4614 case PMD_SECT_WBWA:
4615 - mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4616 + mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4617 break;
4618 }
4619 pr_info("Memory policy: %sData cache %s\n",
4620 @@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4621 return;
4622 }
4623
4624 - if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4625 + if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4626 md->virtual >= PAGE_OFFSET &&
4627 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4628 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4629 @@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4630 * called function. This means you can't use any function or debugging
4631 * method which may touch any device, otherwise the kernel _will_ crash.
4632 */
4633 +
4634 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4635 +
4636 static void __init devicemaps_init(const struct machine_desc *mdesc)
4637 {
4638 struct map_desc map;
4639 unsigned long addr;
4640 - void *vectors;
4641
4642 - /*
4643 - * Allocate the vector page early.
4644 - */
4645 - vectors = early_alloc(PAGE_SIZE * 2);
4646 -
4647 - early_trap_init(vectors);
4648 + early_trap_init(&vectors);
4649
4650 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4651 pmd_clear(pmd_off_k(addr));
4652 @@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4653 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4654 map.virtual = MODULES_VADDR;
4655 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4656 - map.type = MT_ROM;
4657 + map.type = MT_ROM_RX;
4658 create_mapping(&map);
4659 #endif
4660
4661 @@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4662 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4663 map.virtual = FLUSH_BASE;
4664 map.length = SZ_1M;
4665 - map.type = MT_CACHECLEAN;
4666 + map.type = MT_CACHECLEAN_RO;
4667 create_mapping(&map);
4668 #endif
4669 #ifdef FLUSH_BASE_MINICACHE
4670 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4671 map.virtual = FLUSH_BASE_MINICACHE;
4672 map.length = SZ_1M;
4673 - map.type = MT_MINICLEAN;
4674 + map.type = MT_MINICLEAN_RO;
4675 create_mapping(&map);
4676 #endif
4677
4678 @@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4679 * location (0xffff0000). If we aren't using high-vectors, also
4680 * create a mapping at the low-vectors virtual address.
4681 */
4682 - map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4683 + map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4684 map.virtual = 0xffff0000;
4685 map.length = PAGE_SIZE;
4686 #ifdef CONFIG_KUSER_HELPERS
4687 @@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4688 static void __init map_lowmem(void)
4689 {
4690 struct memblock_region *reg;
4691 +#ifndef CONFIG_PAX_KERNEXEC
4692 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4693 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4694 +#endif
4695
4696 /* Map all the lowmem memory banks. */
4697 for_each_memblock(memory, reg) {
4698 @@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4699 if (start >= end)
4700 break;
4701
4702 +#ifdef CONFIG_PAX_KERNEXEC
4703 + map.pfn = __phys_to_pfn(start);
4704 + map.virtual = __phys_to_virt(start);
4705 + map.length = end - start;
4706 +
4707 + if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4708 + struct map_desc kernel;
4709 + struct map_desc initmap;
4710 +
4711 + /* when freeing initmem we will make this RW */
4712 + initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4713 + initmap.virtual = (unsigned long)__init_begin;
4714 + initmap.length = _sdata - __init_begin;
4715 + initmap.type = __MT_MEMORY_RWX;
4716 + create_mapping(&initmap);
4717 +
4718 + /* when freeing initmem we will make this RX */
4719 + kernel.pfn = __phys_to_pfn(__pa(_stext));
4720 + kernel.virtual = (unsigned long)_stext;
4721 + kernel.length = __init_begin - _stext;
4722 + kernel.type = __MT_MEMORY_RWX;
4723 + create_mapping(&kernel);
4724 +
4725 + if (map.virtual < (unsigned long)_stext) {
4726 + map.length = (unsigned long)_stext - map.virtual;
4727 + map.type = __MT_MEMORY_RWX;
4728 + create_mapping(&map);
4729 + }
4730 +
4731 + map.pfn = __phys_to_pfn(__pa(_sdata));
4732 + map.virtual = (unsigned long)_sdata;
4733 + map.length = end - __pa(_sdata);
4734 + }
4735 +
4736 + map.type = MT_MEMORY_RW;
4737 + create_mapping(&map);
4738 +#else
4739 if (end < kernel_x_start || start >= kernel_x_end) {
4740 map.pfn = __phys_to_pfn(start);
4741 map.virtual = __phys_to_virt(start);
4742 map.length = end - start;
4743 - map.type = MT_MEMORY_RWX;
4744 + map.type = __MT_MEMORY_RWX;
4745
4746 create_mapping(&map);
4747 } else {
4748 @@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4749 map.pfn = __phys_to_pfn(kernel_x_start);
4750 map.virtual = __phys_to_virt(kernel_x_start);
4751 map.length = kernel_x_end - kernel_x_start;
4752 - map.type = MT_MEMORY_RWX;
4753 + map.type = __MT_MEMORY_RWX;
4754
4755 create_mapping(&map);
4756
4757 @@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4758 create_mapping(&map);
4759 }
4760 }
4761 +#endif
4762 }
4763 }
4764
4765 diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4766 index e1268f9..a9755a7 100644
4767 --- a/arch/arm/net/bpf_jit_32.c
4768 +++ b/arch/arm/net/bpf_jit_32.c
4769 @@ -20,6 +20,7 @@
4770 #include <asm/cacheflush.h>
4771 #include <asm/hwcap.h>
4772 #include <asm/opcodes.h>
4773 +#include <asm/pgtable.h>
4774
4775 #include "bpf_jit_32.h"
4776
4777 @@ -71,7 +72,11 @@ struct jit_ctx {
4778 #endif
4779 };
4780
4781 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4782 +int bpf_jit_enable __read_only;
4783 +#else
4784 int bpf_jit_enable __read_mostly;
4785 +#endif
4786
4787 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4788 {
4789 @@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4790 {
4791 u32 *ptr;
4792 /* We are guaranteed to have aligned memory. */
4793 + pax_open_kernel();
4794 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4795 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4796 + pax_close_kernel();
4797 }
4798
4799 static void build_prologue(struct jit_ctx *ctx)
4800 diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4801 index 5b217f4..c23f40e 100644
4802 --- a/arch/arm/plat-iop/setup.c
4803 +++ b/arch/arm/plat-iop/setup.c
4804 @@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4805 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4806 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4807 .length = IOP3XX_PERIPHERAL_SIZE,
4808 - .type = MT_UNCACHED,
4809 + .type = MT_UNCACHED_RW,
4810 },
4811 };
4812
4813 diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4814 index a5bc92d..0bb4730 100644
4815 --- a/arch/arm/plat-omap/sram.c
4816 +++ b/arch/arm/plat-omap/sram.c
4817 @@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4818 * Looks like we need to preserve some bootloader code at the
4819 * beginning of SRAM for jumping to flash for reboot to work...
4820 */
4821 + pax_open_kernel();
4822 memset_io(omap_sram_base + omap_sram_skip, 0,
4823 omap_sram_size - omap_sram_skip);
4824 + pax_close_kernel();
4825 }
4826 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4827 index ce6d763..cfea917 100644
4828 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4829 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4830 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
4831 int (*started)(unsigned ch);
4832 int (*flush)(unsigned ch);
4833 int (*stop)(unsigned ch);
4834 -};
4835 +} __no_const;
4836
4837 extern void *samsung_dmadev_get_ops(void);
4838 extern void *s3c_dma_get_ops(void);
4839 diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4840 index 6389d60..b5d3bdd 100644
4841 --- a/arch/arm64/include/asm/barrier.h
4842 +++ b/arch/arm64/include/asm/barrier.h
4843 @@ -41,7 +41,7 @@
4844 do { \
4845 compiletime_assert_atomic_type(*p); \
4846 barrier(); \
4847 - ACCESS_ONCE(*p) = (v); \
4848 + ACCESS_ONCE_RW(*p) = (v); \
4849 } while (0)
4850
4851 #define smp_load_acquire(p) \
4852 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4853 index 3bf8f4e..5dd5491 100644
4854 --- a/arch/arm64/include/asm/uaccess.h
4855 +++ b/arch/arm64/include/asm/uaccess.h
4856 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4857 flag; \
4858 })
4859
4860 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4861 #define access_ok(type, addr, size) __range_ok(addr, size)
4862 #define user_addr_max get_fs
4863
4864 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4865 index c3a58a1..78fbf54 100644
4866 --- a/arch/avr32/include/asm/cache.h
4867 +++ b/arch/avr32/include/asm/cache.h
4868 @@ -1,8 +1,10 @@
4869 #ifndef __ASM_AVR32_CACHE_H
4870 #define __ASM_AVR32_CACHE_H
4871
4872 +#include <linux/const.h>
4873 +
4874 #define L1_CACHE_SHIFT 5
4875 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4876 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4877
4878 /*
4879 * Memory returned by kmalloc() may be used for DMA, so we must make
4880 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4881 index d232888..87c8df1 100644
4882 --- a/arch/avr32/include/asm/elf.h
4883 +++ b/arch/avr32/include/asm/elf.h
4884 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4885 the loader. We need to make sure that it is out of the way of the program
4886 that it will "exec", and that there is sufficient room for the brk. */
4887
4888 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4889 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4890
4891 +#ifdef CONFIG_PAX_ASLR
4892 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4893 +
4894 +#define PAX_DELTA_MMAP_LEN 15
4895 +#define PAX_DELTA_STACK_LEN 15
4896 +#endif
4897
4898 /* This yields a mask that user programs can use to figure out what
4899 instruction set this CPU supports. This could be done in user space,
4900 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4901 index 479330b..53717a8 100644
4902 --- a/arch/avr32/include/asm/kmap_types.h
4903 +++ b/arch/avr32/include/asm/kmap_types.h
4904 @@ -2,9 +2,9 @@
4905 #define __ASM_AVR32_KMAP_TYPES_H
4906
4907 #ifdef CONFIG_DEBUG_HIGHMEM
4908 -# define KM_TYPE_NR 29
4909 +# define KM_TYPE_NR 30
4910 #else
4911 -# define KM_TYPE_NR 14
4912 +# define KM_TYPE_NR 15
4913 #endif
4914
4915 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4916 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4917 index 0eca933..eb78c7b 100644
4918 --- a/arch/avr32/mm/fault.c
4919 +++ b/arch/avr32/mm/fault.c
4920 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4921
4922 int exception_trace = 1;
4923
4924 +#ifdef CONFIG_PAX_PAGEEXEC
4925 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4926 +{
4927 + unsigned long i;
4928 +
4929 + printk(KERN_ERR "PAX: bytes at PC: ");
4930 + for (i = 0; i < 20; i++) {
4931 + unsigned char c;
4932 + if (get_user(c, (unsigned char *)pc+i))
4933 + printk(KERN_CONT "???????? ");
4934 + else
4935 + printk(KERN_CONT "%02x ", c);
4936 + }
4937 + printk("\n");
4938 +}
4939 +#endif
4940 +
4941 /*
4942 * This routine handles page faults. It determines the address and the
4943 * problem, and then passes it off to one of the appropriate routines.
4944 @@ -176,6 +193,16 @@ bad_area:
4945 up_read(&mm->mmap_sem);
4946
4947 if (user_mode(regs)) {
4948 +
4949 +#ifdef CONFIG_PAX_PAGEEXEC
4950 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4951 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4952 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4953 + do_group_exit(SIGKILL);
4954 + }
4955 + }
4956 +#endif
4957 +
4958 if (exception_trace && printk_ratelimit())
4959 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4960 "sp %08lx ecr %lu\n",
4961 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4962 index 568885a..f8008df 100644
4963 --- a/arch/blackfin/include/asm/cache.h
4964 +++ b/arch/blackfin/include/asm/cache.h
4965 @@ -7,6 +7,7 @@
4966 #ifndef __ARCH_BLACKFIN_CACHE_H
4967 #define __ARCH_BLACKFIN_CACHE_H
4968
4969 +#include <linux/const.h>
4970 #include <linux/linkage.h> /* for asmlinkage */
4971
4972 /*
4973 @@ -14,7 +15,7 @@
4974 * Blackfin loads 32 bytes for cache
4975 */
4976 #define L1_CACHE_SHIFT 5
4977 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4978 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4979 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4980
4981 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4982 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4983 index aea2718..3639a60 100644
4984 --- a/arch/cris/include/arch-v10/arch/cache.h
4985 +++ b/arch/cris/include/arch-v10/arch/cache.h
4986 @@ -1,8 +1,9 @@
4987 #ifndef _ASM_ARCH_CACHE_H
4988 #define _ASM_ARCH_CACHE_H
4989
4990 +#include <linux/const.h>
4991 /* Etrax 100LX have 32-byte cache-lines. */
4992 -#define L1_CACHE_BYTES 32
4993 #define L1_CACHE_SHIFT 5
4994 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4995
4996 #endif /* _ASM_ARCH_CACHE_H */
4997 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4998 index 7caf25d..ee65ac5 100644
4999 --- a/arch/cris/include/arch-v32/arch/cache.h
5000 +++ b/arch/cris/include/arch-v32/arch/cache.h
5001 @@ -1,11 +1,12 @@
5002 #ifndef _ASM_CRIS_ARCH_CACHE_H
5003 #define _ASM_CRIS_ARCH_CACHE_H
5004
5005 +#include <linux/const.h>
5006 #include <arch/hwregs/dma.h>
5007
5008 /* A cache-line is 32 bytes. */
5009 -#define L1_CACHE_BYTES 32
5010 #define L1_CACHE_SHIFT 5
5011 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5012
5013 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5014
5015 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5016 index 102190a..5334cea 100644
5017 --- a/arch/frv/include/asm/atomic.h
5018 +++ b/arch/frv/include/asm/atomic.h
5019 @@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5020 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5021 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5022
5023 +#define atomic64_read_unchecked(v) atomic64_read(v)
5024 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5025 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5026 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5027 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5028 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5029 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5030 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5031 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5032 +
5033 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5034 {
5035 int c, old;
5036 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5037 index 2797163..c2a401df9 100644
5038 --- a/arch/frv/include/asm/cache.h
5039 +++ b/arch/frv/include/asm/cache.h
5040 @@ -12,10 +12,11 @@
5041 #ifndef __ASM_CACHE_H
5042 #define __ASM_CACHE_H
5043
5044 +#include <linux/const.h>
5045
5046 /* bytes per L1 cache line */
5047 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5048 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5049 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5050
5051 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5052 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5053 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5054 index 43901f2..0d8b865 100644
5055 --- a/arch/frv/include/asm/kmap_types.h
5056 +++ b/arch/frv/include/asm/kmap_types.h
5057 @@ -2,6 +2,6 @@
5058 #ifndef _ASM_KMAP_TYPES_H
5059 #define _ASM_KMAP_TYPES_H
5060
5061 -#define KM_TYPE_NR 17
5062 +#define KM_TYPE_NR 18
5063
5064 #endif
5065 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5066 index 836f147..4cf23f5 100644
5067 --- a/arch/frv/mm/elf-fdpic.c
5068 +++ b/arch/frv/mm/elf-fdpic.c
5069 @@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5070 {
5071 struct vm_area_struct *vma;
5072 struct vm_unmapped_area_info info;
5073 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5074
5075 if (len > TASK_SIZE)
5076 return -ENOMEM;
5077 @@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5078 if (addr) {
5079 addr = PAGE_ALIGN(addr);
5080 vma = find_vma(current->mm, addr);
5081 - if (TASK_SIZE - len >= addr &&
5082 - (!vma || addr + len <= vma->vm_start))
5083 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5084 goto success;
5085 }
5086
5087 @@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5088 info.high_limit = (current->mm->start_stack - 0x00200000);
5089 info.align_mask = 0;
5090 info.align_offset = 0;
5091 + info.threadstack_offset = offset;
5092 addr = vm_unmapped_area(&info);
5093 if (!(addr & ~PAGE_MASK))
5094 goto success;
5095 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5096 index 2635117..fa223cb 100644
5097 --- a/arch/hexagon/include/asm/cache.h
5098 +++ b/arch/hexagon/include/asm/cache.h
5099 @@ -21,9 +21,11 @@
5100 #ifndef __ASM_CACHE_H
5101 #define __ASM_CACHE_H
5102
5103 +#include <linux/const.h>
5104 +
5105 /* Bytes per L1 cache line */
5106 -#define L1_CACHE_SHIFT (5)
5107 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5108 +#define L1_CACHE_SHIFT 5
5109 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5110
5111 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5112 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5113 diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5114 index c84c88b..2a6e1ba 100644
5115 --- a/arch/ia64/Kconfig
5116 +++ b/arch/ia64/Kconfig
5117 @@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5118 config KEXEC
5119 bool "kexec system call"
5120 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5121 + depends on !GRKERNSEC_KMEM
5122 help
5123 kexec is a system call that implements the ability to shutdown your
5124 current kernel, and to start another kernel. It is like a reboot
5125 diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5126 index 5441b14..039a446 100644
5127 --- a/arch/ia64/Makefile
5128 +++ b/arch/ia64/Makefile
5129 @@ -99,5 +99,6 @@ endef
5130 archprepare: make_nr_irqs_h FORCE
5131 PHONY += make_nr_irqs_h FORCE
5132
5133 +make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5134 make_nr_irqs_h: FORCE
5135 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5136 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5137 index 0bf0350..2ad1957 100644
5138 --- a/arch/ia64/include/asm/atomic.h
5139 +++ b/arch/ia64/include/asm/atomic.h
5140 @@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5141 #define atomic64_inc(v) atomic64_add(1, (v))
5142 #define atomic64_dec(v) atomic64_sub(1, (v))
5143
5144 +#define atomic64_read_unchecked(v) atomic64_read(v)
5145 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5146 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5147 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5148 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5149 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
5150 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5151 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
5152 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5153 +
5154 #endif /* _ASM_IA64_ATOMIC_H */
5155 diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5156 index a48957c..e097b56 100644
5157 --- a/arch/ia64/include/asm/barrier.h
5158 +++ b/arch/ia64/include/asm/barrier.h
5159 @@ -67,7 +67,7 @@
5160 do { \
5161 compiletime_assert_atomic_type(*p); \
5162 barrier(); \
5163 - ACCESS_ONCE(*p) = (v); \
5164 + ACCESS_ONCE_RW(*p) = (v); \
5165 } while (0)
5166
5167 #define smp_load_acquire(p) \
5168 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5169 index 988254a..e1ee885 100644
5170 --- a/arch/ia64/include/asm/cache.h
5171 +++ b/arch/ia64/include/asm/cache.h
5172 @@ -1,6 +1,7 @@
5173 #ifndef _ASM_IA64_CACHE_H
5174 #define _ASM_IA64_CACHE_H
5175
5176 +#include <linux/const.h>
5177
5178 /*
5179 * Copyright (C) 1998-2000 Hewlett-Packard Co
5180 @@ -9,7 +10,7 @@
5181
5182 /* Bytes per L1 (data) cache line. */
5183 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5184 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5185 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5186
5187 #ifdef CONFIG_SMP
5188 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5189 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5190 index 5a83c5c..4d7f553 100644
5191 --- a/arch/ia64/include/asm/elf.h
5192 +++ b/arch/ia64/include/asm/elf.h
5193 @@ -42,6 +42,13 @@
5194 */
5195 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5196
5197 +#ifdef CONFIG_PAX_ASLR
5198 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5199 +
5200 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5201 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5202 +#endif
5203 +
5204 #define PT_IA_64_UNWIND 0x70000001
5205
5206 /* IA-64 relocations: */
5207 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5208 index 5767cdf..7462574 100644
5209 --- a/arch/ia64/include/asm/pgalloc.h
5210 +++ b/arch/ia64/include/asm/pgalloc.h
5211 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5212 pgd_val(*pgd_entry) = __pa(pud);
5213 }
5214
5215 +static inline void
5216 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5217 +{
5218 + pgd_populate(mm, pgd_entry, pud);
5219 +}
5220 +
5221 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5222 {
5223 return quicklist_alloc(0, GFP_KERNEL, NULL);
5224 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5225 pud_val(*pud_entry) = __pa(pmd);
5226 }
5227
5228 +static inline void
5229 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5230 +{
5231 + pud_populate(mm, pud_entry, pmd);
5232 +}
5233 +
5234 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5235 {
5236 return quicklist_alloc(0, GFP_KERNEL, NULL);
5237 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5238 index 7935115..c0eca6a 100644
5239 --- a/arch/ia64/include/asm/pgtable.h
5240 +++ b/arch/ia64/include/asm/pgtable.h
5241 @@ -12,7 +12,7 @@
5242 * David Mosberger-Tang <davidm@hpl.hp.com>
5243 */
5244
5245 -
5246 +#include <linux/const.h>
5247 #include <asm/mman.h>
5248 #include <asm/page.h>
5249 #include <asm/processor.h>
5250 @@ -142,6 +142,17 @@
5251 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5252 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5253 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5254 +
5255 +#ifdef CONFIG_PAX_PAGEEXEC
5256 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5257 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5258 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5259 +#else
5260 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
5261 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
5262 +# define PAGE_COPY_NOEXEC PAGE_COPY
5263 +#endif
5264 +
5265 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5266 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5267 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5268 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5269 index 45698cd..e8e2dbc 100644
5270 --- a/arch/ia64/include/asm/spinlock.h
5271 +++ b/arch/ia64/include/asm/spinlock.h
5272 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5273 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5274
5275 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5276 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5277 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5278 }
5279
5280 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5281 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5282 index 449c8c0..3d4b1e9 100644
5283 --- a/arch/ia64/include/asm/uaccess.h
5284 +++ b/arch/ia64/include/asm/uaccess.h
5285 @@ -70,6 +70,7 @@
5286 && ((segment).seg == KERNEL_DS.seg \
5287 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5288 })
5289 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5290 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5291
5292 /*
5293 @@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5294 static inline unsigned long
5295 __copy_to_user (void __user *to, const void *from, unsigned long count)
5296 {
5297 + if (count > INT_MAX)
5298 + return count;
5299 +
5300 + if (!__builtin_constant_p(count))
5301 + check_object_size(from, count, true);
5302 +
5303 return __copy_user(to, (__force void __user *) from, count);
5304 }
5305
5306 static inline unsigned long
5307 __copy_from_user (void *to, const void __user *from, unsigned long count)
5308 {
5309 + if (count > INT_MAX)
5310 + return count;
5311 +
5312 + if (!__builtin_constant_p(count))
5313 + check_object_size(to, count, false);
5314 +
5315 return __copy_user((__force void __user *) to, from, count);
5316 }
5317
5318 @@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5319 ({ \
5320 void __user *__cu_to = (to); \
5321 const void *__cu_from = (from); \
5322 - long __cu_len = (n); \
5323 + unsigned long __cu_len = (n); \
5324 \
5325 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
5326 + if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5327 + if (!__builtin_constant_p(n)) \
5328 + check_object_size(__cu_from, __cu_len, true); \
5329 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5330 + } \
5331 __cu_len; \
5332 })
5333
5334 @@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5335 ({ \
5336 void *__cu_to = (to); \
5337 const void __user *__cu_from = (from); \
5338 - long __cu_len = (n); \
5339 + unsigned long __cu_len = (n); \
5340 \
5341 __chk_user_ptr(__cu_from); \
5342 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
5343 + if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5344 + if (!__builtin_constant_p(n)) \
5345 + check_object_size(__cu_to, __cu_len, false); \
5346 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5347 + } \
5348 __cu_len; \
5349 })
5350
5351 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5352 index 24603be..948052d 100644
5353 --- a/arch/ia64/kernel/module.c
5354 +++ b/arch/ia64/kernel/module.c
5355 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5356 void
5357 module_free (struct module *mod, void *module_region)
5358 {
5359 - if (mod && mod->arch.init_unw_table &&
5360 - module_region == mod->module_init) {
5361 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5362 unw_remove_unwind_table(mod->arch.init_unw_table);
5363 mod->arch.init_unw_table = NULL;
5364 }
5365 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5366 }
5367
5368 static inline int
5369 +in_init_rx (const struct module *mod, uint64_t addr)
5370 +{
5371 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5372 +}
5373 +
5374 +static inline int
5375 +in_init_rw (const struct module *mod, uint64_t addr)
5376 +{
5377 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5378 +}
5379 +
5380 +static inline int
5381 in_init (const struct module *mod, uint64_t addr)
5382 {
5383 - return addr - (uint64_t) mod->module_init < mod->init_size;
5384 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5385 +}
5386 +
5387 +static inline int
5388 +in_core_rx (const struct module *mod, uint64_t addr)
5389 +{
5390 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5391 +}
5392 +
5393 +static inline int
5394 +in_core_rw (const struct module *mod, uint64_t addr)
5395 +{
5396 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5397 }
5398
5399 static inline int
5400 in_core (const struct module *mod, uint64_t addr)
5401 {
5402 - return addr - (uint64_t) mod->module_core < mod->core_size;
5403 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5404 }
5405
5406 static inline int
5407 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5408 break;
5409
5410 case RV_BDREL:
5411 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5412 + if (in_init_rx(mod, val))
5413 + val -= (uint64_t) mod->module_init_rx;
5414 + else if (in_init_rw(mod, val))
5415 + val -= (uint64_t) mod->module_init_rw;
5416 + else if (in_core_rx(mod, val))
5417 + val -= (uint64_t) mod->module_core_rx;
5418 + else if (in_core_rw(mod, val))
5419 + val -= (uint64_t) mod->module_core_rw;
5420 break;
5421
5422 case RV_LTV:
5423 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5424 * addresses have been selected...
5425 */
5426 uint64_t gp;
5427 - if (mod->core_size > MAX_LTOFF)
5428 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5429 /*
5430 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5431 * at the end of the module.
5432 */
5433 - gp = mod->core_size - MAX_LTOFF / 2;
5434 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5435 else
5436 - gp = mod->core_size / 2;
5437 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5438 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5439 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5440 mod->arch.gp = gp;
5441 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5442 }
5443 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5444 index c39c3cd..3c77738 100644
5445 --- a/arch/ia64/kernel/palinfo.c
5446 +++ b/arch/ia64/kernel/palinfo.c
5447 @@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5448 return NOTIFY_OK;
5449 }
5450
5451 -static struct notifier_block __refdata palinfo_cpu_notifier =
5452 +static struct notifier_block palinfo_cpu_notifier =
5453 {
5454 .notifier_call = palinfo_cpu_callback,
5455 .priority = 0,
5456 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5457 index 41e33f8..65180b2a 100644
5458 --- a/arch/ia64/kernel/sys_ia64.c
5459 +++ b/arch/ia64/kernel/sys_ia64.c
5460 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5461 unsigned long align_mask = 0;
5462 struct mm_struct *mm = current->mm;
5463 struct vm_unmapped_area_info info;
5464 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5465
5466 if (len > RGN_MAP_LIMIT)
5467 return -ENOMEM;
5468 @@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5469 if (REGION_NUMBER(addr) == RGN_HPAGE)
5470 addr = 0;
5471 #endif
5472 +
5473 +#ifdef CONFIG_PAX_RANDMMAP
5474 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5475 + addr = mm->free_area_cache;
5476 + else
5477 +#endif
5478 +
5479 if (!addr)
5480 addr = TASK_UNMAPPED_BASE;
5481
5482 @@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5483 info.high_limit = TASK_SIZE;
5484 info.align_mask = align_mask;
5485 info.align_offset = 0;
5486 + info.threadstack_offset = offset;
5487 return vm_unmapped_area(&info);
5488 }
5489
5490 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5491 index 84f8a52..7c76178 100644
5492 --- a/arch/ia64/kernel/vmlinux.lds.S
5493 +++ b/arch/ia64/kernel/vmlinux.lds.S
5494 @@ -192,7 +192,7 @@ SECTIONS {
5495 /* Per-cpu data: */
5496 . = ALIGN(PERCPU_PAGE_SIZE);
5497 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5498 - __phys_per_cpu_start = __per_cpu_load;
5499 + __phys_per_cpu_start = per_cpu_load;
5500 /*
5501 * ensure percpu data fits
5502 * into percpu page size
5503 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5504 index 7225dad..2a7c8256 100644
5505 --- a/arch/ia64/mm/fault.c
5506 +++ b/arch/ia64/mm/fault.c
5507 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5508 return pte_present(pte);
5509 }
5510
5511 +#ifdef CONFIG_PAX_PAGEEXEC
5512 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5513 +{
5514 + unsigned long i;
5515 +
5516 + printk(KERN_ERR "PAX: bytes at PC: ");
5517 + for (i = 0; i < 8; i++) {
5518 + unsigned int c;
5519 + if (get_user(c, (unsigned int *)pc+i))
5520 + printk(KERN_CONT "???????? ");
5521 + else
5522 + printk(KERN_CONT "%08x ", c);
5523 + }
5524 + printk("\n");
5525 +}
5526 +#endif
5527 +
5528 # define VM_READ_BIT 0
5529 # define VM_WRITE_BIT 1
5530 # define VM_EXEC_BIT 2
5531 @@ -151,8 +168,21 @@ retry:
5532 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5533 goto bad_area;
5534
5535 - if ((vma->vm_flags & mask) != mask)
5536 + if ((vma->vm_flags & mask) != mask) {
5537 +
5538 +#ifdef CONFIG_PAX_PAGEEXEC
5539 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5540 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5541 + goto bad_area;
5542 +
5543 + up_read(&mm->mmap_sem);
5544 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5545 + do_group_exit(SIGKILL);
5546 + }
5547 +#endif
5548 +
5549 goto bad_area;
5550 + }
5551
5552 /*
5553 * If for any reason at all we couldn't handle the fault, make
5554 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5555 index 76069c1..c2aa816 100644
5556 --- a/arch/ia64/mm/hugetlbpage.c
5557 +++ b/arch/ia64/mm/hugetlbpage.c
5558 @@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5559 unsigned long pgoff, unsigned long flags)
5560 {
5561 struct vm_unmapped_area_info info;
5562 + unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5563
5564 if (len > RGN_MAP_LIMIT)
5565 return -ENOMEM;
5566 @@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5567 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5568 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5569 info.align_offset = 0;
5570 + info.threadstack_offset = offset;
5571 return vm_unmapped_area(&info);
5572 }
5573
5574 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5575 index 6b33457..88b5124 100644
5576 --- a/arch/ia64/mm/init.c
5577 +++ b/arch/ia64/mm/init.c
5578 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5579 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5580 vma->vm_end = vma->vm_start + PAGE_SIZE;
5581 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5582 +
5583 +#ifdef CONFIG_PAX_PAGEEXEC
5584 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5585 + vma->vm_flags &= ~VM_EXEC;
5586 +
5587 +#ifdef CONFIG_PAX_MPROTECT
5588 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
5589 + vma->vm_flags &= ~VM_MAYEXEC;
5590 +#endif
5591 +
5592 + }
5593 +#endif
5594 +
5595 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5596 down_write(&current->mm->mmap_sem);
5597 if (insert_vm_struct(current->mm, vma)) {
5598 @@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5599 gate_vma.vm_start = FIXADDR_USER_START;
5600 gate_vma.vm_end = FIXADDR_USER_END;
5601 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5602 - gate_vma.vm_page_prot = __P101;
5603 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5604
5605 return 0;
5606 }
5607 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5608 index 40b3ee9..8c2c112 100644
5609 --- a/arch/m32r/include/asm/cache.h
5610 +++ b/arch/m32r/include/asm/cache.h
5611 @@ -1,8 +1,10 @@
5612 #ifndef _ASM_M32R_CACHE_H
5613 #define _ASM_M32R_CACHE_H
5614
5615 +#include <linux/const.h>
5616 +
5617 /* L1 cache line size */
5618 #define L1_CACHE_SHIFT 4
5619 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5620 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5621
5622 #endif /* _ASM_M32R_CACHE_H */
5623 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5624 index 82abd15..d95ae5d 100644
5625 --- a/arch/m32r/lib/usercopy.c
5626 +++ b/arch/m32r/lib/usercopy.c
5627 @@ -14,6 +14,9 @@
5628 unsigned long
5629 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5630 {
5631 + if ((long)n < 0)
5632 + return n;
5633 +
5634 prefetch(from);
5635 if (access_ok(VERIFY_WRITE, to, n))
5636 __copy_user(to,from,n);
5637 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5638 unsigned long
5639 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5640 {
5641 + if ((long)n < 0)
5642 + return n;
5643 +
5644 prefetchw(to);
5645 if (access_ok(VERIFY_READ, from, n))
5646 __copy_user_zeroing(to,from,n);
5647 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5648 index 0395c51..5f26031 100644
5649 --- a/arch/m68k/include/asm/cache.h
5650 +++ b/arch/m68k/include/asm/cache.h
5651 @@ -4,9 +4,11 @@
5652 #ifndef __ARCH_M68K_CACHE_H
5653 #define __ARCH_M68K_CACHE_H
5654
5655 +#include <linux/const.h>
5656 +
5657 /* bytes per L1 cache line */
5658 #define L1_CACHE_SHIFT 4
5659 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5660 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5661
5662 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5663
5664 diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5665 index c7591e8..ecef036 100644
5666 --- a/arch/metag/include/asm/barrier.h
5667 +++ b/arch/metag/include/asm/barrier.h
5668 @@ -89,7 +89,7 @@ static inline void fence(void)
5669 do { \
5670 compiletime_assert_atomic_type(*p); \
5671 smp_mb(); \
5672 - ACCESS_ONCE(*p) = (v); \
5673 + ACCESS_ONCE_RW(*p) = (v); \
5674 } while (0)
5675
5676 #define smp_load_acquire(p) \
5677 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5678 index 3c32075..ae0ae75 100644
5679 --- a/arch/metag/mm/hugetlbpage.c
5680 +++ b/arch/metag/mm/hugetlbpage.c
5681 @@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5682 info.high_limit = TASK_SIZE;
5683 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5684 info.align_offset = 0;
5685 + info.threadstack_offset = 0;
5686 return vm_unmapped_area(&info);
5687 }
5688
5689 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5690 index 4efe96a..60e8699 100644
5691 --- a/arch/microblaze/include/asm/cache.h
5692 +++ b/arch/microblaze/include/asm/cache.h
5693 @@ -13,11 +13,12 @@
5694 #ifndef _ASM_MICROBLAZE_CACHE_H
5695 #define _ASM_MICROBLAZE_CACHE_H
5696
5697 +#include <linux/const.h>
5698 #include <asm/registers.h>
5699
5700 #define L1_CACHE_SHIFT 5
5701 /* word-granular cache in microblaze */
5702 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5703 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5704
5705 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5706
5707 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5708 index 9536ef9..9333776 100644
5709 --- a/arch/mips/Kconfig
5710 +++ b/arch/mips/Kconfig
5711 @@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5712
5713 config KEXEC
5714 bool "Kexec system call"
5715 + depends on !GRKERNSEC_KMEM
5716 help
5717 kexec is a system call that implements the ability to shutdown your
5718 current kernel, and to start another kernel. It is like a reboot
5719 diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5720 index 02f2444..506969c 100644
5721 --- a/arch/mips/cavium-octeon/dma-octeon.c
5722 +++ b/arch/mips/cavium-octeon/dma-octeon.c
5723 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5724 if (dma_release_from_coherent(dev, order, vaddr))
5725 return;
5726
5727 - swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5728 + swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5729 }
5730
5731 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5732 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5733 index 6dd6bfc..903b0d6 100644
5734 --- a/arch/mips/include/asm/atomic.h
5735 +++ b/arch/mips/include/asm/atomic.h
5736 @@ -21,15 +21,39 @@
5737 #include <asm/cmpxchg.h>
5738 #include <asm/war.h>
5739
5740 +#ifdef CONFIG_GENERIC_ATOMIC64
5741 +#include <asm-generic/atomic64.h>
5742 +#endif
5743 +
5744 #define ATOMIC_INIT(i) { (i) }
5745
5746 +#ifdef CONFIG_64BIT
5747 +#define _ASM_EXTABLE(from, to) \
5748 +" .section __ex_table,\"a\"\n" \
5749 +" .dword " #from ", " #to"\n" \
5750 +" .previous\n"
5751 +#else
5752 +#define _ASM_EXTABLE(from, to) \
5753 +" .section __ex_table,\"a\"\n" \
5754 +" .word " #from ", " #to"\n" \
5755 +" .previous\n"
5756 +#endif
5757 +
5758 /*
5759 * atomic_read - read atomic variable
5760 * @v: pointer of type atomic_t
5761 *
5762 * Atomically reads the value of @v.
5763 */
5764 -#define atomic_read(v) ACCESS_ONCE((v)->counter)
5765 +static inline int atomic_read(const atomic_t *v)
5766 +{
5767 + return ACCESS_ONCE(v->counter);
5768 +}
5769 +
5770 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5771 +{
5772 + return ACCESS_ONCE(v->counter);
5773 +}
5774
5775 /*
5776 * atomic_set - set atomic variable
5777 @@ -38,47 +62,77 @@
5778 *
5779 * Atomically sets the value of @v to @i.
5780 */
5781 -#define atomic_set(v, i) ((v)->counter = (i))
5782 +static inline void atomic_set(atomic_t *v, int i)
5783 +{
5784 + v->counter = i;
5785 +}
5786
5787 -#define ATOMIC_OP(op, c_op, asm_op) \
5788 -static __inline__ void atomic_##op(int i, atomic_t * v) \
5789 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5790 +{
5791 + v->counter = i;
5792 +}
5793 +
5794 +#ifdef CONFIG_PAX_REFCOUNT
5795 +#define __OVERFLOW_POST \
5796 + " b 4f \n" \
5797 + " .set noreorder \n" \
5798 + "3: b 5f \n" \
5799 + " move %0, %1 \n" \
5800 + " .set reorder \n"
5801 +#define __OVERFLOW_EXTABLE \
5802 + "3:\n" \
5803 + _ASM_EXTABLE(2b, 3b)
5804 +#else
5805 +#define __OVERFLOW_POST
5806 +#define __OVERFLOW_EXTABLE
5807 +#endif
5808 +
5809 +#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5810 +static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5811 { \
5812 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5813 int temp; \
5814 \
5815 __asm__ __volatile__( \
5816 - " .set arch=r4000 \n" \
5817 - "1: ll %0, %1 # atomic_" #op " \n" \
5818 - " " #asm_op " %0, %2 \n" \
5819 + " .set mips3 \n" \
5820 + "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5821 + "2: " #asm_op " %0, %2 \n" \
5822 " sc %0, %1 \n" \
5823 " beqzl %0, 1b \n" \
5824 + extable \
5825 " .set mips0 \n" \
5826 : "=&r" (temp), "+m" (v->counter) \
5827 : "Ir" (i)); \
5828 } else if (kernel_uses_llsc) { \
5829 int temp; \
5830 \
5831 - do { \
5832 - __asm__ __volatile__( \
5833 - " .set arch=r4000 \n" \
5834 - " ll %0, %1 # atomic_" #op "\n" \
5835 - " " #asm_op " %0, %2 \n" \
5836 - " sc %0, %1 \n" \
5837 - " .set mips0 \n" \
5838 - : "=&r" (temp), "+m" (v->counter) \
5839 - : "Ir" (i)); \
5840 - } while (unlikely(!temp)); \
5841 + __asm__ __volatile__( \
5842 + " .set mips3 \n" \
5843 + " ll %0, %1 # atomic_" #op #suffix "\n" \
5844 + "2: " #asm_op " %0, %2 \n" \
5845 + " sc %0, %1 \n" \
5846 + " beqz %0, 1b \n" \
5847 + extable \
5848 + " .set mips0 \n" \
5849 + : "=&r" (temp), "+m" (v->counter) \
5850 + : "Ir" (i)); \
5851 } else { \
5852 unsigned long flags; \
5853 \
5854 raw_local_irq_save(flags); \
5855 - v->counter c_op i; \
5856 + __asm__ __volatile__( \
5857 + "2: " #asm_op " %0, %1 \n" \
5858 + extable \
5859 + : "+r" (v->counter) : "Ir" (i)); \
5860 raw_local_irq_restore(flags); \
5861 } \
5862 } \
5863
5864 -#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5865 -static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5866 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5867 + __ATOMIC_OP(op, _unchecked, asm_op)
5868 +
5869 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5870 +static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5871 { \
5872 int result; \
5873 \
5874 @@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5875 int temp; \
5876 \
5877 __asm__ __volatile__( \
5878 - " .set arch=r4000 \n" \
5879 - "1: ll %1, %2 # atomic_" #op "_return \n" \
5880 - " " #asm_op " %0, %1, %3 \n" \
5881 + " .set mips3 \n" \
5882 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5883 + "2: " #asm_op " %0, %1, %3 \n" \
5884 " sc %0, %2 \n" \
5885 " beqzl %0, 1b \n" \
5886 - " " #asm_op " %0, %1, %3 \n" \
5887 + post_op \
5888 + extable \
5889 + "4: " #asm_op " %0, %1, %3 \n" \
5890 + "5: \n" \
5891 " .set mips0 \n" \
5892 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5893 : "Ir" (i)); \
5894 } else if (kernel_uses_llsc) { \
5895 int temp; \
5896 \
5897 - do { \
5898 - __asm__ __volatile__( \
5899 - " .set arch=r4000 \n" \
5900 - " ll %1, %2 # atomic_" #op "_return \n" \
5901 - " " #asm_op " %0, %1, %3 \n" \
5902 - " sc %0, %2 \n" \
5903 - " .set mips0 \n" \
5904 - : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5905 - : "Ir" (i)); \
5906 - } while (unlikely(!result)); \
5907 + __asm__ __volatile__( \
5908 + " .set mips3 \n" \
5909 + "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5910 + "2: " #asm_op " %0, %1, %3 \n" \
5911 + " sc %0, %2 \n" \
5912 + " beqz %0, 1b \n" \
5913 + post_op \
5914 + extable \
5915 + "4: " #asm_op " %0, %1, %3 \n" \
5916 + "5: \n" \
5917 + " .set mips0 \n" \
5918 + : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5919 + : "Ir" (i)); \
5920 \
5921 result = temp; result c_op i; \
5922 } else { \
5923 unsigned long flags; \
5924 \
5925 raw_local_irq_save(flags); \
5926 - result = v->counter; \
5927 - result c_op i; \
5928 - v->counter = result; \
5929 + __asm__ __volatile__( \
5930 + " lw %0, %1 \n" \
5931 + "2: " #asm_op " %0, %1, %2 \n" \
5932 + " sw %0, %1 \n" \
5933 + "3: \n" \
5934 + extable \
5935 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5936 raw_local_irq_restore(flags); \
5937 } \
5938 \
5939 @@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940 return result; \
5941 }
5942
5943 -#define ATOMIC_OPS(op, c_op, asm_op) \
5944 - ATOMIC_OP(op, c_op, asm_op) \
5945 - ATOMIC_OP_RETURN(op, c_op, asm_op)
5946 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5947 + __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5948
5949 -ATOMIC_OPS(add, +=, addu)
5950 -ATOMIC_OPS(sub, -=, subu)
5951 +#define ATOMIC_OPS(op, asm_op) \
5952 + ATOMIC_OP(op, asm_op) \
5953 + ATOMIC_OP_RETURN(op, asm_op)
5954 +
5955 +ATOMIC_OPS(add, add)
5956 +ATOMIC_OPS(sub, sub)
5957
5958 #undef ATOMIC_OPS
5959 #undef ATOMIC_OP_RETURN
5960 +#undef __ATOMIC_OP_RETURN
5961 #undef ATOMIC_OP
5962 +#undef __ATOMIC_OP
5963
5964 /*
5965 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5966 @@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5967 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5968 * The function returns the old value of @v minus @i.
5969 */
5970 -static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5971 +static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5972 {
5973 int result;
5974
5975 @@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5976 return result;
5977 }
5978
5979 -#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5980 -#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5981 +static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5982 +{
5983 + return cmpxchg(&v->counter, old, new);
5984 +}
5985 +
5986 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5987 + int new)
5988 +{
5989 + return cmpxchg(&(v->counter), old, new);
5990 +}
5991 +
5992 +static inline int atomic_xchg(atomic_t *v, int new)
5993 +{
5994 + return xchg(&v->counter, new);
5995 +}
5996 +
5997 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5998 +{
5999 + return xchg(&(v->counter), new);
6000 +}
6001
6002 /**
6003 * __atomic_add_unless - add unless the number is a given value
6004 @@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6005
6006 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6007 #define atomic_inc_return(v) atomic_add_return(1, (v))
6008 +static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6009 +{
6010 + return atomic_add_return_unchecked(1, v);
6011 +}
6012
6013 /*
6014 * atomic_sub_and_test - subtract value from variable and test result
6015 @@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6016 * other cases.
6017 */
6018 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6019 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6020 +{
6021 + return atomic_add_return_unchecked(1, v) == 0;
6022 +}
6023
6024 /*
6025 * atomic_dec_and_test - decrement by 1 and test
6026 @@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6027 * Atomically increments @v by 1.
6028 */
6029 #define atomic_inc(v) atomic_add(1, (v))
6030 +static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6031 +{
6032 + atomic_add_unchecked(1, v);
6033 +}
6034
6035 /*
6036 * atomic_dec - decrement and test
6037 @@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6038 * Atomically decrements @v by 1.
6039 */
6040 #define atomic_dec(v) atomic_sub(1, (v))
6041 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6042 +{
6043 + atomic_sub_unchecked(1, v);
6044 +}
6045
6046 /*
6047 * atomic_add_negative - add and test if negative
6048 @@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6049 * @v: pointer of type atomic64_t
6050 *
6051 */
6052 -#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6053 +static inline long atomic64_read(const atomic64_t *v)
6054 +{
6055 + return ACCESS_ONCE(v->counter);
6056 +}
6057 +
6058 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6059 +{
6060 + return ACCESS_ONCE(v->counter);
6061 +}
6062
6063 /*
6064 * atomic64_set - set atomic variable
6065 * @v: pointer of type atomic64_t
6066 * @i: required value
6067 */
6068 -#define atomic64_set(v, i) ((v)->counter = (i))
6069 +static inline void atomic64_set(atomic64_t *v, long i)
6070 +{
6071 + v->counter = i;
6072 +}
6073
6074 -#define ATOMIC64_OP(op, c_op, asm_op) \
6075 -static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6076 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6077 +{
6078 + v->counter = i;
6079 +}
6080 +
6081 +#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6082 +static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6083 { \
6084 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6085 long temp; \
6086 \
6087 __asm__ __volatile__( \
6088 - " .set arch=r4000 \n" \
6089 - "1: lld %0, %1 # atomic64_" #op " \n" \
6090 - " " #asm_op " %0, %2 \n" \
6091 + " .set mips3 \n" \
6092 + "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6093 + "2: " #asm_op " %0, %2 \n" \
6094 " scd %0, %1 \n" \
6095 " beqzl %0, 1b \n" \
6096 + extable \
6097 " .set mips0 \n" \
6098 : "=&r" (temp), "+m" (v->counter) \
6099 : "Ir" (i)); \
6100 } else if (kernel_uses_llsc) { \
6101 long temp; \
6102 \
6103 - do { \
6104 - __asm__ __volatile__( \
6105 - " .set arch=r4000 \n" \
6106 - " lld %0, %1 # atomic64_" #op "\n" \
6107 - " " #asm_op " %0, %2 \n" \
6108 - " scd %0, %1 \n" \
6109 - " .set mips0 \n" \
6110 - : "=&r" (temp), "+m" (v->counter) \
6111 - : "Ir" (i)); \
6112 - } while (unlikely(!temp)); \
6113 + __asm__ __volatile__( \
6114 + " .set mips3 \n" \
6115 + " lld %0, %1 # atomic64_" #op #suffix "\n" \
6116 + "2: " #asm_op " %0, %2 \n" \
6117 + " scd %0, %1 \n" \
6118 + " beqz %0, 1b \n" \
6119 + extable \
6120 + " .set mips0 \n" \
6121 + : "=&r" (temp), "+m" (v->counter) \
6122 + : "Ir" (i)); \
6123 } else { \
6124 unsigned long flags; \
6125 \
6126 raw_local_irq_save(flags); \
6127 - v->counter c_op i; \
6128 + __asm__ __volatile__( \
6129 + "2: " #asm_op " %0, %1 \n" \
6130 + extable \
6131 + : "+r" (v->counter) : "Ir" (i)); \
6132 raw_local_irq_restore(flags); \
6133 } \
6134 } \
6135
6136 -#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6137 -static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6138 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6139 + __ATOMIC64_OP(op, _unchecked, asm_op)
6140 +
6141 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6142 +static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6143 { \
6144 long result; \
6145 \
6146 @@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6147 long temp; \
6148 \
6149 __asm__ __volatile__( \
6150 - " .set arch=r4000 \n" \
6151 + " .set mips3 \n" \
6152 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6153 - " " #asm_op " %0, %1, %3 \n" \
6154 + "2: " #asm_op " %0, %1, %3 \n" \
6155 " scd %0, %2 \n" \
6156 " beqzl %0, 1b \n" \
6157 - " " #asm_op " %0, %1, %3 \n" \
6158 + post_op \
6159 + extable \
6160 + "4: " #asm_op " %0, %1, %3 \n" \
6161 + "5: \n" \
6162 " .set mips0 \n" \
6163 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6164 : "Ir" (i)); \
6165 } else if (kernel_uses_llsc) { \
6166 long temp; \
6167 \
6168 - do { \
6169 - __asm__ __volatile__( \
6170 - " .set arch=r4000 \n" \
6171 - " lld %1, %2 # atomic64_" #op "_return\n" \
6172 - " " #asm_op " %0, %1, %3 \n" \
6173 - " scd %0, %2 \n" \
6174 - " .set mips0 \n" \
6175 - : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6176 - : "Ir" (i), "m" (v->counter) \
6177 - : "memory"); \
6178 - } while (unlikely(!result)); \
6179 + __asm__ __volatile__( \
6180 + " .set mips3 \n" \
6181 + "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6182 + "2: " #asm_op " %0, %1, %3 \n" \
6183 + " scd %0, %2 \n" \
6184 + " beqz %0, 1b \n" \
6185 + post_op \
6186 + extable \
6187 + "4: " #asm_op " %0, %1, %3 \n" \
6188 + "5: \n" \
6189 + " .set mips0 \n" \
6190 + : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6191 + : "Ir" (i), "m" (v->counter) \
6192 + : "memory"); \
6193 \
6194 result = temp; result c_op i; \
6195 } else { \
6196 unsigned long flags; \
6197 \
6198 raw_local_irq_save(flags); \
6199 - result = v->counter; \
6200 - result c_op i; \
6201 - v->counter = result; \
6202 + __asm__ __volatile__( \
6203 + " ld %0, %1 \n" \
6204 + "2: " #asm_op " %0, %1, %2 \n" \
6205 + " sd %0, %1 \n" \
6206 + "3: \n" \
6207 + extable \
6208 + : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6209 raw_local_irq_restore(flags); \
6210 } \
6211 \
6212 @@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6213 return result; \
6214 }
6215
6216 -#define ATOMIC64_OPS(op, c_op, asm_op) \
6217 - ATOMIC64_OP(op, c_op, asm_op) \
6218 - ATOMIC64_OP_RETURN(op, c_op, asm_op)
6219 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6220 + __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6221
6222 -ATOMIC64_OPS(add, +=, daddu)
6223 -ATOMIC64_OPS(sub, -=, dsubu)
6224 +#define ATOMIC64_OPS(op, asm_op) \
6225 + ATOMIC64_OP(op, asm_op) \
6226 + ATOMIC64_OP_RETURN(op, asm_op)
6227 +
6228 +ATOMIC64_OPS(add, dadd)
6229 +ATOMIC64_OPS(sub, dsub)
6230
6231 #undef ATOMIC64_OPS
6232 #undef ATOMIC64_OP_RETURN
6233 +#undef __ATOMIC64_OP_RETURN
6234 #undef ATOMIC64_OP
6235 +#undef __ATOMIC64_OP
6236 +#undef __OVERFLOW_EXTABLE
6237 +#undef __OVERFLOW_POST
6238
6239 /*
6240 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6241 @@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6242 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6243 * The function returns the old value of @v minus @i.
6244 */
6245 -static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6246 +static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6247 {
6248 long result;
6249
6250 @@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6251 return result;
6252 }
6253
6254 -#define atomic64_cmpxchg(v, o, n) \
6255 - ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6256 -#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6257 +static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6258 +{
6259 + return cmpxchg(&v->counter, old, new);
6260 +}
6261 +
6262 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6263 + long new)
6264 +{
6265 + return cmpxchg(&(v->counter), old, new);
6266 +}
6267 +
6268 +static inline long atomic64_xchg(atomic64_t *v, long new)
6269 +{
6270 + return xchg(&v->counter, new);
6271 +}
6272 +
6273 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6274 +{
6275 + return xchg(&(v->counter), new);
6276 +}
6277
6278 /**
6279 * atomic64_add_unless - add unless the number is a given value
6280 @@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6281
6282 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6283 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6284 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6285
6286 /*
6287 * atomic64_sub_and_test - subtract value from variable and test result
6288 @@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6289 * other cases.
6290 */
6291 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6292 +#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6293
6294 /*
6295 * atomic64_dec_and_test - decrement by 1 and test
6296 @@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6297 * Atomically increments @v by 1.
6298 */
6299 #define atomic64_inc(v) atomic64_add(1, (v))
6300 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6301
6302 /*
6303 * atomic64_dec - decrement and test
6304 @@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305 * Atomically decrements @v by 1.
6306 */
6307 #define atomic64_dec(v) atomic64_sub(1, (v))
6308 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6309
6310 /*
6311 * atomic64_add_negative - add and test if negative
6312 diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6313 index d0101dd..266982c 100644
6314 --- a/arch/mips/include/asm/barrier.h
6315 +++ b/arch/mips/include/asm/barrier.h
6316 @@ -184,7 +184,7 @@
6317 do { \
6318 compiletime_assert_atomic_type(*p); \
6319 smp_mb(); \
6320 - ACCESS_ONCE(*p) = (v); \
6321 + ACCESS_ONCE_RW(*p) = (v); \
6322 } while (0)
6323
6324 #define smp_load_acquire(p) \
6325 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6326 index b4db69f..8f3b093 100644
6327 --- a/arch/mips/include/asm/cache.h
6328 +++ b/arch/mips/include/asm/cache.h
6329 @@ -9,10 +9,11 @@
6330 #ifndef _ASM_CACHE_H
6331 #define _ASM_CACHE_H
6332
6333 +#include <linux/const.h>
6334 #include <kmalloc.h>
6335
6336 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6337 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6338 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6339
6340 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6341 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6342 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6343 index 1d38fe0..9beabc9 100644
6344 --- a/arch/mips/include/asm/elf.h
6345 +++ b/arch/mips/include/asm/elf.h
6346 @@ -381,13 +381,16 @@ extern const char *__elf_platform;
6347 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6348 #endif
6349
6350 +#ifdef CONFIG_PAX_ASLR
6351 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6352 +
6353 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6354 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6355 +#endif
6356 +
6357 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6358 struct linux_binprm;
6359 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6360 int uses_interp);
6361
6362 -struct mm_struct;
6363 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6364 -#define arch_randomize_brk arch_randomize_brk
6365 -
6366 #endif /* _ASM_ELF_H */
6367 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6368 index c1f6afa..38cc6e9 100644
6369 --- a/arch/mips/include/asm/exec.h
6370 +++ b/arch/mips/include/asm/exec.h
6371 @@ -12,6 +12,6 @@
6372 #ifndef _ASM_EXEC_H
6373 #define _ASM_EXEC_H
6374
6375 -extern unsigned long arch_align_stack(unsigned long sp);
6376 +#define arch_align_stack(x) ((x) & ~0xfUL)
6377
6378 #endif /* _ASM_EXEC_H */
6379 diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6380 index 9e8ef59..1139d6b 100644
6381 --- a/arch/mips/include/asm/hw_irq.h
6382 +++ b/arch/mips/include/asm/hw_irq.h
6383 @@ -10,7 +10,7 @@
6384
6385 #include <linux/atomic.h>
6386
6387 -extern atomic_t irq_err_count;
6388 +extern atomic_unchecked_t irq_err_count;
6389
6390 /*
6391 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6392 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6393 index 46dfc3c..a16b13a 100644
6394 --- a/arch/mips/include/asm/local.h
6395 +++ b/arch/mips/include/asm/local.h
6396 @@ -12,15 +12,25 @@ typedef struct
6397 atomic_long_t a;
6398 } local_t;
6399
6400 +typedef struct {
6401 + atomic_long_unchecked_t a;
6402 +} local_unchecked_t;
6403 +
6404 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6405
6406 #define local_read(l) atomic_long_read(&(l)->a)
6407 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6408 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6409 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6410
6411 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6412 +#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6413 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6414 +#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6415 #define local_inc(l) atomic_long_inc(&(l)->a)
6416 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6417 #define local_dec(l) atomic_long_dec(&(l)->a)
6418 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6419
6420 /*
6421 * Same as above, but return the result value
6422 @@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6423 return result;
6424 }
6425
6426 +static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6427 +{
6428 + unsigned long result;
6429 +
6430 + if (kernel_uses_llsc && R10000_LLSC_WAR) {
6431 + unsigned long temp;
6432 +
6433 + __asm__ __volatile__(
6434 + " .set mips3 \n"
6435 + "1:" __LL "%1, %2 # local_add_return \n"
6436 + " addu %0, %1, %3 \n"
6437 + __SC "%0, %2 \n"
6438 + " beqzl %0, 1b \n"
6439 + " addu %0, %1, %3 \n"
6440 + " .set mips0 \n"
6441 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6442 + : "Ir" (i), "m" (l->a.counter)
6443 + : "memory");
6444 + } else if (kernel_uses_llsc) {
6445 + unsigned long temp;
6446 +
6447 + __asm__ __volatile__(
6448 + " .set mips3 \n"
6449 + "1:" __LL "%1, %2 # local_add_return \n"
6450 + " addu %0, %1, %3 \n"
6451 + __SC "%0, %2 \n"
6452 + " beqz %0, 1b \n"
6453 + " addu %0, %1, %3 \n"
6454 + " .set mips0 \n"
6455 + : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6456 + : "Ir" (i), "m" (l->a.counter)
6457 + : "memory");
6458 + } else {
6459 + unsigned long flags;
6460 +
6461 + local_irq_save(flags);
6462 + result = l->a.counter;
6463 + result += i;
6464 + l->a.counter = result;
6465 + local_irq_restore(flags);
6466 + }
6467 +
6468 + return result;
6469 +}
6470 +
6471 static __inline__ long local_sub_return(long i, local_t * l)
6472 {
6473 unsigned long result;
6474 @@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6475
6476 #define local_cmpxchg(l, o, n) \
6477 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6478 +#define local_cmpxchg_unchecked(l, o, n) \
6479 + ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6480 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6481
6482 /**
6483 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6484 index 3be8180..c4798d5 100644
6485 --- a/arch/mips/include/asm/page.h
6486 +++ b/arch/mips/include/asm/page.h
6487 @@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6488 #ifdef CONFIG_CPU_MIPS32
6489 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6490 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6491 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6492 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6493 #else
6494 typedef struct { unsigned long long pte; } pte_t;
6495 #define pte_val(x) ((x).pte)
6496 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6497 index b336037..5b874cc 100644
6498 --- a/arch/mips/include/asm/pgalloc.h
6499 +++ b/arch/mips/include/asm/pgalloc.h
6500 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6501 {
6502 set_pud(pud, __pud((unsigned long)pmd));
6503 }
6504 +
6505 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6506 +{
6507 + pud_populate(mm, pud, pmd);
6508 +}
6509 #endif
6510
6511 /*
6512 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6513 index d6d1928..ce4f822 100644
6514 --- a/arch/mips/include/asm/pgtable.h
6515 +++ b/arch/mips/include/asm/pgtable.h
6516 @@ -20,6 +20,9 @@
6517 #include <asm/io.h>
6518 #include <asm/pgtable-bits.h>
6519
6520 +#define ktla_ktva(addr) (addr)
6521 +#define ktva_ktla(addr) (addr)
6522 +
6523 struct mm_struct;
6524 struct vm_area_struct;
6525
6526 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6527 index 7de8658..c109224 100644
6528 --- a/arch/mips/include/asm/thread_info.h
6529 +++ b/arch/mips/include/asm/thread_info.h
6530 @@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6531 #define TIF_SECCOMP 4 /* secure computing */
6532 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6533 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6534 +/* li takes a 32bit immediate */
6535 +#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6536 +
6537 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6538 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6539 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6540 @@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6541 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6542 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6543 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6544 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6545
6546 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6547 _TIF_SYSCALL_AUDIT | \
6548 - _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6549 + _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6550 + _TIF_GRSEC_SETXID)
6551
6552 /* work to do in syscall_trace_leave() */
6553 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6554 - _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6555 + _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6556
6557 /* work to do on interrupt/exception return */
6558 #define _TIF_WORK_MASK \
6559 @@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6560 /* work to do on any return to u-space */
6561 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6562 _TIF_WORK_SYSCALL_EXIT | \
6563 - _TIF_SYSCALL_TRACEPOINT)
6564 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6565
6566 /*
6567 * We stash processor id into a COP0 register to retrieve it fast
6568 diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6569 index 22a5624..7c96295 100644
6570 --- a/arch/mips/include/asm/uaccess.h
6571 +++ b/arch/mips/include/asm/uaccess.h
6572 @@ -130,6 +130,7 @@ extern u64 __ua_limit;
6573 __ok == 0; \
6574 })
6575
6576 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6577 #define access_ok(type, addr, size) \
6578 likely(__access_ok((addr), (size), __access_mask))
6579
6580 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6581 index 1188e00..41cf144 100644
6582 --- a/arch/mips/kernel/binfmt_elfn32.c
6583 +++ b/arch/mips/kernel/binfmt_elfn32.c
6584 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6585 #undef ELF_ET_DYN_BASE
6586 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6587
6588 +#ifdef CONFIG_PAX_ASLR
6589 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6590 +
6591 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6592 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6593 +#endif
6594 +
6595 #include <asm/processor.h>
6596 #include <linux/module.h>
6597 #include <linux/elfcore.h>
6598 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6599 index 9287678..f870e47 100644
6600 --- a/arch/mips/kernel/binfmt_elfo32.c
6601 +++ b/arch/mips/kernel/binfmt_elfo32.c
6602 @@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6603 #undef ELF_ET_DYN_BASE
6604 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6605
6606 +#ifdef CONFIG_PAX_ASLR
6607 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6608 +
6609 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6610 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6611 +#endif
6612 +
6613 #include <asm/processor.h>
6614
6615 #include <linux/module.h>
6616 diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6617 index 50b3648..c2f3cec 100644
6618 --- a/arch/mips/kernel/i8259.c
6619 +++ b/arch/mips/kernel/i8259.c
6620 @@ -201,7 +201,7 @@ spurious_8259A_irq:
6621 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6622 spurious_irq_mask |= irqmask;
6623 }
6624 - atomic_inc(&irq_err_count);
6625 + atomic_inc_unchecked(&irq_err_count);
6626 /*
6627 * Theoretically we do not have to handle this IRQ,
6628 * but in Linux this does not cause problems and is
6629 diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6630 index 44a1f79..2bd6aa3 100644
6631 --- a/arch/mips/kernel/irq-gt641xx.c
6632 +++ b/arch/mips/kernel/irq-gt641xx.c
6633 @@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6634 }
6635 }
6636
6637 - atomic_inc(&irq_err_count);
6638 + atomic_inc_unchecked(&irq_err_count);
6639 }
6640
6641 void __init gt641xx_irq_init(void)
6642 diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6643 index d2bfbc2..a8eacd2 100644
6644 --- a/arch/mips/kernel/irq.c
6645 +++ b/arch/mips/kernel/irq.c
6646 @@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6647 printk("unexpected IRQ # %d\n", irq);
6648 }
6649
6650 -atomic_t irq_err_count;
6651 +atomic_unchecked_t irq_err_count;
6652
6653 int arch_show_interrupts(struct seq_file *p, int prec)
6654 {
6655 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6656 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6657 return 0;
6658 }
6659
6660 asmlinkage void spurious_interrupt(void)
6661 {
6662 - atomic_inc(&irq_err_count);
6663 + atomic_inc_unchecked(&irq_err_count);
6664 }
6665
6666 void __init init_IRQ(void)
6667 @@ -109,7 +109,10 @@ void __init init_IRQ(void)
6668 #endif
6669 }
6670
6671 +
6672 #ifdef DEBUG_STACKOVERFLOW
6673 +extern void gr_handle_kernel_exploit(void);
6674 +
6675 static inline void check_stack_overflow(void)
6676 {
6677 unsigned long sp;
6678 @@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6679 printk("do_IRQ: stack overflow: %ld\n",
6680 sp - sizeof(struct thread_info));
6681 dump_stack();
6682 + gr_handle_kernel_exploit();
6683 }
6684 }
6685 #else
6686 diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6687 index 0614717..002fa43 100644
6688 --- a/arch/mips/kernel/pm-cps.c
6689 +++ b/arch/mips/kernel/pm-cps.c
6690 @@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6691 nc_core_ready_count = nc_addr;
6692
6693 /* Ensure ready_count is zero-initialised before the assembly runs */
6694 - ACCESS_ONCE(*nc_core_ready_count) = 0;
6695 + ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6696 coupled_barrier(&per_cpu(pm_barrier, core), online);
6697
6698 /* Run the generated entry code */
6699 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6700 index 636b074..8fbb91f 100644
6701 --- a/arch/mips/kernel/process.c
6702 +++ b/arch/mips/kernel/process.c
6703 @@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6704 out:
6705 return pc;
6706 }
6707 -
6708 -/*
6709 - * Don't forget that the stack pointer must be aligned on a 8 bytes
6710 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6711 - */
6712 -unsigned long arch_align_stack(unsigned long sp)
6713 -{
6714 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6715 - sp -= get_random_int() & ~PAGE_MASK;
6716 -
6717 - return sp & ALMASK;
6718 -}
6719 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6720 index 9d1487d..10c5da5 100644
6721 --- a/arch/mips/kernel/ptrace.c
6722 +++ b/arch/mips/kernel/ptrace.c
6723 @@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6724 return ret;
6725 }
6726
6727 +#ifdef CONFIG_GRKERNSEC_SETXID
6728 +extern void gr_delayed_cred_worker(void);
6729 +#endif
6730 +
6731 /*
6732 * Notification of system call entry/exit
6733 * - triggered by current->work.syscall_trace
6734 @@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6735 tracehook_report_syscall_entry(regs))
6736 ret = -1;
6737
6738 +#ifdef CONFIG_GRKERNSEC_SETXID
6739 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6740 + gr_delayed_cred_worker();
6741 +#endif
6742 +
6743 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6744 trace_sys_enter(regs, regs->regs[2]);
6745
6746 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6747 index 07fc524..b9d7f28 100644
6748 --- a/arch/mips/kernel/reset.c
6749 +++ b/arch/mips/kernel/reset.c
6750 @@ -13,6 +13,7 @@
6751 #include <linux/reboot.h>
6752
6753 #include <asm/reboot.h>
6754 +#include <asm/bug.h>
6755
6756 /*
6757 * Urgs ... Too many MIPS machines to handle this in a generic way.
6758 @@ -29,16 +30,19 @@ void machine_restart(char *command)
6759 {
6760 if (_machine_restart)
6761 _machine_restart(command);
6762 + BUG();
6763 }
6764
6765 void machine_halt(void)
6766 {
6767 if (_machine_halt)
6768 _machine_halt();
6769 + BUG();
6770 }
6771
6772 void machine_power_off(void)
6773 {
6774 if (pm_power_off)
6775 pm_power_off();
6776 + BUG();
6777 }
6778 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6779 index 2242bdd..b284048 100644
6780 --- a/arch/mips/kernel/sync-r4k.c
6781 +++ b/arch/mips/kernel/sync-r4k.c
6782 @@ -18,8 +18,8 @@
6783 #include <asm/mipsregs.h>
6784
6785 static atomic_t count_start_flag = ATOMIC_INIT(0);
6786 -static atomic_t count_count_start = ATOMIC_INIT(0);
6787 -static atomic_t count_count_stop = ATOMIC_INIT(0);
6788 +static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6789 +static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6790 static atomic_t count_reference = ATOMIC_INIT(0);
6791
6792 #define COUNTON 100
6793 @@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6794
6795 for (i = 0; i < NR_LOOPS; i++) {
6796 /* slaves loop on '!= 2' */
6797 - while (atomic_read(&count_count_start) != 1)
6798 + while (atomic_read_unchecked(&count_count_start) != 1)
6799 mb();
6800 - atomic_set(&count_count_stop, 0);
6801 + atomic_set_unchecked(&count_count_stop, 0);
6802 smp_wmb();
6803
6804 /* this lets the slaves write their count register */
6805 - atomic_inc(&count_count_start);
6806 + atomic_inc_unchecked(&count_count_start);
6807
6808 /*
6809 * Everyone initialises count in the last loop:
6810 @@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6811 /*
6812 * Wait for all slaves to leave the synchronization point:
6813 */
6814 - while (atomic_read(&count_count_stop) != 1)
6815 + while (atomic_read_unchecked(&count_count_stop) != 1)
6816 mb();
6817 - atomic_set(&count_count_start, 0);
6818 + atomic_set_unchecked(&count_count_start, 0);
6819 smp_wmb();
6820 - atomic_inc(&count_count_stop);
6821 + atomic_inc_unchecked(&count_count_stop);
6822 }
6823 /* Arrange for an interrupt in a short while */
6824 write_c0_compare(read_c0_count() + COUNTON);
6825 @@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6826 initcount = atomic_read(&count_reference);
6827
6828 for (i = 0; i < NR_LOOPS; i++) {
6829 - atomic_inc(&count_count_start);
6830 - while (atomic_read(&count_count_start) != 2)
6831 + atomic_inc_unchecked(&count_count_start);
6832 + while (atomic_read_unchecked(&count_count_start) != 2)
6833 mb();
6834
6835 /*
6836 @@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6837 if (i == NR_LOOPS-1)
6838 write_c0_count(initcount);
6839
6840 - atomic_inc(&count_count_stop);
6841 - while (atomic_read(&count_count_stop) != 2)
6842 + atomic_inc_unchecked(&count_count_stop);
6843 + while (atomic_read_unchecked(&count_count_stop) != 2)
6844 mb();
6845 }
6846 /* Arrange for an interrupt in a short while */
6847 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6848 index 22b19c2..c5cc8c4 100644
6849 --- a/arch/mips/kernel/traps.c
6850 +++ b/arch/mips/kernel/traps.c
6851 @@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6852 siginfo_t info;
6853
6854 prev_state = exception_enter();
6855 - die_if_kernel("Integer overflow", regs);
6856 + if (unlikely(!user_mode(regs))) {
6857 +
6858 +#ifdef CONFIG_PAX_REFCOUNT
6859 + if (fixup_exception(regs)) {
6860 + pax_report_refcount_overflow(regs);
6861 + exception_exit(prev_state);
6862 + return;
6863 + }
6864 +#endif
6865 +
6866 + die("Integer overflow", regs);
6867 + }
6868
6869 info.si_code = FPE_INTOVF;
6870 info.si_signo = SIGFPE;
6871 diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6872 index e3b21e5..ea5ff7c 100644
6873 --- a/arch/mips/kvm/mips.c
6874 +++ b/arch/mips/kvm/mips.c
6875 @@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6876 return r;
6877 }
6878
6879 -int kvm_arch_init(void *opaque)
6880 +int kvm_arch_init(const void *opaque)
6881 {
6882 if (kvm_mips_callbacks) {
6883 kvm_err("kvm: module already exists\n");
6884 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6885 index becc42b..9e43d4b 100644
6886 --- a/arch/mips/mm/fault.c
6887 +++ b/arch/mips/mm/fault.c
6888 @@ -28,6 +28,23 @@
6889 #include <asm/highmem.h> /* For VMALLOC_END */
6890 #include <linux/kdebug.h>
6891
6892 +#ifdef CONFIG_PAX_PAGEEXEC
6893 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6894 +{
6895 + unsigned long i;
6896 +
6897 + printk(KERN_ERR "PAX: bytes at PC: ");
6898 + for (i = 0; i < 5; i++) {
6899 + unsigned int c;
6900 + if (get_user(c, (unsigned int *)pc+i))
6901 + printk(KERN_CONT "???????? ");
6902 + else
6903 + printk(KERN_CONT "%08x ", c);
6904 + }
6905 + printk("\n");
6906 +}
6907 +#endif
6908 +
6909 /*
6910 * This routine handles page faults. It determines the address,
6911 * and the problem, and then passes it off to one of the appropriate
6912 @@ -199,6 +216,14 @@ bad_area:
6913 bad_area_nosemaphore:
6914 /* User mode accesses just cause a SIGSEGV */
6915 if (user_mode(regs)) {
6916 +
6917 +#ifdef CONFIG_PAX_PAGEEXEC
6918 + if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6919 + pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6920 + do_group_exit(SIGKILL);
6921 + }
6922 +#endif
6923 +
6924 tsk->thread.cp0_badvaddr = address;
6925 tsk->thread.error_code = write;
6926 #if 0
6927 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6928 index f1baadd..5472dca 100644
6929 --- a/arch/mips/mm/mmap.c
6930 +++ b/arch/mips/mm/mmap.c
6931 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6932 struct vm_area_struct *vma;
6933 unsigned long addr = addr0;
6934 int do_color_align;
6935 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6936 struct vm_unmapped_area_info info;
6937
6938 if (unlikely(len > TASK_SIZE))
6939 @@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6940 do_color_align = 1;
6941
6942 /* requesting a specific address */
6943 +
6944 +#ifdef CONFIG_PAX_RANDMMAP
6945 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6946 +#endif
6947 +
6948 if (addr) {
6949 if (do_color_align)
6950 addr = COLOUR_ALIGN(addr, pgoff);
6951 @@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6952 addr = PAGE_ALIGN(addr);
6953
6954 vma = find_vma(mm, addr);
6955 - if (TASK_SIZE - len >= addr &&
6956 - (!vma || addr + len <= vma->vm_start))
6957 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6958 return addr;
6959 }
6960
6961 info.length = len;
6962 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6963 info.align_offset = pgoff << PAGE_SHIFT;
6964 + info.threadstack_offset = offset;
6965
6966 if (dir == DOWN) {
6967 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6968 @@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6969 {
6970 unsigned long random_factor = 0UL;
6971
6972 +#ifdef CONFIG_PAX_RANDMMAP
6973 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6974 +#endif
6975 +
6976 if (current->flags & PF_RANDOMIZE) {
6977 random_factor = get_random_int();
6978 random_factor = random_factor << PAGE_SHIFT;
6979 @@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6980
6981 if (mmap_is_legacy()) {
6982 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6983 +
6984 +#ifdef CONFIG_PAX_RANDMMAP
6985 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6986 + mm->mmap_base += mm->delta_mmap;
6987 +#endif
6988 +
6989 mm->get_unmapped_area = arch_get_unmapped_area;
6990 } else {
6991 mm->mmap_base = mmap_base(random_factor);
6992 +
6993 +#ifdef CONFIG_PAX_RANDMMAP
6994 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6995 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6996 +#endif
6997 +
6998 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6999 }
7000 }
7001
7002 -static inline unsigned long brk_rnd(void)
7003 -{
7004 - unsigned long rnd = get_random_int();
7005 -
7006 - rnd = rnd << PAGE_SHIFT;
7007 - /* 8MB for 32bit, 256MB for 64bit */
7008 - if (TASK_IS_32BIT_ADDR)
7009 - rnd = rnd & 0x7ffffful;
7010 - else
7011 - rnd = rnd & 0xffffffful;
7012 -
7013 - return rnd;
7014 -}
7015 -
7016 -unsigned long arch_randomize_brk(struct mm_struct *mm)
7017 -{
7018 - unsigned long base = mm->brk;
7019 - unsigned long ret;
7020 -
7021 - ret = PAGE_ALIGN(base + brk_rnd());
7022 -
7023 - if (ret < mm->brk)
7024 - return mm->brk;
7025 -
7026 - return ret;
7027 -}
7028 -
7029 int __virt_addr_valid(const volatile void *kaddr)
7030 {
7031 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7032 diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7033 index 59cccd9..f39ac2f 100644
7034 --- a/arch/mips/pci/pci-octeon.c
7035 +++ b/arch/mips/pci/pci-octeon.c
7036 @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7037
7038
7039 static struct pci_ops octeon_pci_ops = {
7040 - octeon_read_config,
7041 - octeon_write_config,
7042 + .read = octeon_read_config,
7043 + .write = octeon_write_config,
7044 };
7045
7046 static struct resource octeon_pci_mem_resource = {
7047 diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7048 index 5e36c33..eb4a17b 100644
7049 --- a/arch/mips/pci/pcie-octeon.c
7050 +++ b/arch/mips/pci/pcie-octeon.c
7051 @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7052 }
7053
7054 static struct pci_ops octeon_pcie0_ops = {
7055 - octeon_pcie0_read_config,
7056 - octeon_pcie0_write_config,
7057 + .read = octeon_pcie0_read_config,
7058 + .write = octeon_pcie0_write_config,
7059 };
7060
7061 static struct resource octeon_pcie0_mem_resource = {
7062 @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7063 };
7064
7065 static struct pci_ops octeon_pcie1_ops = {
7066 - octeon_pcie1_read_config,
7067 - octeon_pcie1_write_config,
7068 + .read = octeon_pcie1_read_config,
7069 + .write = octeon_pcie1_write_config,
7070 };
7071
7072 static struct resource octeon_pcie1_mem_resource = {
7073 @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7074 };
7075
7076 static struct pci_ops octeon_dummy_ops = {
7077 - octeon_dummy_read_config,
7078 - octeon_dummy_write_config,
7079 + .read = octeon_dummy_read_config,
7080 + .write = octeon_dummy_write_config,
7081 };
7082
7083 static struct resource octeon_dummy_mem_resource = {
7084 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7085 index a2358b4..7cead4f 100644
7086 --- a/arch/mips/sgi-ip27/ip27-nmi.c
7087 +++ b/arch/mips/sgi-ip27/ip27-nmi.c
7088 @@ -187,9 +187,9 @@ void
7089 cont_nmi_dump(void)
7090 {
7091 #ifndef REAL_NMI_SIGNAL
7092 - static atomic_t nmied_cpus = ATOMIC_INIT(0);
7093 + static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7094
7095 - atomic_inc(&nmied_cpus);
7096 + atomic_inc_unchecked(&nmied_cpus);
7097 #endif
7098 /*
7099 * Only allow 1 cpu to proceed
7100 @@ -233,7 +233,7 @@ cont_nmi_dump(void)
7101 udelay(10000);
7102 }
7103 #else
7104 - while (atomic_read(&nmied_cpus) != num_online_cpus());
7105 + while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7106 #endif
7107
7108 /*
7109 diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7110 index a046b30..6799527 100644
7111 --- a/arch/mips/sni/rm200.c
7112 +++ b/arch/mips/sni/rm200.c
7113 @@ -270,7 +270,7 @@ spurious_8259A_irq:
7114 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7115 spurious_irq_mask |= irqmask;
7116 }
7117 - atomic_inc(&irq_err_count);
7118 + atomic_inc_unchecked(&irq_err_count);
7119 /*
7120 * Theoretically we do not have to handle this IRQ,
7121 * but in Linux this does not cause problems and is
7122 diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7123 index 41e873b..34d33a7 100644
7124 --- a/arch/mips/vr41xx/common/icu.c
7125 +++ b/arch/mips/vr41xx/common/icu.c
7126 @@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7127
7128 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7129
7130 - atomic_inc(&irq_err_count);
7131 + atomic_inc_unchecked(&irq_err_count);
7132
7133 return -1;
7134 }
7135 diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7136 index ae0e4ee..e8f0692 100644
7137 --- a/arch/mips/vr41xx/common/irq.c
7138 +++ b/arch/mips/vr41xx/common/irq.c
7139 @@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7140 irq_cascade_t *cascade;
7141
7142 if (irq >= NR_IRQS) {
7143 - atomic_inc(&irq_err_count);
7144 + atomic_inc_unchecked(&irq_err_count);
7145 return;
7146 }
7147
7148 @@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7149 ret = cascade->get_irq(irq);
7150 irq = ret;
7151 if (ret < 0)
7152 - atomic_inc(&irq_err_count);
7153 + atomic_inc_unchecked(&irq_err_count);
7154 else
7155 irq_dispatch(irq);
7156 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7157 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7158 index 967d144..db12197 100644
7159 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7160 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7161 @@ -11,12 +11,14 @@
7162 #ifndef _ASM_PROC_CACHE_H
7163 #define _ASM_PROC_CACHE_H
7164
7165 +#include <linux/const.h>
7166 +
7167 /* L1 cache */
7168
7169 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7170 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7171 -#define L1_CACHE_BYTES 16 /* bytes per entry */
7172 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7173 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7174 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7175
7176 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7177 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7178 index bcb5df2..84fabd2 100644
7179 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7180 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7181 @@ -16,13 +16,15 @@
7182 #ifndef _ASM_PROC_CACHE_H
7183 #define _ASM_PROC_CACHE_H
7184
7185 +#include <linux/const.h>
7186 +
7187 /*
7188 * L1 cache
7189 */
7190 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7191 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7192 -#define L1_CACHE_BYTES 32 /* bytes per entry */
7193 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7194 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7195 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7196
7197 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7198 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7199 index 4ce7a01..449202a 100644
7200 --- a/arch/openrisc/include/asm/cache.h
7201 +++ b/arch/openrisc/include/asm/cache.h
7202 @@ -19,11 +19,13 @@
7203 #ifndef __ASM_OPENRISC_CACHE_H
7204 #define __ASM_OPENRISC_CACHE_H
7205
7206 +#include <linux/const.h>
7207 +
7208 /* FIXME: How can we replace these with values from the CPU...
7209 * they shouldn't be hard-coded!
7210 */
7211
7212 -#define L1_CACHE_BYTES 16
7213 #define L1_CACHE_SHIFT 4
7214 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7215
7216 #endif /* __ASM_OPENRISC_CACHE_H */
7217 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7218 index 226f8ca..9d9b87d 100644
7219 --- a/arch/parisc/include/asm/atomic.h
7220 +++ b/arch/parisc/include/asm/atomic.h
7221 @@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7222 return dec;
7223 }
7224
7225 +#define atomic64_read_unchecked(v) atomic64_read(v)
7226 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7227 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7228 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7229 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7230 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7231 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7232 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7233 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7234 +
7235 #endif /* !CONFIG_64BIT */
7236
7237
7238 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7239 index 47f11c7..3420df2 100644
7240 --- a/arch/parisc/include/asm/cache.h
7241 +++ b/arch/parisc/include/asm/cache.h
7242 @@ -5,6 +5,7 @@
7243 #ifndef __ARCH_PARISC_CACHE_H
7244 #define __ARCH_PARISC_CACHE_H
7245
7246 +#include <linux/const.h>
7247
7248 /*
7249 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7250 @@ -15,13 +16,13 @@
7251 * just ruin performance.
7252 */
7253 #ifdef CONFIG_PA20
7254 -#define L1_CACHE_BYTES 64
7255 #define L1_CACHE_SHIFT 6
7256 #else
7257 -#define L1_CACHE_BYTES 32
7258 #define L1_CACHE_SHIFT 5
7259 #endif
7260
7261 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7262 +
7263 #ifndef __ASSEMBLY__
7264
7265 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7266 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7267 index 3391d06..c23a2cc 100644
7268 --- a/arch/parisc/include/asm/elf.h
7269 +++ b/arch/parisc/include/asm/elf.h
7270 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7271
7272 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7273
7274 +#ifdef CONFIG_PAX_ASLR
7275 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
7276 +
7277 +#define PAX_DELTA_MMAP_LEN 16
7278 +#define PAX_DELTA_STACK_LEN 16
7279 +#endif
7280 +
7281 /* This yields a mask that user programs can use to figure out what
7282 instruction set this CPU supports. This could be done in user space,
7283 but it's not easy, and we've already done it here. */
7284 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7285 index f213f5b..0af3e8e 100644
7286 --- a/arch/parisc/include/asm/pgalloc.h
7287 +++ b/arch/parisc/include/asm/pgalloc.h
7288 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7289 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7290 }
7291
7292 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7293 +{
7294 + pgd_populate(mm, pgd, pmd);
7295 +}
7296 +
7297 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7298 {
7299 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7300 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7301 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7302 #define pmd_free(mm, x) do { } while (0)
7303 #define pgd_populate(mm, pmd, pte) BUG()
7304 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
7305
7306 #endif
7307
7308 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7309 index 22b89d1..ce34230 100644
7310 --- a/arch/parisc/include/asm/pgtable.h
7311 +++ b/arch/parisc/include/asm/pgtable.h
7312 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7313 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7314 #define PAGE_COPY PAGE_EXECREAD
7315 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7316 +
7317 +#ifdef CONFIG_PAX_PAGEEXEC
7318 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7319 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7320 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7321 +#else
7322 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
7323 +# define PAGE_COPY_NOEXEC PAGE_COPY
7324 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
7325 +#endif
7326 +
7327 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7328 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7329 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7330 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7331 index a5cb070..8604ddc 100644
7332 --- a/arch/parisc/include/asm/uaccess.h
7333 +++ b/arch/parisc/include/asm/uaccess.h
7334 @@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7335 const void __user *from,
7336 unsigned long n)
7337 {
7338 - int sz = __compiletime_object_size(to);
7339 + size_t sz = __compiletime_object_size(to);
7340 int ret = -EFAULT;
7341
7342 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7343 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7344 ret = __copy_from_user(to, from, n);
7345 else
7346 copy_from_user_overflow();
7347 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7348 index 50dfafc..b9fc230 100644
7349 --- a/arch/parisc/kernel/module.c
7350 +++ b/arch/parisc/kernel/module.c
7351 @@ -98,16 +98,38 @@
7352
7353 /* three functions to determine where in the module core
7354 * or init pieces the location is */
7355 +static inline int in_init_rx(struct module *me, void *loc)
7356 +{
7357 + return (loc >= me->module_init_rx &&
7358 + loc < (me->module_init_rx + me->init_size_rx));
7359 +}
7360 +
7361 +static inline int in_init_rw(struct module *me, void *loc)
7362 +{
7363 + return (loc >= me->module_init_rw &&
7364 + loc < (me->module_init_rw + me->init_size_rw));
7365 +}
7366 +
7367 static inline int in_init(struct module *me, void *loc)
7368 {
7369 - return (loc >= me->module_init &&
7370 - loc <= (me->module_init + me->init_size));
7371 + return in_init_rx(me, loc) || in_init_rw(me, loc);
7372 +}
7373 +
7374 +static inline int in_core_rx(struct module *me, void *loc)
7375 +{
7376 + return (loc >= me->module_core_rx &&
7377 + loc < (me->module_core_rx + me->core_size_rx));
7378 +}
7379 +
7380 +static inline int in_core_rw(struct module *me, void *loc)
7381 +{
7382 + return (loc >= me->module_core_rw &&
7383 + loc < (me->module_core_rw + me->core_size_rw));
7384 }
7385
7386 static inline int in_core(struct module *me, void *loc)
7387 {
7388 - return (loc >= me->module_core &&
7389 - loc <= (me->module_core + me->core_size));
7390 + return in_core_rx(me, loc) || in_core_rw(me, loc);
7391 }
7392
7393 static inline int in_local(struct module *me, void *loc)
7394 @@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7395 }
7396
7397 /* align things a bit */
7398 - me->core_size = ALIGN(me->core_size, 16);
7399 - me->arch.got_offset = me->core_size;
7400 - me->core_size += gots * sizeof(struct got_entry);
7401 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7402 + me->arch.got_offset = me->core_size_rw;
7403 + me->core_size_rw += gots * sizeof(struct got_entry);
7404
7405 - me->core_size = ALIGN(me->core_size, 16);
7406 - me->arch.fdesc_offset = me->core_size;
7407 - me->core_size += fdescs * sizeof(Elf_Fdesc);
7408 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409 + me->arch.fdesc_offset = me->core_size_rw;
7410 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7411
7412 me->arch.got_max = gots;
7413 me->arch.fdesc_max = fdescs;
7414 @@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7415
7416 BUG_ON(value == 0);
7417
7418 - got = me->module_core + me->arch.got_offset;
7419 + got = me->module_core_rw + me->arch.got_offset;
7420 for (i = 0; got[i].addr; i++)
7421 if (got[i].addr == value)
7422 goto out;
7423 @@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7424 #ifdef CONFIG_64BIT
7425 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7426 {
7427 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7428 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7429
7430 if (!value) {
7431 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7432 @@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433
7434 /* Create new one */
7435 fdesc->addr = value;
7436 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7437 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7438 return (Elf_Addr)fdesc;
7439 }
7440 #endif /* CONFIG_64BIT */
7441 @@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7442
7443 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7444 end = table + sechdrs[me->arch.unwind_section].sh_size;
7445 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7446 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7447
7448 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7449 me->arch.unwind_section, table, end, gp);
7450 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7451 index e1ffea2..46ed66e 100644
7452 --- a/arch/parisc/kernel/sys_parisc.c
7453 +++ b/arch/parisc/kernel/sys_parisc.c
7454 @@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7455 unsigned long task_size = TASK_SIZE;
7456 int do_color_align, last_mmap;
7457 struct vm_unmapped_area_info info;
7458 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7459
7460 if (len > task_size)
7461 return -ENOMEM;
7462 @@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7463 goto found_addr;
7464 }
7465
7466 +#ifdef CONFIG_PAX_RANDMMAP
7467 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7468 +#endif
7469 +
7470 if (addr) {
7471 if (do_color_align && last_mmap)
7472 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7473 @@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7474 info.high_limit = mmap_upper_limit();
7475 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7476 info.align_offset = shared_align_offset(last_mmap, pgoff);
7477 + info.threadstack_offset = offset;
7478 addr = vm_unmapped_area(&info);
7479
7480 found_addr:
7481 @@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7482 unsigned long addr = addr0;
7483 int do_color_align, last_mmap;
7484 struct vm_unmapped_area_info info;
7485 + unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7486
7487 #ifdef CONFIG_64BIT
7488 /* This should only ever run for 32-bit processes. */
7489 @@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7490 }
7491
7492 /* requesting a specific address */
7493 +#ifdef CONFIG_PAX_RANDMMAP
7494 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7495 +#endif
7496 +
7497 if (addr) {
7498 if (do_color_align && last_mmap)
7499 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7500 @@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7501 info.high_limit = mm->mmap_base;
7502 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7503 info.align_offset = shared_align_offset(last_mmap, pgoff);
7504 + info.threadstack_offset = offset;
7505 addr = vm_unmapped_area(&info);
7506 if (!(addr & ~PAGE_MASK))
7507 goto found_addr;
7508 @@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7509 mm->mmap_legacy_base = mmap_legacy_base();
7510 mm->mmap_base = mmap_upper_limit();
7511
7512 +#ifdef CONFIG_PAX_RANDMMAP
7513 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
7514 + mm->mmap_legacy_base += mm->delta_mmap;
7515 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7516 + }
7517 +#endif
7518 +
7519 if (mmap_is_legacy()) {
7520 mm->mmap_base = mm->mmap_legacy_base;
7521 mm->get_unmapped_area = arch_get_unmapped_area;
7522 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7523 index 47ee620..1107387 100644
7524 --- a/arch/parisc/kernel/traps.c
7525 +++ b/arch/parisc/kernel/traps.c
7526 @@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7527
7528 down_read(&current->mm->mmap_sem);
7529 vma = find_vma(current->mm,regs->iaoq[0]);
7530 - if (vma && (regs->iaoq[0] >= vma->vm_start)
7531 - && (vma->vm_flags & VM_EXEC)) {
7532 -
7533 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7534 fault_address = regs->iaoq[0];
7535 fault_space = regs->iasq[0];
7536
7537 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7538 index 3ca9c11..d163ef7 100644
7539 --- a/arch/parisc/mm/fault.c
7540 +++ b/arch/parisc/mm/fault.c
7541 @@ -15,6 +15,7 @@
7542 #include <linux/sched.h>
7543 #include <linux/interrupt.h>
7544 #include <linux/module.h>
7545 +#include <linux/unistd.h>
7546
7547 #include <asm/uaccess.h>
7548 #include <asm/traps.h>
7549 @@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7550 static unsigned long
7551 parisc_acctyp(unsigned long code, unsigned int inst)
7552 {
7553 - if (code == 6 || code == 16)
7554 + if (code == 6 || code == 7 || code == 16)
7555 return VM_EXEC;
7556
7557 switch (inst & 0xf0000000) {
7558 @@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7559 }
7560 #endif
7561
7562 +#ifdef CONFIG_PAX_PAGEEXEC
7563 +/*
7564 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7565 + *
7566 + * returns 1 when task should be killed
7567 + * 2 when rt_sigreturn trampoline was detected
7568 + * 3 when unpatched PLT trampoline was detected
7569 + */
7570 +static int pax_handle_fetch_fault(struct pt_regs *regs)
7571 +{
7572 +
7573 +#ifdef CONFIG_PAX_EMUPLT
7574 + int err;
7575 +
7576 + do { /* PaX: unpatched PLT emulation */
7577 + unsigned int bl, depwi;
7578 +
7579 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7580 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7581 +
7582 + if (err)
7583 + break;
7584 +
7585 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7586 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7587 +
7588 + err = get_user(ldw, (unsigned int *)addr);
7589 + err |= get_user(bv, (unsigned int *)(addr+4));
7590 + err |= get_user(ldw2, (unsigned int *)(addr+8));
7591 +
7592 + if (err)
7593 + break;
7594 +
7595 + if (ldw == 0x0E801096U &&
7596 + bv == 0xEAC0C000U &&
7597 + ldw2 == 0x0E881095U)
7598 + {
7599 + unsigned int resolver, map;
7600 +
7601 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7602 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7603 + if (err)
7604 + break;
7605 +
7606 + regs->gr[20] = instruction_pointer(regs)+8;
7607 + regs->gr[21] = map;
7608 + regs->gr[22] = resolver;
7609 + regs->iaoq[0] = resolver | 3UL;
7610 + regs->iaoq[1] = regs->iaoq[0] + 4;
7611 + return 3;
7612 + }
7613 + }
7614 + } while (0);
7615 +#endif
7616 +
7617 +#ifdef CONFIG_PAX_EMUTRAMP
7618 +
7619 +#ifndef CONFIG_PAX_EMUSIGRT
7620 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7621 + return 1;
7622 +#endif
7623 +
7624 + do { /* PaX: rt_sigreturn emulation */
7625 + unsigned int ldi1, ldi2, bel, nop;
7626 +
7627 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7628 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7629 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7630 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7631 +
7632 + if (err)
7633 + break;
7634 +
7635 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7636 + ldi2 == 0x3414015AU &&
7637 + bel == 0xE4008200U &&
7638 + nop == 0x08000240U)
7639 + {
7640 + regs->gr[25] = (ldi1 & 2) >> 1;
7641 + regs->gr[20] = __NR_rt_sigreturn;
7642 + regs->gr[31] = regs->iaoq[1] + 16;
7643 + regs->sr[0] = regs->iasq[1];
7644 + regs->iaoq[0] = 0x100UL;
7645 + regs->iaoq[1] = regs->iaoq[0] + 4;
7646 + regs->iasq[0] = regs->sr[2];
7647 + regs->iasq[1] = regs->sr[2];
7648 + return 2;
7649 + }
7650 + } while (0);
7651 +#endif
7652 +
7653 + return 1;
7654 +}
7655 +
7656 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7657 +{
7658 + unsigned long i;
7659 +
7660 + printk(KERN_ERR "PAX: bytes at PC: ");
7661 + for (i = 0; i < 5; i++) {
7662 + unsigned int c;
7663 + if (get_user(c, (unsigned int *)pc+i))
7664 + printk(KERN_CONT "???????? ");
7665 + else
7666 + printk(KERN_CONT "%08x ", c);
7667 + }
7668 + printk("\n");
7669 +}
7670 +#endif
7671 +
7672 int fixup_exception(struct pt_regs *regs)
7673 {
7674 const struct exception_table_entry *fix;
7675 @@ -234,8 +345,33 @@ retry:
7676
7677 good_area:
7678
7679 - if ((vma->vm_flags & acc_type) != acc_type)
7680 + if ((vma->vm_flags & acc_type) != acc_type) {
7681 +
7682 +#ifdef CONFIG_PAX_PAGEEXEC
7683 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7684 + (address & ~3UL) == instruction_pointer(regs))
7685 + {
7686 + up_read(&mm->mmap_sem);
7687 + switch (pax_handle_fetch_fault(regs)) {
7688 +
7689 +#ifdef CONFIG_PAX_EMUPLT
7690 + case 3:
7691 + return;
7692 +#endif
7693 +
7694 +#ifdef CONFIG_PAX_EMUTRAMP
7695 + case 2:
7696 + return;
7697 +#endif
7698 +
7699 + }
7700 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7701 + do_group_exit(SIGKILL);
7702 + }
7703 +#endif
7704 +
7705 goto bad_area;
7706 + }
7707
7708 /*
7709 * If for any reason at all we couldn't handle the fault, make
7710 diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7711 index 88eace4..4ba2591 100644
7712 --- a/arch/powerpc/Kconfig
7713 +++ b/arch/powerpc/Kconfig
7714 @@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7715 config KEXEC
7716 bool "kexec system call"
7717 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7718 + depends on !GRKERNSEC_KMEM
7719 help
7720 kexec is a system call that implements the ability to shutdown your
7721 current kernel, and to start another kernel. It is like a reboot
7722 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7723 index 512d278..d31fadd 100644
7724 --- a/arch/powerpc/include/asm/atomic.h
7725 +++ b/arch/powerpc/include/asm/atomic.h
7726 @@ -12,6 +12,11 @@
7727
7728 #define ATOMIC_INIT(i) { (i) }
7729
7730 +#define _ASM_EXTABLE(from, to) \
7731 +" .section __ex_table,\"a\"\n" \
7732 + PPC_LONG" " #from ", " #to"\n" \
7733 +" .previous\n"
7734 +
7735 static __inline__ int atomic_read(const atomic_t *v)
7736 {
7737 int t;
7738 @@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7739 return t;
7740 }
7741
7742 +static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7743 +{
7744 + int t;
7745 +
7746 + __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7747 +
7748 + return t;
7749 +}
7750 +
7751 static __inline__ void atomic_set(atomic_t *v, int i)
7752 {
7753 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7754 }
7755
7756 -#define ATOMIC_OP(op, asm_op) \
7757 -static __inline__ void atomic_##op(int a, atomic_t *v) \
7758 +static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7759 +{
7760 + __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761 +}
7762 +
7763 +#ifdef CONFIG_PAX_REFCOUNT
7764 +#define __REFCOUNT_OP(op) op##o.
7765 +#define __OVERFLOW_PRE \
7766 + " mcrxr cr0\n"
7767 +#define __OVERFLOW_POST \
7768 + " bf 4*cr0+so, 3f\n" \
7769 + "2: .long 0x00c00b00\n" \
7770 + "3:\n"
7771 +#define __OVERFLOW_EXTABLE \
7772 + "\n4:\n"
7773 + _ASM_EXTABLE(2b, 4b)
7774 +#else
7775 +#define __REFCOUNT_OP(op) op
7776 +#define __OVERFLOW_PRE
7777 +#define __OVERFLOW_POST
7778 +#define __OVERFLOW_EXTABLE
7779 +#endif
7780 +
7781 +#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7782 +static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7783 { \
7784 int t; \
7785 \
7786 __asm__ __volatile__( \
7787 -"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7788 +"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7789 + pre_op \
7790 #asm_op " %0,%2,%0\n" \
7791 + post_op \
7792 PPC405_ERR77(0,%3) \
7793 " stwcx. %0,0,%3 \n" \
7794 " bne- 1b\n" \
7795 + extable \
7796 : "=&r" (t), "+m" (v->counter) \
7797 : "r" (a), "r" (&v->counter) \
7798 : "cc"); \
7799 } \
7800
7801 -#define ATOMIC_OP_RETURN(op, asm_op) \
7802 -static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7803 +#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7804 + __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7805 +
7806 +#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7807 +static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7808 { \
7809 int t; \
7810 \
7811 __asm__ __volatile__( \
7812 PPC_ATOMIC_ENTRY_BARRIER \
7813 -"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7814 +"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7815 + pre_op \
7816 #asm_op " %0,%1,%0\n" \
7817 + post_op \
7818 PPC405_ERR77(0,%2) \
7819 " stwcx. %0,0,%2 \n" \
7820 " bne- 1b\n" \
7821 + extable \
7822 PPC_ATOMIC_EXIT_BARRIER \
7823 : "=&r" (t) \
7824 : "r" (a), "r" (&v->counter) \
7825 @@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7826 return t; \
7827 }
7828
7829 +#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7830 + __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7831 +
7832 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7833
7834 ATOMIC_OPS(add, add)
7835 @@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7836
7837 #undef ATOMIC_OPS
7838 #undef ATOMIC_OP_RETURN
7839 +#undef __ATOMIC_OP_RETURN
7840 #undef ATOMIC_OP
7841 +#undef __ATOMIC_OP
7842
7843 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7844
7845 -static __inline__ void atomic_inc(atomic_t *v)
7846 -{
7847 - int t;
7848 +/*
7849 + * atomic_inc - increment atomic variable
7850 + * @v: pointer of type atomic_t
7851 + *
7852 + * Automatically increments @v by 1
7853 + */
7854 +#define atomic_inc(v) atomic_add(1, (v))
7855 +#define atomic_inc_return(v) atomic_add_return(1, (v))
7856
7857 - __asm__ __volatile__(
7858 -"1: lwarx %0,0,%2 # atomic_inc\n\
7859 - addic %0,%0,1\n"
7860 - PPC405_ERR77(0,%2)
7861 -" stwcx. %0,0,%2 \n\
7862 - bne- 1b"
7863 - : "=&r" (t), "+m" (v->counter)
7864 - : "r" (&v->counter)
7865 - : "cc", "xer");
7866 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7867 +{
7868 + atomic_add_unchecked(1, v);
7869 }
7870
7871 -static __inline__ int atomic_inc_return(atomic_t *v)
7872 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7873 {
7874 - int t;
7875 -
7876 - __asm__ __volatile__(
7877 - PPC_ATOMIC_ENTRY_BARRIER
7878 -"1: lwarx %0,0,%1 # atomic_inc_return\n\
7879 - addic %0,%0,1\n"
7880 - PPC405_ERR77(0,%1)
7881 -" stwcx. %0,0,%1 \n\
7882 - bne- 1b"
7883 - PPC_ATOMIC_EXIT_BARRIER
7884 - : "=&r" (t)
7885 - : "r" (&v->counter)
7886 - : "cc", "xer", "memory");
7887 -
7888 - return t;
7889 + return atomic_add_return_unchecked(1, v);
7890 }
7891
7892 /*
7893 @@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7894 */
7895 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7896
7897 -static __inline__ void atomic_dec(atomic_t *v)
7898 +static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7899 {
7900 - int t;
7901 -
7902 - __asm__ __volatile__(
7903 -"1: lwarx %0,0,%2 # atomic_dec\n\
7904 - addic %0,%0,-1\n"
7905 - PPC405_ERR77(0,%2)\
7906 -" stwcx. %0,0,%2\n\
7907 - bne- 1b"
7908 - : "=&r" (t), "+m" (v->counter)
7909 - : "r" (&v->counter)
7910 - : "cc", "xer");
7911 + return atomic_add_return_unchecked(1, v) == 0;
7912 }
7913
7914 -static __inline__ int atomic_dec_return(atomic_t *v)
7915 +/*
7916 + * atomic_dec - decrement atomic variable
7917 + * @v: pointer of type atomic_t
7918 + *
7919 + * Atomically decrements @v by 1
7920 + */
7921 +#define atomic_dec(v) atomic_sub(1, (v))
7922 +#define atomic_dec_return(v) atomic_sub_return(1, (v))
7923 +
7924 +static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7925 {
7926 - int t;
7927 -
7928 - __asm__ __volatile__(
7929 - PPC_ATOMIC_ENTRY_BARRIER
7930 -"1: lwarx %0,0,%1 # atomic_dec_return\n\
7931 - addic %0,%0,-1\n"
7932 - PPC405_ERR77(0,%1)
7933 -" stwcx. %0,0,%1\n\
7934 - bne- 1b"
7935 - PPC_ATOMIC_EXIT_BARRIER
7936 - : "=&r" (t)
7937 - : "r" (&v->counter)
7938 - : "cc", "xer", "memory");
7939 -
7940 - return t;
7941 + atomic_sub_unchecked(1, v);
7942 }
7943
7944 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7945 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7946
7947 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7948 +{
7949 + return cmpxchg(&(v->counter), old, new);
7950 +}
7951 +
7952 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7953 +{
7954 + return xchg(&(v->counter), new);
7955 +}
7956 +
7957 /**
7958 * __atomic_add_unless - add unless the number is a given value
7959 * @v: pointer of type atomic_t
7960 @@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7961 PPC_ATOMIC_ENTRY_BARRIER
7962 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7963 cmpw 0,%0,%3 \n\
7964 - beq- 2f \n\
7965 - add %0,%2,%0 \n"
7966 + beq- 2f \n"
7967 +
7968 +#ifdef CONFIG_PAX_REFCOUNT
7969 +" mcrxr cr0\n"
7970 +" addo. %0,%2,%0\n"
7971 +" bf 4*cr0+so, 4f\n"
7972 +"3:.long " "0x00c00b00""\n"
7973 +"4:\n"
7974 +#else
7975 + "add %0,%2,%0 \n"
7976 +#endif
7977 +
7978 PPC405_ERR77(0,%2)
7979 " stwcx. %0,0,%1 \n\
7980 bne- 1b \n"
7981 +"5:"
7982 +
7983 +#ifdef CONFIG_PAX_REFCOUNT
7984 + _ASM_EXTABLE(3b, 5b)
7985 +#endif
7986 +
7987 PPC_ATOMIC_EXIT_BARRIER
7988 " subf %0,%2,%0 \n\
7989 2:"
7990 @@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7991 }
7992 #define atomic_dec_if_positive atomic_dec_if_positive
7993
7994 +#define smp_mb__before_atomic_dec() smp_mb()
7995 +#define smp_mb__after_atomic_dec() smp_mb()
7996 +#define smp_mb__before_atomic_inc() smp_mb()
7997 +#define smp_mb__after_atomic_inc() smp_mb()
7998 +
7999 #ifdef __powerpc64__
8000
8001 #define ATOMIC64_INIT(i) { (i) }
8002 @@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8003 return t;
8004 }
8005
8006 +static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8007 +{
8008 + long t;
8009 +
8010 + __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8011 +
8012 + return t;
8013 +}
8014 +
8015 static __inline__ void atomic64_set(atomic64_t *v, long i)
8016 {
8017 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8018 }
8019
8020 -#define ATOMIC64_OP(op, asm_op) \
8021 -static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8022 +static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8023 +{
8024 + __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025 +}
8026 +
8027 +#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8028 +static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8029 { \
8030 long t; \
8031 \
8032 __asm__ __volatile__( \
8033 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8034 + pre_op \
8035 #asm_op " %0,%2,%0\n" \
8036 + post_op \
8037 " stdcx. %0,0,%3 \n" \
8038 " bne- 1b\n" \
8039 + extable \
8040 : "=&r" (t), "+m" (v->counter) \
8041 : "r" (a), "r" (&v->counter) \
8042 : "cc"); \
8043 }
8044
8045 -#define ATOMIC64_OP_RETURN(op, asm_op) \
8046 -static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8047 +#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8048 + __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8049 +
8050 +#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8051 +static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8052 { \
8053 long t; \
8054 \
8055 __asm__ __volatile__( \
8056 PPC_ATOMIC_ENTRY_BARRIER \
8057 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8058 + pre_op \
8059 #asm_op " %0,%1,%0\n" \
8060 + post_op \
8061 " stdcx. %0,0,%2 \n" \
8062 " bne- 1b\n" \
8063 + extable \
8064 PPC_ATOMIC_EXIT_BARRIER \
8065 : "=&r" (t) \
8066 : "r" (a), "r" (&v->counter) \
8067 @@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8068 return t; \
8069 }
8070
8071 +#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8072 + __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8073 +
8074 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8075
8076 ATOMIC64_OPS(add, add)
8077 @@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8078
8079 #undef ATOMIC64_OPS
8080 #undef ATOMIC64_OP_RETURN
8081 +#undef __ATOMIC64_OP_RETURN
8082 #undef ATOMIC64_OP
8083 +#undef __ATOMIC64_OP
8084 +#undef __OVERFLOW_EXTABLE
8085 +#undef __OVERFLOW_POST
8086 +#undef __OVERFLOW_PRE
8087 +#undef __REFCOUNT_OP
8088
8089 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8090
8091 -static __inline__ void atomic64_inc(atomic64_t *v)
8092 -{
8093 - long t;
8094 +/*
8095 + * atomic64_inc - increment atomic variable
8096 + * @v: pointer of type atomic64_t
8097 + *
8098 + * Automatically increments @v by 1
8099 + */
8100 +#define atomic64_inc(v) atomic64_add(1, (v))
8101 +#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8102
8103 - __asm__ __volatile__(
8104 -"1: ldarx %0,0,%2 # atomic64_inc\n\
8105 - addic %0,%0,1\n\
8106 - stdcx. %0,0,%2 \n\
8107 - bne- 1b"
8108 - : "=&r" (t), "+m" (v->counter)
8109 - : "r" (&v->counter)
8110 - : "cc", "xer");
8111 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8112 +{
8113 + atomic64_add_unchecked(1, v);
8114 }
8115
8116 -static __inline__ long atomic64_inc_return(atomic64_t *v)
8117 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8118 {
8119 - long t;
8120 -
8121 - __asm__ __volatile__(
8122 - PPC_ATOMIC_ENTRY_BARRIER
8123 -"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8124 - addic %0,%0,1\n\
8125 - stdcx. %0,0,%1 \n\
8126 - bne- 1b"
8127 - PPC_ATOMIC_EXIT_BARRIER
8128 - : "=&r" (t)
8129 - : "r" (&v->counter)
8130 - : "cc", "xer", "memory");
8131 -
8132 - return t;
8133 + return atomic64_add_return_unchecked(1, v);
8134 }
8135
8136 /*
8137 @@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8138 */
8139 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8140
8141 -static __inline__ void atomic64_dec(atomic64_t *v)
8142 +/*
8143 + * atomic64_dec - decrement atomic variable
8144 + * @v: pointer of type atomic64_t
8145 + *
8146 + * Atomically decrements @v by 1
8147 + */
8148 +#define atomic64_dec(v) atomic64_sub(1, (v))
8149 +#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8150 +
8151 +static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8152 {
8153 - long t;
8154 -
8155 - __asm__ __volatile__(
8156 -"1: ldarx %0,0,%2 # atomic64_dec\n\
8157 - addic %0,%0,-1\n\
8158 - stdcx. %0,0,%2\n\
8159 - bne- 1b"
8160 - : "=&r" (t), "+m" (v->counter)
8161 - : "r" (&v->counter)
8162 - : "cc", "xer");
8163 -}
8164 -
8165 -static __inline__ long atomic64_dec_return(atomic64_t *v)
8166 -{
8167 - long t;
8168 -
8169 - __asm__ __volatile__(
8170 - PPC_ATOMIC_ENTRY_BARRIER
8171 -"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8172 - addic %0,%0,-1\n\
8173 - stdcx. %0,0,%1\n\
8174 - bne- 1b"
8175 - PPC_ATOMIC_EXIT_BARRIER
8176 - : "=&r" (t)
8177 - : "r" (&v->counter)
8178 - : "cc", "xer", "memory");
8179 -
8180 - return t;
8181 + atomic64_sub_unchecked(1, v);
8182 }
8183
8184 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8185 @@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8186 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8187 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8188
8189 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8190 +{
8191 + return cmpxchg(&(v->counter), old, new);
8192 +}
8193 +
8194 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8195 +{
8196 + return xchg(&(v->counter), new);
8197 +}
8198 +
8199 /**
8200 * atomic64_add_unless - add unless the number is a given value
8201 * @v: pointer of type atomic64_t
8202 @@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8203
8204 __asm__ __volatile__ (
8205 PPC_ATOMIC_ENTRY_BARRIER
8206 -"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8207 +"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8208 cmpd 0,%0,%3 \n\
8209 - beq- 2f \n\
8210 - add %0,%2,%0 \n"
8211 + beq- 2f \n"
8212 +
8213 +#ifdef CONFIG_PAX_REFCOUNT
8214 +" mcrxr cr0\n"
8215 +" addo. %0,%2,%0\n"
8216 +" bf 4*cr0+so, 4f\n"
8217 +"3:.long " "0x00c00b00""\n"
8218 +"4:\n"
8219 +#else
8220 + "add %0,%2,%0 \n"
8221 +#endif
8222 +
8223 " stdcx. %0,0,%1 \n\
8224 bne- 1b \n"
8225 PPC_ATOMIC_EXIT_BARRIER
8226 +"5:"
8227 +
8228 +#ifdef CONFIG_PAX_REFCOUNT
8229 + _ASM_EXTABLE(3b, 5b)
8230 +#endif
8231 +
8232 " subf %0,%2,%0 \n\
8233 2:"
8234 : "=&r" (t)
8235 diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8236 index bab79a1..4a3eabc 100644
8237 --- a/arch/powerpc/include/asm/barrier.h
8238 +++ b/arch/powerpc/include/asm/barrier.h
8239 @@ -73,7 +73,7 @@
8240 do { \
8241 compiletime_assert_atomic_type(*p); \
8242 __lwsync(); \
8243 - ACCESS_ONCE(*p) = (v); \
8244 + ACCESS_ONCE_RW(*p) = (v); \
8245 } while (0)
8246
8247 #define smp_load_acquire(p) \
8248 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8249 index 34a05a1..a1f2c67 100644
8250 --- a/arch/powerpc/include/asm/cache.h
8251 +++ b/arch/powerpc/include/asm/cache.h
8252 @@ -4,6 +4,7 @@
8253 #ifdef __KERNEL__
8254
8255 #include <asm/reg.h>
8256 +#include <linux/const.h>
8257
8258 /* bytes per L1 cache line */
8259 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8260 @@ -23,7 +24,7 @@
8261 #define L1_CACHE_SHIFT 7
8262 #endif
8263
8264 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8265 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8266
8267 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8268
8269 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8270 index 888d8f3..66f581c 100644
8271 --- a/arch/powerpc/include/asm/elf.h
8272 +++ b/arch/powerpc/include/asm/elf.h
8273 @@ -28,8 +28,19 @@
8274 the loader. We need to make sure that it is out of the way of the program
8275 that it will "exec", and that there is sufficient room for the brk. */
8276
8277 -extern unsigned long randomize_et_dyn(unsigned long base);
8278 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8279 +#define ELF_ET_DYN_BASE (0x20000000)
8280 +
8281 +#ifdef CONFIG_PAX_ASLR
8282 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8283 +
8284 +#ifdef __powerpc64__
8285 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8286 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8287 +#else
8288 +#define PAX_DELTA_MMAP_LEN 15
8289 +#define PAX_DELTA_STACK_LEN 15
8290 +#endif
8291 +#endif
8292
8293 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8294
8295 @@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8296 (0x7ff >> (PAGE_SHIFT - 12)) : \
8297 (0x3ffff >> (PAGE_SHIFT - 12)))
8298
8299 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8300 -#define arch_randomize_brk arch_randomize_brk
8301 -
8302 -
8303 #ifdef CONFIG_SPU_BASE
8304 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8305 #define NT_SPU 1
8306 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8307 index 8196e9c..d83a9f3 100644
8308 --- a/arch/powerpc/include/asm/exec.h
8309 +++ b/arch/powerpc/include/asm/exec.h
8310 @@ -4,6 +4,6 @@
8311 #ifndef _ASM_POWERPC_EXEC_H
8312 #define _ASM_POWERPC_EXEC_H
8313
8314 -extern unsigned long arch_align_stack(unsigned long sp);
8315 +#define arch_align_stack(x) ((x) & ~0xfUL)
8316
8317 #endif /* _ASM_POWERPC_EXEC_H */
8318 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8319 index 5acabbd..7ea14fa 100644
8320 --- a/arch/powerpc/include/asm/kmap_types.h
8321 +++ b/arch/powerpc/include/asm/kmap_types.h
8322 @@ -10,7 +10,7 @@
8323 * 2 of the License, or (at your option) any later version.
8324 */
8325
8326 -#define KM_TYPE_NR 16
8327 +#define KM_TYPE_NR 17
8328
8329 #endif /* __KERNEL__ */
8330 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8331 diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8332 index b8da913..c02b593 100644
8333 --- a/arch/powerpc/include/asm/local.h
8334 +++ b/arch/powerpc/include/asm/local.h
8335 @@ -9,21 +9,65 @@ typedef struct
8336 atomic_long_t a;
8337 } local_t;
8338
8339 +typedef struct
8340 +{
8341 + atomic_long_unchecked_t a;
8342 +} local_unchecked_t;
8343 +
8344 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8345
8346 #define local_read(l) atomic_long_read(&(l)->a)
8347 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8348 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8349 +#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8350
8351 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8352 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8353 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8354 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8355 #define local_inc(l) atomic_long_inc(&(l)->a)
8356 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8357 #define local_dec(l) atomic_long_dec(&(l)->a)
8358 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8359
8360 static __inline__ long local_add_return(long a, local_t *l)
8361 {
8362 long t;
8363
8364 __asm__ __volatile__(
8365 +"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8366 +
8367 +#ifdef CONFIG_PAX_REFCOUNT
8368 +" mcrxr cr0\n"
8369 +" addo. %0,%1,%0\n"
8370 +" bf 4*cr0+so, 3f\n"
8371 +"2:.long " "0x00c00b00""\n"
8372 +#else
8373 +" add %0,%1,%0\n"
8374 +#endif
8375 +
8376 +"3:\n"
8377 + PPC405_ERR77(0,%2)
8378 + PPC_STLCX "%0,0,%2 \n\
8379 + bne- 1b"
8380 +
8381 +#ifdef CONFIG_PAX_REFCOUNT
8382 +"\n4:\n"
8383 + _ASM_EXTABLE(2b, 4b)
8384 +#endif
8385 +
8386 + : "=&r" (t)
8387 + : "r" (a), "r" (&(l->a.counter))
8388 + : "cc", "memory");
8389 +
8390 + return t;
8391 +}
8392 +
8393 +static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8394 +{
8395 + long t;
8396 +
8397 + __asm__ __volatile__(
8398 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8399 add %0,%1,%0\n"
8400 PPC405_ERR77(0,%2)
8401 @@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8402
8403 #define local_cmpxchg(l, o, n) \
8404 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8405 +#define local_cmpxchg_unchecked(l, o, n) \
8406 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
8407 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8408
8409 /**
8410 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8411 index 8565c25..2865190 100644
8412 --- a/arch/powerpc/include/asm/mman.h
8413 +++ b/arch/powerpc/include/asm/mman.h
8414 @@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8415 }
8416 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8417
8418 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8419 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8420 {
8421 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8422 }
8423 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8424 index 26fe1ae..987ffc5 100644
8425 --- a/arch/powerpc/include/asm/page.h
8426 +++ b/arch/powerpc/include/asm/page.h
8427 @@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8428 * and needs to be executable. This means the whole heap ends
8429 * up being executable.
8430 */
8431 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8432 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433 +#define VM_DATA_DEFAULT_FLAGS32 \
8434 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8435 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8436
8437 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8438 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8439 @@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8440 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8441 #endif
8442
8443 +#define ktla_ktva(addr) (addr)
8444 +#define ktva_ktla(addr) (addr)
8445 +
8446 #ifndef CONFIG_PPC_BOOK3S_64
8447 /*
8448 * Use the top bit of the higher-level page table entries to indicate whether
8449 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8450 index d908a46..3753f71 100644
8451 --- a/arch/powerpc/include/asm/page_64.h
8452 +++ b/arch/powerpc/include/asm/page_64.h
8453 @@ -172,15 +172,18 @@ do { \
8454 * stack by default, so in the absence of a PT_GNU_STACK program header
8455 * we turn execute permission off.
8456 */
8457 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8458 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8459 +#define VM_STACK_DEFAULT_FLAGS32 \
8460 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8461 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8462
8463 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8465
8466 +#ifndef CONFIG_PAX_PAGEEXEC
8467 #define VM_STACK_DEFAULT_FLAGS \
8468 (is_32bit_task() ? \
8469 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8470 +#endif
8471
8472 #include <asm-generic/getorder.h>
8473
8474 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8475 index 4b0be20..c15a27d 100644
8476 --- a/arch/powerpc/include/asm/pgalloc-64.h
8477 +++ b/arch/powerpc/include/asm/pgalloc-64.h
8478 @@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8479 #ifndef CONFIG_PPC_64K_PAGES
8480
8481 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8482 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8483
8484 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8485 {
8486 @@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8487 pud_set(pud, (unsigned long)pmd);
8488 }
8489
8490 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8491 +{
8492 + pud_populate(mm, pud, pmd);
8493 +}
8494 +
8495 #define pmd_populate(mm, pmd, pte_page) \
8496 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8497 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8498 @@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8499 #endif
8500
8501 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8502 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8503
8504 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8505 pte_t *pte)
8506 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8507 index 316f9a5..ba05c77 100644
8508 --- a/arch/powerpc/include/asm/pgtable.h
8509 +++ b/arch/powerpc/include/asm/pgtable.h
8510 @@ -2,6 +2,7 @@
8511 #define _ASM_POWERPC_PGTABLE_H
8512 #ifdef __KERNEL__
8513
8514 +#include <linux/const.h>
8515 #ifndef __ASSEMBLY__
8516 #include <linux/mmdebug.h>
8517 #include <linux/mmzone.h>
8518 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8519 index 4aad413..85d86bf 100644
8520 --- a/arch/powerpc/include/asm/pte-hash32.h
8521 +++ b/arch/powerpc/include/asm/pte-hash32.h
8522 @@ -21,6 +21,7 @@
8523 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8524 #define _PAGE_USER 0x004 /* usermode access allowed */
8525 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8526 +#define _PAGE_EXEC _PAGE_GUARDED
8527 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8528 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8529 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8530 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8531 index a68ee15..552d213 100644
8532 --- a/arch/powerpc/include/asm/reg.h
8533 +++ b/arch/powerpc/include/asm/reg.h
8534 @@ -253,6 +253,7 @@
8535 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8536 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8537 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8538 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8539 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8540 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8541 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8542 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8543 index 5a6614a..d89995d1 100644
8544 --- a/arch/powerpc/include/asm/smp.h
8545 +++ b/arch/powerpc/include/asm/smp.h
8546 @@ -51,7 +51,7 @@ struct smp_ops_t {
8547 int (*cpu_disable)(void);
8548 void (*cpu_die)(unsigned int nr);
8549 int (*cpu_bootable)(unsigned int nr);
8550 -};
8551 +} __no_const;
8552
8553 extern void smp_send_debugger_break(void);
8554 extern void start_secondary_resume(void);
8555 diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8556 index 4dbe072..b803275 100644
8557 --- a/arch/powerpc/include/asm/spinlock.h
8558 +++ b/arch/powerpc/include/asm/spinlock.h
8559 @@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8560 __asm__ __volatile__(
8561 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8562 __DO_SIGN_EXTEND
8563 -" addic. %0,%0,1\n\
8564 - ble- 2f\n"
8565 +
8566 +#ifdef CONFIG_PAX_REFCOUNT
8567 +" mcrxr cr0\n"
8568 +" addico. %0,%0,1\n"
8569 +" bf 4*cr0+so, 3f\n"
8570 +"2:.long " "0x00c00b00""\n"
8571 +#else
8572 +" addic. %0,%0,1\n"
8573 +#endif
8574 +
8575 +"3:\n"
8576 + "ble- 4f\n"
8577 PPC405_ERR77(0,%1)
8578 " stwcx. %0,0,%1\n\
8579 bne- 1b\n"
8580 PPC_ACQUIRE_BARRIER
8581 -"2:" : "=&r" (tmp)
8582 +"4:"
8583 +
8584 +#ifdef CONFIG_PAX_REFCOUNT
8585 + _ASM_EXTABLE(2b,4b)
8586 +#endif
8587 +
8588 + : "=&r" (tmp)
8589 : "r" (&rw->lock)
8590 : "cr0", "xer", "memory");
8591
8592 @@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8593 __asm__ __volatile__(
8594 "# read_unlock\n\t"
8595 PPC_RELEASE_BARRIER
8596 -"1: lwarx %0,0,%1\n\
8597 - addic %0,%0,-1\n"
8598 +"1: lwarx %0,0,%1\n"
8599 +
8600 +#ifdef CONFIG_PAX_REFCOUNT
8601 +" mcrxr cr0\n"
8602 +" addico. %0,%0,-1\n"
8603 +" bf 4*cr0+so, 3f\n"
8604 +"2:.long " "0x00c00b00""\n"
8605 +#else
8606 +" addic. %0,%0,-1\n"
8607 +#endif
8608 +
8609 +"3:\n"
8610 PPC405_ERR77(0,%1)
8611 " stwcx. %0,0,%1\n\
8612 bne- 1b"
8613 +
8614 +#ifdef CONFIG_PAX_REFCOUNT
8615 +"\n4:\n"
8616 + _ASM_EXTABLE(2b, 4b)
8617 +#endif
8618 +
8619 : "=&r"(tmp)
8620 : "r"(&rw->lock)
8621 : "cr0", "xer", "memory");
8622 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8623 index b034ecd..af7e31f 100644
8624 --- a/arch/powerpc/include/asm/thread_info.h
8625 +++ b/arch/powerpc/include/asm/thread_info.h
8626 @@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8627 #if defined(CONFIG_PPC64)
8628 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8629 #endif
8630 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8631 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8632
8633 /* as above, but as bit values */
8634 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8635 @@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8636 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8637 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8638 #define _TIF_NOHZ (1<<TIF_NOHZ)
8639 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8640 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8641 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8642 - _TIF_NOHZ)
8643 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
8644
8645 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8646 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8647 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8648 index 9485b43..3bd3c16 100644
8649 --- a/arch/powerpc/include/asm/uaccess.h
8650 +++ b/arch/powerpc/include/asm/uaccess.h
8651 @@ -58,6 +58,7 @@
8652
8653 #endif
8654
8655 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8656 #define access_ok(type, addr, size) \
8657 (__chk_user_ptr(addr), \
8658 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8659 @@ -318,52 +319,6 @@ do { \
8660 extern unsigned long __copy_tofrom_user(void __user *to,
8661 const void __user *from, unsigned long size);
8662
8663 -#ifndef __powerpc64__
8664 -
8665 -static inline unsigned long copy_from_user(void *to,
8666 - const void __user *from, unsigned long n)
8667 -{
8668 - unsigned long over;
8669 -
8670 - if (access_ok(VERIFY_READ, from, n))
8671 - return __copy_tofrom_user((__force void __user *)to, from, n);
8672 - if ((unsigned long)from < TASK_SIZE) {
8673 - over = (unsigned long)from + n - TASK_SIZE;
8674 - return __copy_tofrom_user((__force void __user *)to, from,
8675 - n - over) + over;
8676 - }
8677 - return n;
8678 -}
8679 -
8680 -static inline unsigned long copy_to_user(void __user *to,
8681 - const void *from, unsigned long n)
8682 -{
8683 - unsigned long over;
8684 -
8685 - if (access_ok(VERIFY_WRITE, to, n))
8686 - return __copy_tofrom_user(to, (__force void __user *)from, n);
8687 - if ((unsigned long)to < TASK_SIZE) {
8688 - over = (unsigned long)to + n - TASK_SIZE;
8689 - return __copy_tofrom_user(to, (__force void __user *)from,
8690 - n - over) + over;
8691 - }
8692 - return n;
8693 -}
8694 -
8695 -#else /* __powerpc64__ */
8696 -
8697 -#define __copy_in_user(to, from, size) \
8698 - __copy_tofrom_user((to), (from), (size))
8699 -
8700 -extern unsigned long copy_from_user(void *to, const void __user *from,
8701 - unsigned long n);
8702 -extern unsigned long copy_to_user(void __user *to, const void *from,
8703 - unsigned long n);
8704 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
8705 - unsigned long n);
8706 -
8707 -#endif /* __powerpc64__ */
8708 -
8709 static inline unsigned long __copy_from_user_inatomic(void *to,
8710 const void __user *from, unsigned long n)
8711 {
8712 @@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8713 if (ret == 0)
8714 return 0;
8715 }
8716 +
8717 + if (!__builtin_constant_p(n))
8718 + check_object_size(to, n, false);
8719 +
8720 return __copy_tofrom_user((__force void __user *)to, from, n);
8721 }
8722
8723 @@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8724 if (ret == 0)
8725 return 0;
8726 }
8727 +
8728 + if (!__builtin_constant_p(n))
8729 + check_object_size(from, n, true);
8730 +
8731 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8732 }
8733
8734 @@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8735 return __copy_to_user_inatomic(to, from, size);
8736 }
8737
8738 +#ifndef __powerpc64__
8739 +
8740 +static inline unsigned long __must_check copy_from_user(void *to,
8741 + const void __user *from, unsigned long n)
8742 +{
8743 + unsigned long over;
8744 +
8745 + if ((long)n < 0)
8746 + return n;
8747 +
8748 + if (access_ok(VERIFY_READ, from, n)) {
8749 + if (!__builtin_constant_p(n))
8750 + check_object_size(to, n, false);
8751 + return __copy_tofrom_user((__force void __user *)to, from, n);
8752 + }
8753 + if ((unsigned long)from < TASK_SIZE) {
8754 + over = (unsigned long)from + n - TASK_SIZE;
8755 + if (!__builtin_constant_p(n - over))
8756 + check_object_size(to, n - over, false);
8757 + return __copy_tofrom_user((__force void __user *)to, from,
8758 + n - over) + over;
8759 + }
8760 + return n;
8761 +}
8762 +
8763 +static inline unsigned long __must_check copy_to_user(void __user *to,
8764 + const void *from, unsigned long n)
8765 +{
8766 + unsigned long over;
8767 +
8768 + if ((long)n < 0)
8769 + return n;
8770 +
8771 + if (access_ok(VERIFY_WRITE, to, n)) {
8772 + if (!__builtin_constant_p(n))
8773 + check_object_size(from, n, true);
8774 + return __copy_tofrom_user(to, (__force void __user *)from, n);
8775 + }
8776 + if ((unsigned long)to < TASK_SIZE) {
8777 + over = (unsigned long)to + n - TASK_SIZE;
8778 + if (!__builtin_constant_p(n))
8779 + check_object_size(from, n - over, true);
8780 + return __copy_tofrom_user(to, (__force void __user *)from,
8781 + n - over) + over;
8782 + }
8783 + return n;
8784 +}
8785 +
8786 +#else /* __powerpc64__ */
8787 +
8788 +#define __copy_in_user(to, from, size) \
8789 + __copy_tofrom_user((to), (from), (size))
8790 +
8791 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8792 +{
8793 + if ((long)n < 0 || n > INT_MAX)
8794 + return n;
8795 +
8796 + if (!__builtin_constant_p(n))
8797 + check_object_size(to, n, false);
8798 +
8799 + if (likely(access_ok(VERIFY_READ, from, n)))
8800 + n = __copy_from_user(to, from, n);
8801 + else
8802 + memset(to, 0, n);
8803 + return n;
8804 +}
8805 +
8806 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8807 +{
8808 + if ((long)n < 0 || n > INT_MAX)
8809 + return n;
8810 +
8811 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
8812 + if (!__builtin_constant_p(n))
8813 + check_object_size(from, n, true);
8814 + n = __copy_to_user(to, from, n);
8815 + }
8816 + return n;
8817 +}
8818 +
8819 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
8820 + unsigned long n);
8821 +
8822 +#endif /* __powerpc64__ */
8823 +
8824 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8825
8826 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8827 diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8828 index 502cf69..822e63b 100644
8829 --- a/arch/powerpc/kernel/Makefile
8830 +++ b/arch/powerpc/kernel/Makefile
8831 @@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8832 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8833 endif
8834
8835 +CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8836 +
8837 obj-y := cputable.o ptrace.o syscalls.o \
8838 irq.o align.o signal_32.o pmc.o vdso.o \
8839 process.o systbl.o idle.o \
8840 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8841 index 3e68d1c..72a5ee6 100644
8842 --- a/arch/powerpc/kernel/exceptions-64e.S
8843 +++ b/arch/powerpc/kernel/exceptions-64e.S
8844 @@ -1010,6 +1010,7 @@ storage_fault_common:
8845 std r14,_DAR(r1)
8846 std r15,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848 + bl save_nvgprs
8849 mr r4,r14
8850 mr r5,r15
8851 ld r14,PACA_EXGEN+EX_R14(r13)
8852 @@ -1018,8 +1019,7 @@ storage_fault_common:
8853 cmpdi r3,0
8854 bne- 1f
8855 b ret_from_except_lite
8856 -1: bl save_nvgprs
8857 - mr r5,r3
8858 +1: mr r5,r3
8859 addi r3,r1,STACK_FRAME_OVERHEAD
8860 ld r4,_DAR(r1)
8861 bl bad_page_fault
8862 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8863 index 72e783e..fe058e2 100644
8864 --- a/arch/powerpc/kernel/exceptions-64s.S
8865 +++ b/arch/powerpc/kernel/exceptions-64s.S
8866 @@ -1588,10 +1588,10 @@ handle_page_fault:
8867 11: ld r4,_DAR(r1)
8868 ld r5,_DSISR(r1)
8869 addi r3,r1,STACK_FRAME_OVERHEAD
8870 + bl save_nvgprs
8871 bl do_page_fault
8872 cmpdi r3,0
8873 beq+ 12f
8874 - bl save_nvgprs
8875 mr r5,r3
8876 addi r3,r1,STACK_FRAME_OVERHEAD
8877 lwz r4,_DAR(r1)
8878 diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8879 index c143835..5a9697f 100644
8880 --- a/arch/powerpc/kernel/irq.c
8881 +++ b/arch/powerpc/kernel/irq.c
8882 @@ -461,6 +461,8 @@ void migrate_irqs(void)
8883 }
8884 #endif
8885
8886 +extern void gr_handle_kernel_exploit(void);
8887 +
8888 static inline void check_stack_overflow(void)
8889 {
8890 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8891 @@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8892 pr_err("do_IRQ: stack overflow: %ld\n",
8893 sp - sizeof(struct thread_info));
8894 dump_stack();
8895 + gr_handle_kernel_exploit();
8896 }
8897 #endif
8898 }
8899 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8900 index c94d2e0..992a9ce 100644
8901 --- a/arch/powerpc/kernel/module_32.c
8902 +++ b/arch/powerpc/kernel/module_32.c
8903 @@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8904 me->arch.core_plt_section = i;
8905 }
8906 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8907 - pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8908 + pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8909 return -ENOEXEC;
8910 }
8911
8912 @@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8913
8914 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8915 /* Init, or core PLT? */
8916 - if (location >= mod->module_core
8917 - && location < mod->module_core + mod->core_size)
8918 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8919 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8920 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8921 - else
8922 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8923 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8924 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8925 + else {
8926 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8927 + return ~0UL;
8928 + }
8929
8930 /* Find this entry, or if that fails, the next avail. entry */
8931 while (entry->jump[0]) {
8932 @@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8933 }
8934 #ifdef CONFIG_DYNAMIC_FTRACE
8935 module->arch.tramp =
8936 - do_plt_call(module->module_core,
8937 + do_plt_call(module->module_core_rx,
8938 (unsigned long)ftrace_caller,
8939 sechdrs, module);
8940 #endif
8941 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8942 index 923cd2d..ae782a9 100644
8943 --- a/arch/powerpc/kernel/process.c
8944 +++ b/arch/powerpc/kernel/process.c
8945 @@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8946 * Lookup NIP late so we have the best change of getting the
8947 * above info out without failing
8948 */
8949 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8950 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8951 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8952 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8953 #endif
8954 show_stack(current, (unsigned long *) regs->gpr[1]);
8955 if (!user_mode(regs))
8956 @@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8957 newsp = stack[0];
8958 ip = stack[STACK_FRAME_LR_SAVE];
8959 if (!firstframe || ip != lr) {
8960 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8961 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8962 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8963 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8964 - printk(" (%pS)",
8965 + printk(" (%pA)",
8966 (void *)current->ret_stack[curr_frame].ret);
8967 curr_frame--;
8968 }
8969 @@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8970 struct pt_regs *regs = (struct pt_regs *)
8971 (sp + STACK_FRAME_OVERHEAD);
8972 lr = regs->link;
8973 - printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8974 + printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8975 regs->trap, (void *)regs->nip, (void *)lr);
8976 firstframe = 1;
8977 }
8978 @@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8979 mtspr(SPRN_CTRLT, ctrl);
8980 }
8981 #endif /* CONFIG_PPC64 */
8982 -
8983 -unsigned long arch_align_stack(unsigned long sp)
8984 -{
8985 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8986 - sp -= get_random_int() & ~PAGE_MASK;
8987 - return sp & ~0xf;
8988 -}
8989 -
8990 -static inline unsigned long brk_rnd(void)
8991 -{
8992 - unsigned long rnd = 0;
8993 -
8994 - /* 8MB for 32bit, 1GB for 64bit */
8995 - if (is_32bit_task())
8996 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8997 - else
8998 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8999 -
9000 - return rnd << PAGE_SHIFT;
9001 -}
9002 -
9003 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9004 -{
9005 - unsigned long base = mm->brk;
9006 - unsigned long ret;
9007 -
9008 -#ifdef CONFIG_PPC_STD_MMU_64
9009 - /*
9010 - * If we are using 1TB segments and we are allowed to randomise
9011 - * the heap, we can put it above 1TB so it is backed by a 1TB
9012 - * segment. Otherwise the heap will be in the bottom 1TB
9013 - * which always uses 256MB segments and this may result in a
9014 - * performance penalty.
9015 - */
9016 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9017 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9018 -#endif
9019 -
9020 - ret = PAGE_ALIGN(base + brk_rnd());
9021 -
9022 - if (ret < mm->brk)
9023 - return mm->brk;
9024 -
9025 - return ret;
9026 -}
9027 -
9028 -unsigned long randomize_et_dyn(unsigned long base)
9029 -{
9030 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
9031 -
9032 - if (ret < base)
9033 - return base;
9034 -
9035 - return ret;
9036 -}
9037 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9038 index f21897b..28c0428 100644
9039 --- a/arch/powerpc/kernel/ptrace.c
9040 +++ b/arch/powerpc/kernel/ptrace.c
9041 @@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9042 return ret;
9043 }
9044
9045 +#ifdef CONFIG_GRKERNSEC_SETXID
9046 +extern void gr_delayed_cred_worker(void);
9047 +#endif
9048 +
9049 /*
9050 * We must return the syscall number to actually look up in the table.
9051 * This can be -1L to skip running any syscall at all.
9052 @@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9053
9054 secure_computing_strict(regs->gpr[0]);
9055
9056 +#ifdef CONFIG_GRKERNSEC_SETXID
9057 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9058 + gr_delayed_cred_worker();
9059 +#endif
9060 +
9061 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9062 tracehook_report_syscall_entry(regs))
9063 /*
9064 @@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9065 {
9066 int step;
9067
9068 +#ifdef CONFIG_GRKERNSEC_SETXID
9069 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9070 + gr_delayed_cred_worker();
9071 +#endif
9072 +
9073 audit_syscall_exit(regs);
9074
9075 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9076 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9077 index b171001..4ac7ac5 100644
9078 --- a/arch/powerpc/kernel/signal_32.c
9079 +++ b/arch/powerpc/kernel/signal_32.c
9080 @@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9081 /* Save user registers on the stack */
9082 frame = &rt_sf->uc.uc_mcontext;
9083 addr = frame;
9084 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9085 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9086 sigret = 0;
9087 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9088 } else {
9089 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9090 index 2cb0c94..c0c0bc9 100644
9091 --- a/arch/powerpc/kernel/signal_64.c
9092 +++ b/arch/powerpc/kernel/signal_64.c
9093 @@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9094 current->thread.fp_state.fpscr = 0;
9095
9096 /* Set up to return from userspace. */
9097 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9098 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9099 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9100 } else {
9101 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9102 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9103 index 0dc43f9..a885d33 100644
9104 --- a/arch/powerpc/kernel/traps.c
9105 +++ b/arch/powerpc/kernel/traps.c
9106 @@ -36,6 +36,7 @@
9107 #include <linux/debugfs.h>
9108 #include <linux/ratelimit.h>
9109 #include <linux/context_tracking.h>
9110 +#include <linux/uaccess.h>
9111
9112 #include <asm/emulated_ops.h>
9113 #include <asm/pgtable.h>
9114 @@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9115 return flags;
9116 }
9117
9118 +extern void gr_handle_kernel_exploit(void);
9119 +
9120 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9121 int signr)
9122 {
9123 @@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9124 panic("Fatal exception in interrupt");
9125 if (panic_on_oops)
9126 panic("Fatal exception");
9127 +
9128 + gr_handle_kernel_exploit();
9129 +
9130 do_exit(signr);
9131 }
9132
9133 @@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9134 enum ctx_state prev_state = exception_enter();
9135 unsigned int reason = get_reason(regs);
9136
9137 +#ifdef CONFIG_PAX_REFCOUNT
9138 + unsigned int bkpt;
9139 + const struct exception_table_entry *entry;
9140 +
9141 + if (reason & REASON_ILLEGAL) {
9142 + /* Check if PaX bad instruction */
9143 + if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9144 + current->thread.trap_nr = 0;
9145 + pax_report_refcount_overflow(regs);
9146 + /* fixup_exception() for PowerPC does not exist, simulate its job */
9147 + if ((entry = search_exception_tables(regs->nip)) != NULL) {
9148 + regs->nip = entry->fixup;
9149 + return;
9150 + }
9151 + /* fixup_exception() could not handle */
9152 + goto bail;
9153 + }
9154 + }
9155 +#endif
9156 +
9157 /* We can now get here via a FP Unavailable exception if the core
9158 * has no FPU, in that case the reason flags will be 0 */
9159
9160 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9161 index f174351..5722009 100644
9162 --- a/arch/powerpc/kernel/vdso.c
9163 +++ b/arch/powerpc/kernel/vdso.c
9164 @@ -35,6 +35,7 @@
9165 #include <asm/vdso.h>
9166 #include <asm/vdso_datapage.h>
9167 #include <asm/setup.h>
9168 +#include <asm/mman.h>
9169
9170 #undef DEBUG
9171
9172 @@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9173 vdso_base = VDSO32_MBASE;
9174 #endif
9175
9176 - current->mm->context.vdso_base = 0;
9177 + current->mm->context.vdso_base = ~0UL;
9178
9179 /* vDSO has a problem and was disabled, just don't "enable" it for the
9180 * process
9181 @@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9182 vdso_base = get_unmapped_area(NULL, vdso_base,
9183 (vdso_pages << PAGE_SHIFT) +
9184 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9185 - 0, 0);
9186 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
9187 if (IS_ERR_VALUE(vdso_base)) {
9188 rc = vdso_base;
9189 goto fail_mmapsem;
9190 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9191 index c1f8f53..71a3b96 100644
9192 --- a/arch/powerpc/kvm/powerpc.c
9193 +++ b/arch/powerpc/kvm/powerpc.c
9194 @@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9195 }
9196 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9197
9198 -int kvm_arch_init(void *opaque)
9199 +int kvm_arch_init(const void *opaque)
9200 {
9201 return 0;
9202 }
9203 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9204 index 5eea6f3..5d10396 100644
9205 --- a/arch/powerpc/lib/usercopy_64.c
9206 +++ b/arch/powerpc/lib/usercopy_64.c
9207 @@ -9,22 +9,6 @@
9208 #include <linux/module.h>
9209 #include <asm/uaccess.h>
9210
9211 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9212 -{
9213 - if (likely(access_ok(VERIFY_READ, from, n)))
9214 - n = __copy_from_user(to, from, n);
9215 - else
9216 - memset(to, 0, n);
9217 - return n;
9218 -}
9219 -
9220 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9221 -{
9222 - if (likely(access_ok(VERIFY_WRITE, to, n)))
9223 - n = __copy_to_user(to, from, n);
9224 - return n;
9225 -}
9226 -
9227 unsigned long copy_in_user(void __user *to, const void __user *from,
9228 unsigned long n)
9229 {
9230 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9231 return n;
9232 }
9233
9234 -EXPORT_SYMBOL(copy_from_user);
9235 -EXPORT_SYMBOL(copy_to_user);
9236 EXPORT_SYMBOL(copy_in_user);
9237
9238 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9239 index 08d659a..ab329f4 100644
9240 --- a/arch/powerpc/mm/fault.c
9241 +++ b/arch/powerpc/mm/fault.c
9242 @@ -33,6 +33,10 @@
9243 #include <linux/ratelimit.h>
9244 #include <linux/context_tracking.h>
9245 #include <linux/hugetlb.h>
9246 +#include <linux/slab.h>
9247 +#include <linux/pagemap.h>
9248 +#include <linux/compiler.h>
9249 +#include <linux/unistd.h>
9250
9251 #include <asm/firmware.h>
9252 #include <asm/page.h>
9253 @@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9254 }
9255 #endif
9256
9257 +#ifdef CONFIG_PAX_PAGEEXEC
9258 +/*
9259 + * PaX: decide what to do with offenders (regs->nip = fault address)
9260 + *
9261 + * returns 1 when task should be killed
9262 + */
9263 +static int pax_handle_fetch_fault(struct pt_regs *regs)
9264 +{
9265 + return 1;
9266 +}
9267 +
9268 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9269 +{
9270 + unsigned long i;
9271 +
9272 + printk(KERN_ERR "PAX: bytes at PC: ");
9273 + for (i = 0; i < 5; i++) {
9274 + unsigned int c;
9275 + if (get_user(c, (unsigned int __user *)pc+i))
9276 + printk(KERN_CONT "???????? ");
9277 + else
9278 + printk(KERN_CONT "%08x ", c);
9279 + }
9280 + printk("\n");
9281 +}
9282 +#endif
9283 +
9284 /*
9285 * Check whether the instruction at regs->nip is a store using
9286 * an update addressing form which will update r1.
9287 @@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9288 * indicate errors in DSISR but can validly be set in SRR1.
9289 */
9290 if (trap == 0x400)
9291 - error_code &= 0x48200000;
9292 + error_code &= 0x58200000;
9293 else
9294 is_write = error_code & DSISR_ISSTORE;
9295 #else
9296 @@ -390,7 +421,7 @@ good_area:
9297 * "undefined". Of those that can be set, this is the only
9298 * one which seems bad.
9299 */
9300 - if (error_code & 0x10000000)
9301 + if (error_code & DSISR_GUARDED)
9302 /* Guarded storage error. */
9303 goto bad_area;
9304 #endif /* CONFIG_8xx */
9305 @@ -405,7 +436,7 @@ good_area:
9306 * processors use the same I/D cache coherency mechanism
9307 * as embedded.
9308 */
9309 - if (error_code & DSISR_PROTFAULT)
9310 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9311 goto bad_area;
9312 #endif /* CONFIG_PPC_STD_MMU */
9313
9314 @@ -495,6 +526,23 @@ bad_area:
9315 bad_area_nosemaphore:
9316 /* User mode accesses cause a SIGSEGV */
9317 if (user_mode(regs)) {
9318 +
9319 +#ifdef CONFIG_PAX_PAGEEXEC
9320 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9321 +#ifdef CONFIG_PPC_STD_MMU
9322 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9323 +#else
9324 + if (is_exec && regs->nip == address) {
9325 +#endif
9326 + switch (pax_handle_fetch_fault(regs)) {
9327 + }
9328 +
9329 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9330 + do_group_exit(SIGKILL);
9331 + }
9332 + }
9333 +#endif
9334 +
9335 _exception(SIGSEGV, regs, code, address);
9336 goto bail;
9337 }
9338 diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9339 index cb8bdbe..cde4bc7 100644
9340 --- a/arch/powerpc/mm/mmap.c
9341 +++ b/arch/powerpc/mm/mmap.c
9342 @@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9343 return sysctl_legacy_va_layout;
9344 }
9345
9346 -static unsigned long mmap_rnd(void)
9347 +static unsigned long mmap_rnd(struct mm_struct *mm)
9348 {
9349 unsigned long rnd = 0;
9350
9351 +#ifdef CONFIG_PAX_RANDMMAP
9352 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9353 +#endif
9354 +
9355 if (current->flags & PF_RANDOMIZE) {
9356 /* 8MB for 32bit, 1GB for 64bit */
9357 if (is_32bit_task())
9358 @@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9359 return rnd << PAGE_SHIFT;
9360 }
9361
9362 -static inline unsigned long mmap_base(void)
9363 +static inline unsigned long mmap_base(struct mm_struct *mm)
9364 {
9365 unsigned long gap = rlimit(RLIMIT_STACK);
9366
9367 @@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9368 else if (gap > MAX_GAP)
9369 gap = MAX_GAP;
9370
9371 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9372 + return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9373 }
9374
9375 /*
9376 @@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9377 */
9378 if (mmap_is_legacy()) {
9379 mm->mmap_base = TASK_UNMAPPED_BASE;
9380 +
9381 +#ifdef CONFIG_PAX_RANDMMAP
9382 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9383 + mm->mmap_base += mm->delta_mmap;
9384 +#endif
9385 +
9386 mm->get_unmapped_area = arch_get_unmapped_area;
9387 } else {
9388 - mm->mmap_base = mmap_base();
9389 + mm->mmap_base = mmap_base(mm);
9390 +
9391 +#ifdef CONFIG_PAX_RANDMMAP
9392 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9393 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9394 +#endif
9395 +
9396 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9397 }
9398 }
9399 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9400 index ded0ea1..f213a9b 100644
9401 --- a/arch/powerpc/mm/slice.c
9402 +++ b/arch/powerpc/mm/slice.c
9403 @@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9404 if ((mm->task_size - len) < addr)
9405 return 0;
9406 vma = find_vma(mm, addr);
9407 - return (!vma || (addr + len) <= vma->vm_start);
9408 + return check_heap_stack_gap(vma, addr, len, 0);
9409 }
9410
9411 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9412 @@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9413 info.align_offset = 0;
9414
9415 addr = TASK_UNMAPPED_BASE;
9416 +
9417 +#ifdef CONFIG_PAX_RANDMMAP
9418 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9419 + addr += mm->delta_mmap;
9420 +#endif
9421 +
9422 while (addr < TASK_SIZE) {
9423 info.low_limit = addr;
9424 if (!slice_scan_available(addr, available, 1, &addr))
9425 @@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9426 if (fixed && addr > (mm->task_size - len))
9427 return -ENOMEM;
9428
9429 +#ifdef CONFIG_PAX_RANDMMAP
9430 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9431 + addr = 0;
9432 +#endif
9433 +
9434 /* If hint, make sure it matches our alignment restrictions */
9435 if (!fixed && addr) {
9436 addr = _ALIGN_UP(addr, 1ul << pshift);
9437 diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9438 index 4278acf..67fd0e6 100644
9439 --- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9440 +++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9441 @@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9442 }
9443
9444 static struct pci_ops scc_pciex_pci_ops = {
9445 - scc_pciex_read_config,
9446 - scc_pciex_write_config,
9447 + .read = scc_pciex_read_config,
9448 + .write = scc_pciex_write_config,
9449 };
9450
9451 static void pciex_clear_intr_all(unsigned int __iomem *base)
9452 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9453 index d966bbe..372124a 100644
9454 --- a/arch/powerpc/platforms/cell/spufs/file.c
9455 +++ b/arch/powerpc/platforms/cell/spufs/file.c
9456 @@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9457 return VM_FAULT_NOPAGE;
9458 }
9459
9460 -static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9461 +static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9462 unsigned long address,
9463 - void *buf, int len, int write)
9464 + void *buf, size_t len, int write)
9465 {
9466 struct spu_context *ctx = vma->vm_file->private_data;
9467 unsigned long offset = address - vma->vm_start;
9468 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9469 index fa934fe..c296056 100644
9470 --- a/arch/s390/include/asm/atomic.h
9471 +++ b/arch/s390/include/asm/atomic.h
9472 @@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9473 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9474 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9475
9476 +#define atomic64_read_unchecked(v) atomic64_read(v)
9477 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9478 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9479 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9480 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9481 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
9482 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9483 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
9484 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9485 +
9486 #endif /* __ARCH_S390_ATOMIC__ */
9487 diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9488 index b5dce65..8aca09a 100644
9489 --- a/arch/s390/include/asm/barrier.h
9490 +++ b/arch/s390/include/asm/barrier.h
9491 @@ -39,7 +39,7 @@
9492 do { \
9493 compiletime_assert_atomic_type(*p); \
9494 barrier(); \
9495 - ACCESS_ONCE(*p) = (v); \
9496 + ACCESS_ONCE_RW(*p) = (v); \
9497 } while (0)
9498
9499 #define smp_load_acquire(p) \
9500 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9501 index 4d7ccac..d03d0ad 100644
9502 --- a/arch/s390/include/asm/cache.h
9503 +++ b/arch/s390/include/asm/cache.h
9504 @@ -9,8 +9,10 @@
9505 #ifndef __ARCH_S390_CACHE_H
9506 #define __ARCH_S390_CACHE_H
9507
9508 -#define L1_CACHE_BYTES 256
9509 +#include <linux/const.h>
9510 +
9511 #define L1_CACHE_SHIFT 8
9512 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9513 #define NET_SKB_PAD 32
9514
9515 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9516 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9517 index f6e43d3..5f57681 100644
9518 --- a/arch/s390/include/asm/elf.h
9519 +++ b/arch/s390/include/asm/elf.h
9520 @@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9521 the loader. We need to make sure that it is out of the way of the program
9522 that it will "exec", and that there is sufficient room for the brk. */
9523
9524 -extern unsigned long randomize_et_dyn(unsigned long base);
9525 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9526 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9527 +
9528 +#ifdef CONFIG_PAX_ASLR
9529 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9530 +
9531 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9532 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9533 +#endif
9534
9535 /* This yields a mask that user programs can use to figure out what
9536 instruction set this CPU supports. */
9537 @@ -223,9 +229,6 @@ struct linux_binprm;
9538 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9539 int arch_setup_additional_pages(struct linux_binprm *, int);
9540
9541 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9542 -#define arch_randomize_brk arch_randomize_brk
9543 -
9544 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9545
9546 #endif
9547 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9548 index c4a93d6..4d2a9b4 100644
9549 --- a/arch/s390/include/asm/exec.h
9550 +++ b/arch/s390/include/asm/exec.h
9551 @@ -7,6 +7,6 @@
9552 #ifndef __ASM_EXEC_H
9553 #define __ASM_EXEC_H
9554
9555 -extern unsigned long arch_align_stack(unsigned long sp);
9556 +#define arch_align_stack(x) ((x) & ~0xfUL)
9557
9558 #endif /* __ASM_EXEC_H */
9559 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9560 index cd4c68e..6764641 100644
9561 --- a/arch/s390/include/asm/uaccess.h
9562 +++ b/arch/s390/include/asm/uaccess.h
9563 @@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9564 __range_ok((unsigned long)(addr), (size)); \
9565 })
9566
9567 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9568 #define access_ok(type, addr, size) __access_ok(addr, size)
9569
9570 /*
9571 @@ -275,6 +276,10 @@ static inline unsigned long __must_check
9572 copy_to_user(void __user *to, const void *from, unsigned long n)
9573 {
9574 might_fault();
9575 +
9576 + if ((long)n < 0)
9577 + return n;
9578 +
9579 return __copy_to_user(to, from, n);
9580 }
9581
9582 @@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9583 static inline unsigned long __must_check
9584 copy_from_user(void *to, const void __user *from, unsigned long n)
9585 {
9586 - unsigned int sz = __compiletime_object_size(to);
9587 + size_t sz = __compiletime_object_size(to);
9588
9589 might_fault();
9590 - if (unlikely(sz != -1 && sz < n)) {
9591 +
9592 + if ((long)n < 0)
9593 + return n;
9594 +
9595 + if (unlikely(sz != (size_t)-1 && sz < n)) {
9596 copy_from_user_overflow();
9597 return n;
9598 }
9599 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9600 index b89b591..fd9609d 100644
9601 --- a/arch/s390/kernel/module.c
9602 +++ b/arch/s390/kernel/module.c
9603 @@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9604
9605 /* Increase core size by size of got & plt and set start
9606 offsets for got and plt. */
9607 - me->core_size = ALIGN(me->core_size, 4);
9608 - me->arch.got_offset = me->core_size;
9609 - me->core_size += me->arch.got_size;
9610 - me->arch.plt_offset = me->core_size;
9611 - me->core_size += me->arch.plt_size;
9612 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
9613 + me->arch.got_offset = me->core_size_rw;
9614 + me->core_size_rw += me->arch.got_size;
9615 + me->arch.plt_offset = me->core_size_rx;
9616 + me->core_size_rx += me->arch.plt_size;
9617 return 0;
9618 }
9619
9620 @@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9621 if (info->got_initialized == 0) {
9622 Elf_Addr *gotent;
9623
9624 - gotent = me->module_core + me->arch.got_offset +
9625 + gotent = me->module_core_rw + me->arch.got_offset +
9626 info->got_offset;
9627 *gotent = val;
9628 info->got_initialized = 1;
9629 @@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9630 rc = apply_rela_bits(loc, val, 0, 64, 0);
9631 else if (r_type == R_390_GOTENT ||
9632 r_type == R_390_GOTPLTENT) {
9633 - val += (Elf_Addr) me->module_core - loc;
9634 + val += (Elf_Addr) me->module_core_rw - loc;
9635 rc = apply_rela_bits(loc, val, 1, 32, 1);
9636 }
9637 break;
9638 @@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9639 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9640 if (info->plt_initialized == 0) {
9641 unsigned int *ip;
9642 - ip = me->module_core + me->arch.plt_offset +
9643 + ip = me->module_core_rx + me->arch.plt_offset +
9644 info->plt_offset;
9645 #ifndef CONFIG_64BIT
9646 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9647 @@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9648 val - loc + 0xffffUL < 0x1ffffeUL) ||
9649 (r_type == R_390_PLT32DBL &&
9650 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9651 - val = (Elf_Addr) me->module_core +
9652 + val = (Elf_Addr) me->module_core_rx +
9653 me->arch.plt_offset +
9654 info->plt_offset;
9655 val += rela->r_addend - loc;
9656 @@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9657 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9658 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9659 val = val + rela->r_addend -
9660 - ((Elf_Addr) me->module_core + me->arch.got_offset);
9661 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9662 if (r_type == R_390_GOTOFF16)
9663 rc = apply_rela_bits(loc, val, 0, 16, 0);
9664 else if (r_type == R_390_GOTOFF32)
9665 @@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9666 break;
9667 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9668 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9669 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
9670 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9671 rela->r_addend - loc;
9672 if (r_type == R_390_GOTPC)
9673 rc = apply_rela_bits(loc, val, 1, 32, 0);
9674 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9675 index ed84cc2..c05a9d2 100644
9676 --- a/arch/s390/kernel/process.c
9677 +++ b/arch/s390/kernel/process.c
9678 @@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9679 }
9680 return 0;
9681 }
9682 -
9683 -unsigned long arch_align_stack(unsigned long sp)
9684 -{
9685 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9686 - sp -= get_random_int() & ~PAGE_MASK;
9687 - return sp & ~0xf;
9688 -}
9689 -
9690 -static inline unsigned long brk_rnd(void)
9691 -{
9692 - /* 8MB for 32bit, 1GB for 64bit */
9693 - if (is_32bit_task())
9694 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9695 - else
9696 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9697 -}
9698 -
9699 -unsigned long arch_randomize_brk(struct mm_struct *mm)
9700 -{
9701 - unsigned long ret;
9702 -
9703 - ret = PAGE_ALIGN(mm->brk + brk_rnd());
9704 - return (ret > mm->brk) ? ret : mm->brk;
9705 -}
9706 -
9707 -unsigned long randomize_et_dyn(unsigned long base)
9708 -{
9709 - unsigned long ret;
9710 -
9711 - if (!(current->flags & PF_RANDOMIZE))
9712 - return base;
9713 - ret = PAGE_ALIGN(base + brk_rnd());
9714 - return (ret > base) ? ret : base;
9715 -}
9716 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9717 index 9b436c2..54fbf0a 100644
9718 --- a/arch/s390/mm/mmap.c
9719 +++ b/arch/s390/mm/mmap.c
9720 @@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9721 */
9722 if (mmap_is_legacy()) {
9723 mm->mmap_base = mmap_base_legacy();
9724 +
9725 +#ifdef CONFIG_PAX_RANDMMAP
9726 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9727 + mm->mmap_base += mm->delta_mmap;
9728 +#endif
9729 +
9730 mm->get_unmapped_area = arch_get_unmapped_area;
9731 } else {
9732 mm->mmap_base = mmap_base();
9733 +
9734 +#ifdef CONFIG_PAX_RANDMMAP
9735 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9736 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9737 +#endif
9738 +
9739 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9740 }
9741 }
9742 @@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9743 */
9744 if (mmap_is_legacy()) {
9745 mm->mmap_base = mmap_base_legacy();
9746 +
9747 +#ifdef CONFIG_PAX_RANDMMAP
9748 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9749 + mm->mmap_base += mm->delta_mmap;
9750 +#endif
9751 +
9752 mm->get_unmapped_area = s390_get_unmapped_area;
9753 } else {
9754 mm->mmap_base = mmap_base();
9755 +
9756 +#ifdef CONFIG_PAX_RANDMMAP
9757 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9758 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9759 +#endif
9760 +
9761 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9762 }
9763 }
9764 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9765 index ae3d59f..f65f075 100644
9766 --- a/arch/score/include/asm/cache.h
9767 +++ b/arch/score/include/asm/cache.h
9768 @@ -1,7 +1,9 @@
9769 #ifndef _ASM_SCORE_CACHE_H
9770 #define _ASM_SCORE_CACHE_H
9771
9772 +#include <linux/const.h>
9773 +
9774 #define L1_CACHE_SHIFT 4
9775 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9776 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9777
9778 #endif /* _ASM_SCORE_CACHE_H */
9779 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9780 index f9f3cd5..58ff438 100644
9781 --- a/arch/score/include/asm/exec.h
9782 +++ b/arch/score/include/asm/exec.h
9783 @@ -1,6 +1,6 @@
9784 #ifndef _ASM_SCORE_EXEC_H
9785 #define _ASM_SCORE_EXEC_H
9786
9787 -extern unsigned long arch_align_stack(unsigned long sp);
9788 +#define arch_align_stack(x) (x)
9789
9790 #endif /* _ASM_SCORE_EXEC_H */
9791 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9792 index a1519ad3..e8ac1ff 100644
9793 --- a/arch/score/kernel/process.c
9794 +++ b/arch/score/kernel/process.c
9795 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9796
9797 return task_pt_regs(task)->cp0_epc;
9798 }
9799 -
9800 -unsigned long arch_align_stack(unsigned long sp)
9801 -{
9802 - return sp;
9803 -}
9804 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9805 index ef9e555..331bd29 100644
9806 --- a/arch/sh/include/asm/cache.h
9807 +++ b/arch/sh/include/asm/cache.h
9808 @@ -9,10 +9,11 @@
9809 #define __ASM_SH_CACHE_H
9810 #ifdef __KERNEL__
9811
9812 +#include <linux/const.h>
9813 #include <linux/init.h>
9814 #include <cpu/cache.h>
9815
9816 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9817 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9818
9819 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9820
9821 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9822 index 6777177..cb5e44f 100644
9823 --- a/arch/sh/mm/mmap.c
9824 +++ b/arch/sh/mm/mmap.c
9825 @@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9826 struct mm_struct *mm = current->mm;
9827 struct vm_area_struct *vma;
9828 int do_colour_align;
9829 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9830 struct vm_unmapped_area_info info;
9831
9832 if (flags & MAP_FIXED) {
9833 @@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9834 if (filp || (flags & MAP_SHARED))
9835 do_colour_align = 1;
9836
9837 +#ifdef CONFIG_PAX_RANDMMAP
9838 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9839 +#endif
9840 +
9841 if (addr) {
9842 if (do_colour_align)
9843 addr = COLOUR_ALIGN(addr, pgoff);
9844 @@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9845 addr = PAGE_ALIGN(addr);
9846
9847 vma = find_vma(mm, addr);
9848 - if (TASK_SIZE - len >= addr &&
9849 - (!vma || addr + len <= vma->vm_start))
9850 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9851 return addr;
9852 }
9853
9854 info.flags = 0;
9855 info.length = len;
9856 - info.low_limit = TASK_UNMAPPED_BASE;
9857 + info.low_limit = mm->mmap_base;
9858 info.high_limit = TASK_SIZE;
9859 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9860 info.align_offset = pgoff << PAGE_SHIFT;
9861 @@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9862 struct mm_struct *mm = current->mm;
9863 unsigned long addr = addr0;
9864 int do_colour_align;
9865 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9866 struct vm_unmapped_area_info info;
9867
9868 if (flags & MAP_FIXED) {
9869 @@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9870 if (filp || (flags & MAP_SHARED))
9871 do_colour_align = 1;
9872
9873 +#ifdef CONFIG_PAX_RANDMMAP
9874 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9875 +#endif
9876 +
9877 /* requesting a specific address */
9878 if (addr) {
9879 if (do_colour_align)
9880 @@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9881 addr = PAGE_ALIGN(addr);
9882
9883 vma = find_vma(mm, addr);
9884 - if (TASK_SIZE - len >= addr &&
9885 - (!vma || addr + len <= vma->vm_start))
9886 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9887 return addr;
9888 }
9889
9890 @@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9891 VM_BUG_ON(addr != -ENOMEM);
9892 info.flags = 0;
9893 info.low_limit = TASK_UNMAPPED_BASE;
9894 +
9895 +#ifdef CONFIG_PAX_RANDMMAP
9896 + if (mm->pax_flags & MF_PAX_RANDMMAP)
9897 + info.low_limit += mm->delta_mmap;
9898 +#endif
9899 +
9900 info.high_limit = TASK_SIZE;
9901 addr = vm_unmapped_area(&info);
9902 }
9903 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9904 index 4082749..fd97781 100644
9905 --- a/arch/sparc/include/asm/atomic_64.h
9906 +++ b/arch/sparc/include/asm/atomic_64.h
9907 @@ -15,18 +15,38 @@
9908 #define ATOMIC64_INIT(i) { (i) }
9909
9910 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9911 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9912 +{
9913 + return ACCESS_ONCE(v->counter);
9914 +}
9915 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9916 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9917 +{
9918 + return ACCESS_ONCE(v->counter);
9919 +}
9920
9921 #define atomic_set(v, i) (((v)->counter) = i)
9922 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9923 +{
9924 + v->counter = i;
9925 +}
9926 #define atomic64_set(v, i) (((v)->counter) = i)
9927 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9928 +{
9929 + v->counter = i;
9930 +}
9931
9932 -#define ATOMIC_OP(op) \
9933 -void atomic_##op(int, atomic_t *); \
9934 -void atomic64_##op(long, atomic64_t *);
9935 +#define __ATOMIC_OP(op, suffix) \
9936 +void atomic_##op##suffix(int, atomic##suffix##_t *); \
9937 +void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9938
9939 -#define ATOMIC_OP_RETURN(op) \
9940 -int atomic_##op##_return(int, atomic_t *); \
9941 -long atomic64_##op##_return(long, atomic64_t *);
9942 +#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9943 +
9944 +#define __ATOMIC_OP_RETURN(op, suffix) \
9945 +int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9946 +long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9947 +
9948 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9949
9950 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9951
9952 @@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9953
9954 #undef ATOMIC_OPS
9955 #undef ATOMIC_OP_RETURN
9956 +#undef __ATOMIC_OP_RETURN
9957 #undef ATOMIC_OP
9958 +#undef __ATOMIC_OP
9959
9960 #define atomic_dec_return(v) atomic_sub_return(1, v)
9961 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9962
9963 #define atomic_inc_return(v) atomic_add_return(1, v)
9964 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9965 +{
9966 + return atomic_add_return_unchecked(1, v);
9967 +}
9968 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9969 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9970 +{
9971 + return atomic64_add_return_unchecked(1, v);
9972 +}
9973
9974 /*
9975 * atomic_inc_and_test - increment and test
9976 @@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9977 * other cases.
9978 */
9979 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9980 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9981 +{
9982 + return atomic_inc_return_unchecked(v) == 0;
9983 +}
9984 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9985
9986 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9987 @@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9988 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9989
9990 #define atomic_inc(v) atomic_add(1, v)
9991 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9992 +{
9993 + atomic_add_unchecked(1, v);
9994 +}
9995 #define atomic64_inc(v) atomic64_add(1, v)
9996 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9997 +{
9998 + atomic64_add_unchecked(1, v);
9999 +}
10000
10001 #define atomic_dec(v) atomic_sub(1, v)
10002 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10003 +{
10004 + atomic_sub_unchecked(1, v);
10005 +}
10006 #define atomic64_dec(v) atomic64_sub(1, v)
10007 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10008 +{
10009 + atomic64_sub_unchecked(1, v);
10010 +}
10011
10012 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10013 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10014
10015 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10016 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10017 +{
10018 + return cmpxchg(&v->counter, old, new);
10019 +}
10020 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10021 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10022 +{
10023 + return xchg(&v->counter, new);
10024 +}
10025
10026 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10027 {
10028 - int c, old;
10029 + int c, old, new;
10030 c = atomic_read(v);
10031 for (;;) {
10032 - if (unlikely(c == (u)))
10033 + if (unlikely(c == u))
10034 break;
10035 - old = atomic_cmpxchg((v), c, c + (a));
10036 +
10037 + asm volatile("addcc %2, %0, %0\n"
10038 +
10039 +#ifdef CONFIG_PAX_REFCOUNT
10040 + "tvs %%icc, 6\n"
10041 +#endif
10042 +
10043 + : "=r" (new)
10044 + : "0" (c), "ir" (a)
10045 + : "cc");
10046 +
10047 + old = atomic_cmpxchg(v, c, new);
10048 if (likely(old == c))
10049 break;
10050 c = old;
10051 @@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10052 #define atomic64_cmpxchg(v, o, n) \
10053 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10054 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10055 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10056 +{
10057 + return xchg(&v->counter, new);
10058 +}
10059
10060 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10061 {
10062 - long c, old;
10063 + long c, old, new;
10064 c = atomic64_read(v);
10065 for (;;) {
10066 - if (unlikely(c == (u)))
10067 + if (unlikely(c == u))
10068 break;
10069 - old = atomic64_cmpxchg((v), c, c + (a));
10070 +
10071 + asm volatile("addcc %2, %0, %0\n"
10072 +
10073 +#ifdef CONFIG_PAX_REFCOUNT
10074 + "tvs %%xcc, 6\n"
10075 +#endif
10076 +
10077 + : "=r" (new)
10078 + : "0" (c), "ir" (a)
10079 + : "cc");
10080 +
10081 + old = atomic64_cmpxchg(v, c, new);
10082 if (likely(old == c))
10083 break;
10084 c = old;
10085 }
10086 - return c != (u);
10087 + return c != u;
10088 }
10089
10090 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10091 diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10092 index 305dcc3..7835030 100644
10093 --- a/arch/sparc/include/asm/barrier_64.h
10094 +++ b/arch/sparc/include/asm/barrier_64.h
10095 @@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10096 do { \
10097 compiletime_assert_atomic_type(*p); \
10098 barrier(); \
10099 - ACCESS_ONCE(*p) = (v); \
10100 + ACCESS_ONCE_RW(*p) = (v); \
10101 } while (0)
10102
10103 #define smp_load_acquire(p) \
10104 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10105 index 5bb6991..5c2132e 100644
10106 --- a/arch/sparc/include/asm/cache.h
10107 +++ b/arch/sparc/include/asm/cache.h
10108 @@ -7,10 +7,12 @@
10109 #ifndef _SPARC_CACHE_H
10110 #define _SPARC_CACHE_H
10111
10112 +#include <linux/const.h>
10113 +
10114 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10115
10116 #define L1_CACHE_SHIFT 5
10117 -#define L1_CACHE_BYTES 32
10118 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10119
10120 #ifdef CONFIG_SPARC32
10121 #define SMP_CACHE_BYTES_SHIFT 5
10122 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10123 index a24e41f..47677ff 100644
10124 --- a/arch/sparc/include/asm/elf_32.h
10125 +++ b/arch/sparc/include/asm/elf_32.h
10126 @@ -114,6 +114,13 @@ typedef struct {
10127
10128 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10129
10130 +#ifdef CONFIG_PAX_ASLR
10131 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
10132 +
10133 +#define PAX_DELTA_MMAP_LEN 16
10134 +#define PAX_DELTA_STACK_LEN 16
10135 +#endif
10136 +
10137 /* This yields a mask that user programs can use to figure out what
10138 instruction set this cpu supports. This can NOT be done in userspace
10139 on Sparc. */
10140 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10141 index 370ca1e..d4f4a98 100644
10142 --- a/arch/sparc/include/asm/elf_64.h
10143 +++ b/arch/sparc/include/asm/elf_64.h
10144 @@ -189,6 +189,13 @@ typedef struct {
10145 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10146 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10147
10148 +#ifdef CONFIG_PAX_ASLR
10149 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10150 +
10151 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10152 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10153 +#endif
10154 +
10155 extern unsigned long sparc64_elf_hwcap;
10156 #define ELF_HWCAP sparc64_elf_hwcap
10157
10158 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10159 index a3890da..f6a408e 100644
10160 --- a/arch/sparc/include/asm/pgalloc_32.h
10161 +++ b/arch/sparc/include/asm/pgalloc_32.h
10162 @@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10163 }
10164
10165 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10166 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10167
10168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10169 unsigned long address)
10170 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10171 index 5e31871..13469c6 100644
10172 --- a/arch/sparc/include/asm/pgalloc_64.h
10173 +++ b/arch/sparc/include/asm/pgalloc_64.h
10174 @@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10175 }
10176
10177 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10178 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10179
10180 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10181 {
10182 @@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10183 }
10184
10185 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10186 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10187
10188 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10189 {
10190 diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10191 index 59ba6f6..4518128 100644
10192 --- a/arch/sparc/include/asm/pgtable.h
10193 +++ b/arch/sparc/include/asm/pgtable.h
10194 @@ -5,4 +5,8 @@
10195 #else
10196 #include <asm/pgtable_32.h>
10197 #endif
10198 +
10199 +#define ktla_ktva(addr) (addr)
10200 +#define ktva_ktla(addr) (addr)
10201 +
10202 #endif
10203 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10204 index b9b91ae..950b91e 100644
10205 --- a/arch/sparc/include/asm/pgtable_32.h
10206 +++ b/arch/sparc/include/asm/pgtable_32.h
10207 @@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10208 #define PAGE_SHARED SRMMU_PAGE_SHARED
10209 #define PAGE_COPY SRMMU_PAGE_COPY
10210 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10211 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10212 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10213 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10214 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10215
10216 /* Top-level page directory - dummy used by init-mm.
10217 @@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10218
10219 /* xwr */
10220 #define __P000 PAGE_NONE
10221 -#define __P001 PAGE_READONLY
10222 -#define __P010 PAGE_COPY
10223 -#define __P011 PAGE_COPY
10224 +#define __P001 PAGE_READONLY_NOEXEC
10225 +#define __P010 PAGE_COPY_NOEXEC
10226 +#define __P011 PAGE_COPY_NOEXEC
10227 #define __P100 PAGE_READONLY
10228 #define __P101 PAGE_READONLY
10229 #define __P110 PAGE_COPY
10230 #define __P111 PAGE_COPY
10231
10232 #define __S000 PAGE_NONE
10233 -#define __S001 PAGE_READONLY
10234 -#define __S010 PAGE_SHARED
10235 -#define __S011 PAGE_SHARED
10236 +#define __S001 PAGE_READONLY_NOEXEC
10237 +#define __S010 PAGE_SHARED_NOEXEC
10238 +#define __S011 PAGE_SHARED_NOEXEC
10239 #define __S100 PAGE_READONLY
10240 #define __S101 PAGE_READONLY
10241 #define __S110 PAGE_SHARED
10242 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10243 index 79da178..c2eede8 100644
10244 --- a/arch/sparc/include/asm/pgtsrmmu.h
10245 +++ b/arch/sparc/include/asm/pgtsrmmu.h
10246 @@ -115,6 +115,11 @@
10247 SRMMU_EXEC | SRMMU_REF)
10248 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10249 SRMMU_EXEC | SRMMU_REF)
10250 +
10251 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10252 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10253 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10254 +
10255 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10256 SRMMU_DIRTY | SRMMU_REF)
10257
10258 diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10259 index 29d64b1..4272fe8 100644
10260 --- a/arch/sparc/include/asm/setup.h
10261 +++ b/arch/sparc/include/asm/setup.h
10262 @@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10263 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10264
10265 /* init_64.c */
10266 -extern atomic_t dcpage_flushes;
10267 -extern atomic_t dcpage_flushes_xcall;
10268 +extern atomic_unchecked_t dcpage_flushes;
10269 +extern atomic_unchecked_t dcpage_flushes_xcall;
10270
10271 extern int sysctl_tsb_ratio;
10272 #endif
10273 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10274 index 9689176..63c18ea 100644
10275 --- a/arch/sparc/include/asm/spinlock_64.h
10276 +++ b/arch/sparc/include/asm/spinlock_64.h
10277 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10278
10279 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10280
10281 -static void inline arch_read_lock(arch_rwlock_t *lock)
10282 +static inline void arch_read_lock(arch_rwlock_t *lock)
10283 {
10284 unsigned long tmp1, tmp2;
10285
10286 __asm__ __volatile__ (
10287 "1: ldsw [%2], %0\n"
10288 " brlz,pn %0, 2f\n"
10289 -"4: add %0, 1, %1\n"
10290 +"4: addcc %0, 1, %1\n"
10291 +
10292 +#ifdef CONFIG_PAX_REFCOUNT
10293 +" tvs %%icc, 6\n"
10294 +#endif
10295 +
10296 " cas [%2], %0, %1\n"
10297 " cmp %0, %1\n"
10298 " bne,pn %%icc, 1b\n"
10299 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10300 " .previous"
10301 : "=&r" (tmp1), "=&r" (tmp2)
10302 : "r" (lock)
10303 - : "memory");
10304 + : "memory", "cc");
10305 }
10306
10307 -static int inline arch_read_trylock(arch_rwlock_t *lock)
10308 +static inline int arch_read_trylock(arch_rwlock_t *lock)
10309 {
10310 int tmp1, tmp2;
10311
10312 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10313 "1: ldsw [%2], %0\n"
10314 " brlz,a,pn %0, 2f\n"
10315 " mov 0, %0\n"
10316 -" add %0, 1, %1\n"
10317 +" addcc %0, 1, %1\n"
10318 +
10319 +#ifdef CONFIG_PAX_REFCOUNT
10320 +" tvs %%icc, 6\n"
10321 +#endif
10322 +
10323 " cas [%2], %0, %1\n"
10324 " cmp %0, %1\n"
10325 " bne,pn %%icc, 1b\n"
10326 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10327 return tmp1;
10328 }
10329
10330 -static void inline arch_read_unlock(arch_rwlock_t *lock)
10331 +static inline void arch_read_unlock(arch_rwlock_t *lock)
10332 {
10333 unsigned long tmp1, tmp2;
10334
10335 __asm__ __volatile__(
10336 "1: lduw [%2], %0\n"
10337 -" sub %0, 1, %1\n"
10338 +" subcc %0, 1, %1\n"
10339 +
10340 +#ifdef CONFIG_PAX_REFCOUNT
10341 +" tvs %%icc, 6\n"
10342 +#endif
10343 +
10344 " cas [%2], %0, %1\n"
10345 " cmp %0, %1\n"
10346 " bne,pn %%xcc, 1b\n"
10347 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10348 : "memory");
10349 }
10350
10351 -static void inline arch_write_lock(arch_rwlock_t *lock)
10352 +static inline void arch_write_lock(arch_rwlock_t *lock)
10353 {
10354 unsigned long mask, tmp1, tmp2;
10355
10356 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10357 : "memory");
10358 }
10359
10360 -static void inline arch_write_unlock(arch_rwlock_t *lock)
10361 +static inline void arch_write_unlock(arch_rwlock_t *lock)
10362 {
10363 __asm__ __volatile__(
10364 " stw %%g0, [%0]"
10365 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10366 : "memory");
10367 }
10368
10369 -static int inline arch_write_trylock(arch_rwlock_t *lock)
10370 +static inline int arch_write_trylock(arch_rwlock_t *lock)
10371 {
10372 unsigned long mask, tmp1, tmp2, result;
10373
10374 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10375 index 025c984..a216504 100644
10376 --- a/arch/sparc/include/asm/thread_info_32.h
10377 +++ b/arch/sparc/include/asm/thread_info_32.h
10378 @@ -49,6 +49,8 @@ struct thread_info {
10379 unsigned long w_saved;
10380
10381 struct restart_block restart_block;
10382 +
10383 + unsigned long lowest_stack;
10384 };
10385
10386 /*
10387 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10388 index 798f027..b009941 100644
10389 --- a/arch/sparc/include/asm/thread_info_64.h
10390 +++ b/arch/sparc/include/asm/thread_info_64.h
10391 @@ -63,6 +63,8 @@ struct thread_info {
10392 struct pt_regs *kern_una_regs;
10393 unsigned int kern_una_insn;
10394
10395 + unsigned long lowest_stack;
10396 +
10397 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10398 __attribute__ ((aligned(64)));
10399 };
10400 @@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10401 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10402 /* flag bit 4 is available */
10403 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10404 -/* flag bit 6 is available */
10405 +#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10406 #define TIF_32BIT 7 /* 32-bit binary */
10407 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10408 #define TIF_SECCOMP 9 /* secure computing */
10409 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10410 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10411 +
10412 /* NOTE: Thread flags >= 12 should be ones we have no interest
10413 * in using in assembly, else we can't use the mask as
10414 * an immediate value in instructions such as andcc.
10415 @@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10416 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10417 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10418 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10419 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10420
10421 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10422 _TIF_DO_NOTIFY_RESUME_MASK | \
10423 _TIF_NEED_RESCHED)
10424 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10425
10426 +#define _TIF_WORK_SYSCALL \
10427 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10428 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10429 +
10430 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10431
10432 /*
10433 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10434 index bd56c28..4b63d83 100644
10435 --- a/arch/sparc/include/asm/uaccess.h
10436 +++ b/arch/sparc/include/asm/uaccess.h
10437 @@ -1,5 +1,6 @@
10438 #ifndef ___ASM_SPARC_UACCESS_H
10439 #define ___ASM_SPARC_UACCESS_H
10440 +
10441 #if defined(__sparc__) && defined(__arch64__)
10442 #include <asm/uaccess_64.h>
10443 #else
10444 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10445 index 9634d08..f55fe4f 100644
10446 --- a/arch/sparc/include/asm/uaccess_32.h
10447 +++ b/arch/sparc/include/asm/uaccess_32.h
10448 @@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10449
10450 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10451 {
10452 - if (n && __access_ok((unsigned long) to, n))
10453 + if ((long)n < 0)
10454 + return n;
10455 +
10456 + if (n && __access_ok((unsigned long) to, n)) {
10457 + if (!__builtin_constant_p(n))
10458 + check_object_size(from, n, true);
10459 return __copy_user(to, (__force void __user *) from, n);
10460 - else
10461 + } else
10462 return n;
10463 }
10464
10465 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10466 {
10467 + if ((long)n < 0)
10468 + return n;
10469 +
10470 + if (!__builtin_constant_p(n))
10471 + check_object_size(from, n, true);
10472 +
10473 return __copy_user(to, (__force void __user *) from, n);
10474 }
10475
10476 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10477 {
10478 - if (n && __access_ok((unsigned long) from, n))
10479 + if ((long)n < 0)
10480 + return n;
10481 +
10482 + if (n && __access_ok((unsigned long) from, n)) {
10483 + if (!__builtin_constant_p(n))
10484 + check_object_size(to, n, false);
10485 return __copy_user((__force void __user *) to, from, n);
10486 - else
10487 + } else
10488 return n;
10489 }
10490
10491 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10492 {
10493 + if ((long)n < 0)
10494 + return n;
10495 +
10496 return __copy_user((__force void __user *) to, from, n);
10497 }
10498
10499 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10500 index c990a5e..f17b9c1 100644
10501 --- a/arch/sparc/include/asm/uaccess_64.h
10502 +++ b/arch/sparc/include/asm/uaccess_64.h
10503 @@ -10,6 +10,7 @@
10504 #include <linux/compiler.h>
10505 #include <linux/string.h>
10506 #include <linux/thread_info.h>
10507 +#include <linux/kernel.h>
10508 #include <asm/asi.h>
10509 #include <asm/spitfire.h>
10510 #include <asm-generic/uaccess-unaligned.h>
10511 @@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10512 static inline unsigned long __must_check
10513 copy_from_user(void *to, const void __user *from, unsigned long size)
10514 {
10515 - unsigned long ret = ___copy_from_user(to, from, size);
10516 + unsigned long ret;
10517
10518 + if ((long)size < 0 || size > INT_MAX)
10519 + return size;
10520 +
10521 + if (!__builtin_constant_p(size))
10522 + check_object_size(to, size, false);
10523 +
10524 + ret = ___copy_from_user(to, from, size);
10525 if (unlikely(ret))
10526 ret = copy_from_user_fixup(to, from, size);
10527
10528 @@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10529 static inline unsigned long __must_check
10530 copy_to_user(void __user *to, const void *from, unsigned long size)
10531 {
10532 - unsigned long ret = ___copy_to_user(to, from, size);
10533 + unsigned long ret;
10534
10535 + if ((long)size < 0 || size > INT_MAX)
10536 + return size;
10537 +
10538 + if (!__builtin_constant_p(size))
10539 + check_object_size(from, size, true);
10540 +
10541 + ret = ___copy_to_user(to, from, size);
10542 if (unlikely(ret))
10543 ret = copy_to_user_fixup(to, from, size);
10544 return ret;
10545 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10546 index 7cf9c6e..6206648 100644
10547 --- a/arch/sparc/kernel/Makefile
10548 +++ b/arch/sparc/kernel/Makefile
10549 @@ -4,7 +4,7 @@
10550 #
10551
10552 asflags-y := -ansi
10553 -ccflags-y := -Werror
10554 +#ccflags-y := -Werror
10555
10556 extra-y := head_$(BITS).o
10557
10558 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10559 index 50e7b62..79fae35 100644
10560 --- a/arch/sparc/kernel/process_32.c
10561 +++ b/arch/sparc/kernel/process_32.c
10562 @@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10563
10564 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10565 r->psr, r->pc, r->npc, r->y, print_tainted());
10566 - printk("PC: <%pS>\n", (void *) r->pc);
10567 + printk("PC: <%pA>\n", (void *) r->pc);
10568 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10569 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10570 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10571 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10572 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10573 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10574 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10575 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10576
10577 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10578 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10579 @@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10580 rw = (struct reg_window32 *) fp;
10581 pc = rw->ins[7];
10582 printk("[%08lx : ", pc);
10583 - printk("%pS ] ", (void *) pc);
10584 + printk("%pA ] ", (void *) pc);
10585 fp = rw->ins[6];
10586 } while (++count < 16);
10587 printk("\n");
10588 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10589 index 0be7bf9..2b1cba8 100644
10590 --- a/arch/sparc/kernel/process_64.c
10591 +++ b/arch/sparc/kernel/process_64.c
10592 @@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10593 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10594 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10595 if (regs->tstate & TSTATE_PRIV)
10596 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10597 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10598 }
10599
10600 void show_regs(struct pt_regs *regs)
10601 @@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10602
10603 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10604 regs->tpc, regs->tnpc, regs->y, print_tainted());
10605 - printk("TPC: <%pS>\n", (void *) regs->tpc);
10606 + printk("TPC: <%pA>\n", (void *) regs->tpc);
10607 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10608 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10609 regs->u_regs[3]);
10610 @@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10611 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10612 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10613 regs->u_regs[15]);
10614 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10615 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10616 show_regwindow(regs);
10617 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10618 }
10619 @@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10620 ((tp && tp->task) ? tp->task->pid : -1));
10621
10622 if (gp->tstate & TSTATE_PRIV) {
10623 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10624 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10625 (void *) gp->tpc,
10626 (void *) gp->o7,
10627 (void *) gp->i7,
10628 diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10629 index 79cc0d1..ec62734 100644
10630 --- a/arch/sparc/kernel/prom_common.c
10631 +++ b/arch/sparc/kernel/prom_common.c
10632 @@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10633
10634 unsigned int prom_early_allocated __initdata;
10635
10636 -static struct of_pdt_ops prom_sparc_ops __initdata = {
10637 +static struct of_pdt_ops prom_sparc_ops __initconst = {
10638 .nextprop = prom_common_nextprop,
10639 .getproplen = prom_getproplen,
10640 .getproperty = prom_getproperty,
10641 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10642 index 9ddc492..27a5619 100644
10643 --- a/arch/sparc/kernel/ptrace_64.c
10644 +++ b/arch/sparc/kernel/ptrace_64.c
10645 @@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10646 return ret;
10647 }
10648
10649 +#ifdef CONFIG_GRKERNSEC_SETXID
10650 +extern void gr_delayed_cred_worker(void);
10651 +#endif
10652 +
10653 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10654 {
10655 int ret = 0;
10656 @@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10657 if (test_thread_flag(TIF_NOHZ))
10658 user_exit();
10659
10660 +#ifdef CONFIG_GRKERNSEC_SETXID
10661 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10662 + gr_delayed_cred_worker();
10663 +#endif
10664 +
10665 if (test_thread_flag(TIF_SYSCALL_TRACE))
10666 ret = tracehook_report_syscall_entry(regs);
10667
10668 @@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10669 if (test_thread_flag(TIF_NOHZ))
10670 user_exit();
10671
10672 +#ifdef CONFIG_GRKERNSEC_SETXID
10673 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10674 + gr_delayed_cred_worker();
10675 +#endif
10676 +
10677 audit_syscall_exit(regs);
10678
10679 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10680 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10681 index da6f1a7..e5dea8f 100644
10682 --- a/arch/sparc/kernel/smp_64.c
10683 +++ b/arch/sparc/kernel/smp_64.c
10684 @@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10685 return;
10686
10687 #ifdef CONFIG_DEBUG_DCFLUSH
10688 - atomic_inc(&dcpage_flushes);
10689 + atomic_inc_unchecked(&dcpage_flushes);
10690 #endif
10691
10692 this_cpu = get_cpu();
10693 @@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10694 xcall_deliver(data0, __pa(pg_addr),
10695 (u64) pg_addr, cpumask_of(cpu));
10696 #ifdef CONFIG_DEBUG_DCFLUSH
10697 - atomic_inc(&dcpage_flushes_xcall);
10698 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10699 #endif
10700 }
10701 }
10702 @@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10703 preempt_disable();
10704
10705 #ifdef CONFIG_DEBUG_DCFLUSH
10706 - atomic_inc(&dcpage_flushes);
10707 + atomic_inc_unchecked(&dcpage_flushes);
10708 #endif
10709 data0 = 0;
10710 pg_addr = page_address(page);
10711 @@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10712 xcall_deliver(data0, __pa(pg_addr),
10713 (u64) pg_addr, cpu_online_mask);
10714 #ifdef CONFIG_DEBUG_DCFLUSH
10715 - atomic_inc(&dcpage_flushes_xcall);
10716 + atomic_inc_unchecked(&dcpage_flushes_xcall);
10717 #endif
10718 }
10719 __local_flush_dcache_page(page);
10720 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10721 index 646988d..b88905f 100644
10722 --- a/arch/sparc/kernel/sys_sparc_32.c
10723 +++ b/arch/sparc/kernel/sys_sparc_32.c
10724 @@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10725 if (len > TASK_SIZE - PAGE_SIZE)
10726 return -ENOMEM;
10727 if (!addr)
10728 - addr = TASK_UNMAPPED_BASE;
10729 + addr = current->mm->mmap_base;
10730
10731 info.flags = 0;
10732 info.length = len;
10733 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10734 index c85403d..6af95c9 100644
10735 --- a/arch/sparc/kernel/sys_sparc_64.c
10736 +++ b/arch/sparc/kernel/sys_sparc_64.c
10737 @@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10738 struct vm_area_struct * vma;
10739 unsigned long task_size = TASK_SIZE;
10740 int do_color_align;
10741 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10742 struct vm_unmapped_area_info info;
10743
10744 if (flags & MAP_FIXED) {
10745 /* We do not accept a shared mapping if it would violate
10746 * cache aliasing constraints.
10747 */
10748 - if ((flags & MAP_SHARED) &&
10749 + if ((filp || (flags & MAP_SHARED)) &&
10750 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10751 return -EINVAL;
10752 return addr;
10753 @@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10754 if (filp || (flags & MAP_SHARED))
10755 do_color_align = 1;
10756
10757 +#ifdef CONFIG_PAX_RANDMMAP
10758 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10759 +#endif
10760 +
10761 if (addr) {
10762 if (do_color_align)
10763 addr = COLOR_ALIGN(addr, pgoff);
10764 @@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10765 addr = PAGE_ALIGN(addr);
10766
10767 vma = find_vma(mm, addr);
10768 - if (task_size - len >= addr &&
10769 - (!vma || addr + len <= vma->vm_start))
10770 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10771 return addr;
10772 }
10773
10774 info.flags = 0;
10775 info.length = len;
10776 - info.low_limit = TASK_UNMAPPED_BASE;
10777 + info.low_limit = mm->mmap_base;
10778 info.high_limit = min(task_size, VA_EXCLUDE_START);
10779 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10780 info.align_offset = pgoff << PAGE_SHIFT;
10781 + info.threadstack_offset = offset;
10782 addr = vm_unmapped_area(&info);
10783
10784 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.low_limit = VA_EXCLUDE_END;
10787 +
10788 +#ifdef CONFIG_PAX_RANDMMAP
10789 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10790 + info.low_limit += mm->delta_mmap;
10791 +#endif
10792 +
10793 info.high_limit = task_size;
10794 addr = vm_unmapped_area(&info);
10795 }
10796 @@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10797 unsigned long task_size = STACK_TOP32;
10798 unsigned long addr = addr0;
10799 int do_color_align;
10800 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10801 struct vm_unmapped_area_info info;
10802
10803 /* This should only ever run for 32-bit processes. */
10804 @@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10805 /* We do not accept a shared mapping if it would violate
10806 * cache aliasing constraints.
10807 */
10808 - if ((flags & MAP_SHARED) &&
10809 + if ((filp || (flags & MAP_SHARED)) &&
10810 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10811 return -EINVAL;
10812 return addr;
10813 @@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10814 if (filp || (flags & MAP_SHARED))
10815 do_color_align = 1;
10816
10817 +#ifdef CONFIG_PAX_RANDMMAP
10818 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10819 +#endif
10820 +
10821 /* requesting a specific address */
10822 if (addr) {
10823 if (do_color_align)
10824 @@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10825 addr = PAGE_ALIGN(addr);
10826
10827 vma = find_vma(mm, addr);
10828 - if (task_size - len >= addr &&
10829 - (!vma || addr + len <= vma->vm_start))
10830 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10831 return addr;
10832 }
10833
10834 @@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10835 info.high_limit = mm->mmap_base;
10836 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10837 info.align_offset = pgoff << PAGE_SHIFT;
10838 + info.threadstack_offset = offset;
10839 addr = vm_unmapped_area(&info);
10840
10841 /*
10842 @@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10843 VM_BUG_ON(addr != -ENOMEM);
10844 info.flags = 0;
10845 info.low_limit = TASK_UNMAPPED_BASE;
10846 +
10847 +#ifdef CONFIG_PAX_RANDMMAP
10848 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10849 + info.low_limit += mm->delta_mmap;
10850 +#endif
10851 +
10852 info.high_limit = STACK_TOP32;
10853 addr = vm_unmapped_area(&info);
10854 }
10855 @@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10856 EXPORT_SYMBOL(get_fb_unmapped_area);
10857
10858 /* Essentially the same as PowerPC. */
10859 -static unsigned long mmap_rnd(void)
10860 +static unsigned long mmap_rnd(struct mm_struct *mm)
10861 {
10862 unsigned long rnd = 0UL;
10863
10864 +#ifdef CONFIG_PAX_RANDMMAP
10865 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10866 +#endif
10867 +
10868 if (current->flags & PF_RANDOMIZE) {
10869 unsigned long val = get_random_int();
10870 if (test_thread_flag(TIF_32BIT))
10871 @@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10872
10873 void arch_pick_mmap_layout(struct mm_struct *mm)
10874 {
10875 - unsigned long random_factor = mmap_rnd();
10876 + unsigned long random_factor = mmap_rnd(mm);
10877 unsigned long gap;
10878
10879 /*
10880 @@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10881 gap == RLIM_INFINITY ||
10882 sysctl_legacy_va_layout) {
10883 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10884 +
10885 +#ifdef CONFIG_PAX_RANDMMAP
10886 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10887 + mm->mmap_base += mm->delta_mmap;
10888 +#endif
10889 +
10890 mm->get_unmapped_area = arch_get_unmapped_area;
10891 } else {
10892 /* We know it's 32-bit */
10893 @@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10894 gap = (task_size / 6 * 5);
10895
10896 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10897 +
10898 +#ifdef CONFIG_PAX_RANDMMAP
10899 + if (mm->pax_flags & MF_PAX_RANDMMAP)
10900 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10901 +#endif
10902 +
10903 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10904 }
10905 }
10906 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10907 index 33a17e7..d87fb1f 100644
10908 --- a/arch/sparc/kernel/syscalls.S
10909 +++ b/arch/sparc/kernel/syscalls.S
10910 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10911 #endif
10912 .align 32
10913 1: ldx [%g6 + TI_FLAGS], %l5
10914 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10915 + andcc %l5, _TIF_WORK_SYSCALL, %g0
10916 be,pt %icc, rtrap
10917 nop
10918 call syscall_trace_leave
10919 @@ -184,7 +184,7 @@ linux_sparc_syscall32:
10920
10921 srl %i3, 0, %o3 ! IEU0
10922 srl %i2, 0, %o2 ! IEU0 Group
10923 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10924 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10925 bne,pn %icc, linux_syscall_trace32 ! CTI
10926 mov %i0, %l5 ! IEU1
10927 5: call %l7 ! CTI Group brk forced
10928 @@ -208,7 +208,7 @@ linux_sparc_syscall:
10929
10930 mov %i3, %o3 ! IEU1
10931 mov %i4, %o4 ! IEU0 Group
10932 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10933 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10934 bne,pn %icc, linux_syscall_trace ! CTI Group
10935 mov %i0, %l5 ! IEU0
10936 2: call %l7 ! CTI Group brk forced
10937 @@ -223,7 +223,7 @@ ret_sys_call:
10938
10939 cmp %o0, -ERESTART_RESTARTBLOCK
10940 bgeu,pn %xcc, 1f
10941 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10942 + andcc %l0, _TIF_WORK_SYSCALL, %g0
10943 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10944
10945 2:
10946 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10947 index 6fd386c5..6907d81 100644
10948 --- a/arch/sparc/kernel/traps_32.c
10949 +++ b/arch/sparc/kernel/traps_32.c
10950 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10951 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10952 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10953
10954 +extern void gr_handle_kernel_exploit(void);
10955 +
10956 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10957 {
10958 static int die_counter;
10959 @@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10960 count++ < 30 &&
10961 (((unsigned long) rw) >= PAGE_OFFSET) &&
10962 !(((unsigned long) rw) & 0x7)) {
10963 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
10964 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
10965 (void *) rw->ins[7]);
10966 rw = (struct reg_window32 *)rw->ins[6];
10967 }
10968 }
10969 printk("Instruction DUMP:");
10970 instruction_dump ((unsigned long *) regs->pc);
10971 - if(regs->psr & PSR_PS)
10972 + if(regs->psr & PSR_PS) {
10973 + gr_handle_kernel_exploit();
10974 do_exit(SIGKILL);
10975 + }
10976 do_exit(SIGSEGV);
10977 }
10978
10979 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10980 index 981a769..d906eda 100644
10981 --- a/arch/sparc/kernel/traps_64.c
10982 +++ b/arch/sparc/kernel/traps_64.c
10983 @@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10984 i + 1,
10985 p->trapstack[i].tstate, p->trapstack[i].tpc,
10986 p->trapstack[i].tnpc, p->trapstack[i].tt);
10987 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10988 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10989 }
10990 }
10991
10992 @@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10993
10994 lvl -= 0x100;
10995 if (regs->tstate & TSTATE_PRIV) {
10996 +
10997 +#ifdef CONFIG_PAX_REFCOUNT
10998 + if (lvl == 6)
10999 + pax_report_refcount_overflow(regs);
11000 +#endif
11001 +
11002 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11003 die_if_kernel(buffer, regs);
11004 }
11005 @@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11006 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11007 {
11008 char buffer[32];
11009 -
11010 +
11011 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11012 0, lvl, SIGTRAP) == NOTIFY_STOP)
11013 return;
11014
11015 +#ifdef CONFIG_PAX_REFCOUNT
11016 + if (lvl == 6)
11017 + pax_report_refcount_overflow(regs);
11018 +#endif
11019 +
11020 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11021
11022 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11023 @@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11024 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11025 printk("%s" "ERROR(%d): ",
11026 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11027 - printk("TPC<%pS>\n", (void *) regs->tpc);
11028 + printk("TPC<%pA>\n", (void *) regs->tpc);
11029 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11030 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11031 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11032 @@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11033 smp_processor_id(),
11034 (type & 0x1) ? 'I' : 'D',
11035 regs->tpc);
11036 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11037 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11038 panic("Irrecoverable Cheetah+ parity error.");
11039 }
11040
11041 @@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11042 smp_processor_id(),
11043 (type & 0x1) ? 'I' : 'D',
11044 regs->tpc);
11045 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11046 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11047 }
11048
11049 struct sun4v_error_entry {
11050 @@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11051 /*0x38*/u64 reserved_5;
11052 };
11053
11054 -static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11055 -static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11056 +static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11057 +static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11058
11059 static const char *sun4v_err_type_to_str(u8 type)
11060 {
11061 @@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11062 }
11063
11064 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11065 - int cpu, const char *pfx, atomic_t *ocnt)
11066 + int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11067 {
11068 u64 *raw_ptr = (u64 *) ent;
11069 u32 attrs;
11070 @@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11071
11072 show_regs(regs);
11073
11074 - if ((cnt = atomic_read(ocnt)) != 0) {
11075 - atomic_set(ocnt, 0);
11076 + if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11077 + atomic_set_unchecked(ocnt, 0);
11078 wmb();
11079 printk("%s: Queue overflowed %d times.\n",
11080 pfx, cnt);
11081 @@ -2048,7 +2059,7 @@ out:
11082 */
11083 void sun4v_resum_overflow(struct pt_regs *regs)
11084 {
11085 - atomic_inc(&sun4v_resum_oflow_cnt);
11086 + atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11087 }
11088
11089 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11090 @@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11091 /* XXX Actually even this can make not that much sense. Perhaps
11092 * XXX we should just pull the plug and panic directly from here?
11093 */
11094 - atomic_inc(&sun4v_nonresum_oflow_cnt);
11095 + atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11096 }
11097
11098 static void sun4v_tlb_error(struct pt_regs *regs)
11099 @@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11100
11101 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11102 regs->tpc, tl);
11103 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11104 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11105 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11106 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11107 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11108 (void *) regs->u_regs[UREG_I7]);
11109 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11110 "pte[%lx] error[%lx]\n",
11111 @@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11112
11113 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11114 regs->tpc, tl);
11115 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11116 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11117 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11118 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11119 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11120 (void *) regs->u_regs[UREG_I7]);
11121 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11122 "pte[%lx] error[%lx]\n",
11123 @@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11124 fp = (unsigned long)sf->fp + STACK_BIAS;
11125 }
11126
11127 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11128 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11129 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11130 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11131 int index = tsk->curr_ret_stack;
11132 if (tsk->ret_stack && index >= graph) {
11133 pc = tsk->ret_stack[index - graph].ret;
11134 - printk(" [%016lx] %pS\n", pc, (void *) pc);
11135 + printk(" [%016lx] %pA\n", pc, (void *) pc);
11136 graph++;
11137 }
11138 }
11139 @@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11140 return (struct reg_window *) (fp + STACK_BIAS);
11141 }
11142
11143 +extern void gr_handle_kernel_exploit(void);
11144 +
11145 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11146 {
11147 static int die_counter;
11148 @@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11149 while (rw &&
11150 count++ < 30 &&
11151 kstack_valid(tp, (unsigned long) rw)) {
11152 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
11153 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
11154 (void *) rw->ins[7]);
11155
11156 rw = kernel_stack_up(rw);
11157 @@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11158 }
11159 user_instruction_dump ((unsigned int __user *) regs->tpc);
11160 }
11161 - if (regs->tstate & TSTATE_PRIV)
11162 + if (regs->tstate & TSTATE_PRIV) {
11163 + gr_handle_kernel_exploit();
11164 do_exit(SIGKILL);
11165 + }
11166 do_exit(SIGSEGV);
11167 }
11168 EXPORT_SYMBOL(die_if_kernel);
11169 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11170 index 62098a8..547ab2c 100644
11171 --- a/arch/sparc/kernel/unaligned_64.c
11172 +++ b/arch/sparc/kernel/unaligned_64.c
11173 @@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11174 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11175
11176 if (__ratelimit(&ratelimit)) {
11177 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
11178 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
11179 regs->tpc, (void *) regs->tpc);
11180 }
11181 }
11182 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11183 index 3269b02..64f5231 100644
11184 --- a/arch/sparc/lib/Makefile
11185 +++ b/arch/sparc/lib/Makefile
11186 @@ -2,7 +2,7 @@
11187 #
11188
11189 asflags-y := -ansi -DST_DIV0=0x02
11190 -ccflags-y := -Werror
11191 +#ccflags-y := -Werror
11192
11193 lib-$(CONFIG_SPARC32) += ashrdi3.o
11194 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11195 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11196 index 05dac43..76f8ed4 100644
11197 --- a/arch/sparc/lib/atomic_64.S
11198 +++ b/arch/sparc/lib/atomic_64.S
11199 @@ -15,11 +15,22 @@
11200 * a value and does the barriers.
11201 */
11202
11203 -#define ATOMIC_OP(op) \
11204 -ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11205 +#ifdef CONFIG_PAX_REFCOUNT
11206 +#define __REFCOUNT_OP(op) op##cc
11207 +#define __OVERFLOW_IOP tvs %icc, 6;
11208 +#define __OVERFLOW_XOP tvs %xcc, 6;
11209 +#else
11210 +#define __REFCOUNT_OP(op) op
11211 +#define __OVERFLOW_IOP
11212 +#define __OVERFLOW_XOP
11213 +#endif
11214 +
11215 +#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11216 +ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 BACKOFF_SETUP(%o2); \
11218 1: lduw [%o1], %g1; \
11219 - op %g1, %o0, %g7; \
11220 + asm_op %g1, %o0, %g7; \
11221 + post_op \
11222 cas [%o1], %g1, %g7; \
11223 cmp %g1, %g7; \
11224 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11225 @@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11226 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11227 ENDPROC(atomic_##op); \
11228
11229 -#define ATOMIC_OP_RETURN(op) \
11230 -ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11231 +#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11232 + __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11233 +
11234 +#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11235 +ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11236 BACKOFF_SETUP(%o2); \
11237 1: lduw [%o1], %g1; \
11238 - op %g1, %o0, %g7; \
11239 + asm_op %g1, %o0, %g7; \
11240 + post_op \
11241 cas [%o1], %g1, %g7; \
11242 cmp %g1, %g7; \
11243 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11244 @@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11245 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11246 ENDPROC(atomic_##op##_return);
11247
11248 +#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11249 + __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11250 +
11251 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11252
11253 ATOMIC_OPS(add)
11254 @@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11255
11256 #undef ATOMIC_OPS
11257 #undef ATOMIC_OP_RETURN
11258 +#undef __ATOMIC_OP_RETURN
11259 #undef ATOMIC_OP
11260 +#undef __ATOMIC_OP
11261
11262 -#define ATOMIC64_OP(op) \
11263 -ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11264 +#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11265 +ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11266 BACKOFF_SETUP(%o2); \
11267 1: ldx [%o1], %g1; \
11268 - op %g1, %o0, %g7; \
11269 + asm_op %g1, %o0, %g7; \
11270 + post_op \
11271 casx [%o1], %g1, %g7; \
11272 cmp %g1, %g7; \
11273 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11274 @@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11275 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11276 ENDPROC(atomic64_##op); \
11277
11278 -#define ATOMIC64_OP_RETURN(op) \
11279 -ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11280 +#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11281 + __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11282 +
11283 +#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11284 +ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11285 BACKOFF_SETUP(%o2); \
11286 1: ldx [%o1], %g1; \
11287 - op %g1, %o0, %g7; \
11288 + asm_op %g1, %o0, %g7; \
11289 + post_op \
11290 casx [%o1], %g1, %g7; \
11291 cmp %g1, %g7; \
11292 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11293 @@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11294 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11295 ENDPROC(atomic64_##op##_return);
11296
11297 +#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11298 +i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11299 +
11300 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11301
11302 ATOMIC64_OPS(add)
11303 @@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11304
11305 #undef ATOMIC64_OPS
11306 #undef ATOMIC64_OP_RETURN
11307 +#undef __ATOMIC64_OP_RETURN
11308 #undef ATOMIC64_OP
11309 +#undef __ATOMIC64_OP
11310 +#undef __OVERFLOW_XOP
11311 +#undef __OVERFLOW_IOP
11312 +#undef __REFCOUNT_OP
11313
11314 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11315 BACKOFF_SETUP(%o2)
11316 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11317 index 1d649a9..fbc5bfc 100644
11318 --- a/arch/sparc/lib/ksyms.c
11319 +++ b/arch/sparc/lib/ksyms.c
11320 @@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11321 /* Atomic counter implementation. */
11322 #define ATOMIC_OP(op) \
11323 EXPORT_SYMBOL(atomic_##op); \
11324 -EXPORT_SYMBOL(atomic64_##op);
11325 +EXPORT_SYMBOL(atomic_##op##_unchecked); \
11326 +EXPORT_SYMBOL(atomic64_##op); \
11327 +EXPORT_SYMBOL(atomic64_##op##_unchecked);
11328
11329 #define ATOMIC_OP_RETURN(op) \
11330 EXPORT_SYMBOL(atomic_##op##_return); \
11331 @@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11332 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11333
11334 ATOMIC_OPS(add)
11335 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
11336 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11337 ATOMIC_OPS(sub)
11338
11339 #undef ATOMIC_OPS
11340 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11341 index 30c3ecc..736f015 100644
11342 --- a/arch/sparc/mm/Makefile
11343 +++ b/arch/sparc/mm/Makefile
11344 @@ -2,7 +2,7 @@
11345 #
11346
11347 asflags-y := -ansi
11348 -ccflags-y := -Werror
11349 +#ccflags-y := -Werror
11350
11351 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11352 obj-y += fault_$(BITS).o
11353 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11354 index 908e8c1..1524793 100644
11355 --- a/arch/sparc/mm/fault_32.c
11356 +++ b/arch/sparc/mm/fault_32.c
11357 @@ -21,6 +21,9 @@
11358 #include <linux/perf_event.h>
11359 #include <linux/interrupt.h>
11360 #include <linux/kdebug.h>
11361 +#include <linux/slab.h>
11362 +#include <linux/pagemap.h>
11363 +#include <linux/compiler.h>
11364
11365 #include <asm/page.h>
11366 #include <asm/pgtable.h>
11367 @@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11368 return safe_compute_effective_address(regs, insn);
11369 }
11370
11371 +#ifdef CONFIG_PAX_PAGEEXEC
11372 +#ifdef CONFIG_PAX_DLRESOLVE
11373 +static void pax_emuplt_close(struct vm_area_struct *vma)
11374 +{
11375 + vma->vm_mm->call_dl_resolve = 0UL;
11376 +}
11377 +
11378 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11379 +{
11380 + unsigned int *kaddr;
11381 +
11382 + vmf->page = alloc_page(GFP_HIGHUSER);
11383 + if (!vmf->page)
11384 + return VM_FAULT_OOM;
11385 +
11386 + kaddr = kmap(vmf->page);
11387 + memset(kaddr, 0, PAGE_SIZE);
11388 + kaddr[0] = 0x9DE3BFA8U; /* save */
11389 + flush_dcache_page(vmf->page);
11390 + kunmap(vmf->page);
11391 + return VM_FAULT_MAJOR;
11392 +}
11393 +
11394 +static const struct vm_operations_struct pax_vm_ops = {
11395 + .close = pax_emuplt_close,
11396 + .fault = pax_emuplt_fault
11397 +};
11398 +
11399 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11400 +{
11401 + int ret;
11402 +
11403 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11404 + vma->vm_mm = current->mm;
11405 + vma->vm_start = addr;
11406 + vma->vm_end = addr + PAGE_SIZE;
11407 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11408 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11409 + vma->vm_ops = &pax_vm_ops;
11410 +
11411 + ret = insert_vm_struct(current->mm, vma);
11412 + if (ret)
11413 + return ret;
11414 +
11415 + ++current->mm->total_vm;
11416 + return 0;
11417 +}
11418 +#endif
11419 +
11420 +/*
11421 + * PaX: decide what to do with offenders (regs->pc = fault address)
11422 + *
11423 + * returns 1 when task should be killed
11424 + * 2 when patched PLT trampoline was detected
11425 + * 3 when unpatched PLT trampoline was detected
11426 + */
11427 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11428 +{
11429 +
11430 +#ifdef CONFIG_PAX_EMUPLT
11431 + int err;
11432 +
11433 + do { /* PaX: patched PLT emulation #1 */
11434 + unsigned int sethi1, sethi2, jmpl;
11435 +
11436 + err = get_user(sethi1, (unsigned int *)regs->pc);
11437 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11438 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11439 +
11440 + if (err)
11441 + break;
11442 +
11443 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11444 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11445 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11446 + {
11447 + unsigned int addr;
11448 +
11449 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11450 + addr = regs->u_regs[UREG_G1];
11451 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11452 + regs->pc = addr;
11453 + regs->npc = addr+4;
11454 + return 2;
11455 + }
11456 + } while (0);
11457 +
11458 + do { /* PaX: patched PLT emulation #2 */
11459 + unsigned int ba;
11460 +
11461 + err = get_user(ba, (unsigned int *)regs->pc);
11462 +
11463 + if (err)
11464 + break;
11465 +
11466 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11467 + unsigned int addr;
11468 +
11469 + if ((ba & 0xFFC00000U) == 0x30800000U)
11470 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11471 + else
11472 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11473 + regs->pc = addr;
11474 + regs->npc = addr+4;
11475 + return 2;
11476 + }
11477 + } while (0);
11478 +
11479 + do { /* PaX: patched PLT emulation #3 */
11480 + unsigned int sethi, bajmpl, nop;
11481 +
11482 + err = get_user(sethi, (unsigned int *)regs->pc);
11483 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11484 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11485 +
11486 + if (err)
11487 + break;
11488 +
11489 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11490 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11491 + nop == 0x01000000U)
11492 + {
11493 + unsigned int addr;
11494 +
11495 + addr = (sethi & 0x003FFFFFU) << 10;
11496 + regs->u_regs[UREG_G1] = addr;
11497 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11498 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11499 + else
11500 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11501 + regs->pc = addr;
11502 + regs->npc = addr+4;
11503 + return 2;
11504 + }
11505 + } while (0);
11506 +
11507 + do { /* PaX: unpatched PLT emulation step 1 */
11508 + unsigned int sethi, ba, nop;
11509 +
11510 + err = get_user(sethi, (unsigned int *)regs->pc);
11511 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
11512 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
11513 +
11514 + if (err)
11515 + break;
11516 +
11517 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11518 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11519 + nop == 0x01000000U)
11520 + {
11521 + unsigned int addr, save, call;
11522 +
11523 + if ((ba & 0xFFC00000U) == 0x30800000U)
11524 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11525 + else
11526 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11527 +
11528 + err = get_user(save, (unsigned int *)addr);
11529 + err |= get_user(call, (unsigned int *)(addr+4));
11530 + err |= get_user(nop, (unsigned int *)(addr+8));
11531 + if (err)
11532 + break;
11533 +
11534 +#ifdef CONFIG_PAX_DLRESOLVE
11535 + if (save == 0x9DE3BFA8U &&
11536 + (call & 0xC0000000U) == 0x40000000U &&
11537 + nop == 0x01000000U)
11538 + {
11539 + struct vm_area_struct *vma;
11540 + unsigned long call_dl_resolve;
11541 +
11542 + down_read(&current->mm->mmap_sem);
11543 + call_dl_resolve = current->mm->call_dl_resolve;
11544 + up_read(&current->mm->mmap_sem);
11545 + if (likely(call_dl_resolve))
11546 + goto emulate;
11547 +
11548 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11549 +
11550 + down_write(&current->mm->mmap_sem);
11551 + if (current->mm->call_dl_resolve) {
11552 + call_dl_resolve = current->mm->call_dl_resolve;
11553 + up_write(&current->mm->mmap_sem);
11554 + if (vma)
11555 + kmem_cache_free(vm_area_cachep, vma);
11556 + goto emulate;
11557 + }
11558 +
11559 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11560 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11561 + up_write(&current->mm->mmap_sem);
11562 + if (vma)
11563 + kmem_cache_free(vm_area_cachep, vma);
11564 + return 1;
11565 + }
11566 +
11567 + if (pax_insert_vma(vma, call_dl_resolve)) {
11568 + up_write(&current->mm->mmap_sem);
11569 + kmem_cache_free(vm_area_cachep, vma);
11570 + return 1;
11571 + }
11572 +
11573 + current->mm->call_dl_resolve = call_dl_resolve;
11574 + up_write(&current->mm->mmap_sem);
11575 +
11576 +emulate:
11577 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11578 + regs->pc = call_dl_resolve;
11579 + regs->npc = addr+4;
11580 + return 3;
11581 + }
11582 +#endif
11583 +
11584 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11585 + if ((save & 0xFFC00000U) == 0x05000000U &&
11586 + (call & 0xFFFFE000U) == 0x85C0A000U &&
11587 + nop == 0x01000000U)
11588 + {
11589 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11590 + regs->u_regs[UREG_G2] = addr + 4;
11591 + addr = (save & 0x003FFFFFU) << 10;
11592 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11593 + regs->pc = addr;
11594 + regs->npc = addr+4;
11595 + return 3;
11596 + }
11597 + }
11598 + } while (0);
11599 +
11600 + do { /* PaX: unpatched PLT emulation step 2 */
11601 + unsigned int save, call, nop;
11602 +
11603 + err = get_user(save, (unsigned int *)(regs->pc-4));
11604 + err |= get_user(call, (unsigned int *)regs->pc);
11605 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
11606 + if (err)
11607 + break;
11608 +
11609 + if (save == 0x9DE3BFA8U &&
11610 + (call & 0xC0000000U) == 0x40000000U &&
11611 + nop == 0x01000000U)
11612 + {
11613 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11614 +
11615 + regs->u_regs[UREG_RETPC] = regs->pc;
11616 + regs->pc = dl_resolve;
11617 + regs->npc = dl_resolve+4;
11618 + return 3;
11619 + }
11620 + } while (0);
11621 +#endif
11622 +
11623 + return 1;
11624 +}
11625 +
11626 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11627 +{
11628 + unsigned long i;
11629 +
11630 + printk(KERN_ERR "PAX: bytes at PC: ");
11631 + for (i = 0; i < 8; i++) {
11632 + unsigned int c;
11633 + if (get_user(c, (unsigned int *)pc+i))
11634 + printk(KERN_CONT "???????? ");
11635 + else
11636 + printk(KERN_CONT "%08x ", c);
11637 + }
11638 + printk("\n");
11639 +}
11640 +#endif
11641 +
11642 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11643 int text_fault)
11644 {
11645 @@ -226,6 +500,24 @@ good_area:
11646 if (!(vma->vm_flags & VM_WRITE))
11647 goto bad_area;
11648 } else {
11649 +
11650 +#ifdef CONFIG_PAX_PAGEEXEC
11651 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11652 + up_read(&mm->mmap_sem);
11653 + switch (pax_handle_fetch_fault(regs)) {
11654 +
11655 +#ifdef CONFIG_PAX_EMUPLT
11656 + case 2:
11657 + case 3:
11658 + return;
11659 +#endif
11660 +
11661 + }
11662 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11663 + do_group_exit(SIGKILL);
11664 + }
11665 +#endif
11666 +
11667 /* Allow reads even for write-only mappings */
11668 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11669 goto bad_area;
11670 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11671 index 18fcd71..e4fe821 100644
11672 --- a/arch/sparc/mm/fault_64.c
11673 +++ b/arch/sparc/mm/fault_64.c
11674 @@ -22,6 +22,9 @@
11675 #include <linux/kdebug.h>
11676 #include <linux/percpu.h>
11677 #include <linux/context_tracking.h>
11678 +#include <linux/slab.h>
11679 +#include <linux/pagemap.h>
11680 +#include <linux/compiler.h>
11681
11682 #include <asm/page.h>
11683 #include <asm/pgtable.h>
11684 @@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11685 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11686 regs->tpc);
11687 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11688 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11689 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11690 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11691 dump_stack();
11692 unhandled_fault(regs->tpc, current, regs);
11693 @@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11694 show_regs(regs);
11695 }
11696
11697 +#ifdef CONFIG_PAX_PAGEEXEC
11698 +#ifdef CONFIG_PAX_DLRESOLVE
11699 +static void pax_emuplt_close(struct vm_area_struct *vma)
11700 +{
11701 + vma->vm_mm->call_dl_resolve = 0UL;
11702 +}
11703 +
11704 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11705 +{
11706 + unsigned int *kaddr;
11707 +
11708 + vmf->page = alloc_page(GFP_HIGHUSER);
11709 + if (!vmf->page)
11710 + return VM_FAULT_OOM;
11711 +
11712 + kaddr = kmap(vmf->page);
11713 + memset(kaddr, 0, PAGE_SIZE);
11714 + kaddr[0] = 0x9DE3BFA8U; /* save */
11715 + flush_dcache_page(vmf->page);
11716 + kunmap(vmf->page);
11717 + return VM_FAULT_MAJOR;
11718 +}
11719 +
11720 +static const struct vm_operations_struct pax_vm_ops = {
11721 + .close = pax_emuplt_close,
11722 + .fault = pax_emuplt_fault
11723 +};
11724 +
11725 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11726 +{
11727 + int ret;
11728 +
11729 + INIT_LIST_HEAD(&vma->anon_vma_chain);
11730 + vma->vm_mm = current->mm;
11731 + vma->vm_start = addr;
11732 + vma->vm_end = addr + PAGE_SIZE;
11733 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11734 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11735 + vma->vm_ops = &pax_vm_ops;
11736 +
11737 + ret = insert_vm_struct(current->mm, vma);
11738 + if (ret)
11739 + return ret;
11740 +
11741 + ++current->mm->total_vm;
11742 + return 0;
11743 +}
11744 +#endif
11745 +
11746 +/*
11747 + * PaX: decide what to do with offenders (regs->tpc = fault address)
11748 + *
11749 + * returns 1 when task should be killed
11750 + * 2 when patched PLT trampoline was detected
11751 + * 3 when unpatched PLT trampoline was detected
11752 + */
11753 +static int pax_handle_fetch_fault(struct pt_regs *regs)
11754 +{
11755 +
11756 +#ifdef CONFIG_PAX_EMUPLT
11757 + int err;
11758 +
11759 + do { /* PaX: patched PLT emulation #1 */
11760 + unsigned int sethi1, sethi2, jmpl;
11761 +
11762 + err = get_user(sethi1, (unsigned int *)regs->tpc);
11763 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11764 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11765 +
11766 + if (err)
11767 + break;
11768 +
11769 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11770 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
11771 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
11772 + {
11773 + unsigned long addr;
11774 +
11775 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11776 + addr = regs->u_regs[UREG_G1];
11777 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11778 +
11779 + if (test_thread_flag(TIF_32BIT))
11780 + addr &= 0xFFFFFFFFUL;
11781 +
11782 + regs->tpc = addr;
11783 + regs->tnpc = addr+4;
11784 + return 2;
11785 + }
11786 + } while (0);
11787 +
11788 + do { /* PaX: patched PLT emulation #2 */
11789 + unsigned int ba;
11790 +
11791 + err = get_user(ba, (unsigned int *)regs->tpc);
11792 +
11793 + if (err)
11794 + break;
11795 +
11796 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11797 + unsigned long addr;
11798 +
11799 + if ((ba & 0xFFC00000U) == 0x30800000U)
11800 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11801 + else
11802 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11803 +
11804 + if (test_thread_flag(TIF_32BIT))
11805 + addr &= 0xFFFFFFFFUL;
11806 +
11807 + regs->tpc = addr;
11808 + regs->tnpc = addr+4;
11809 + return 2;
11810 + }
11811 + } while (0);
11812 +
11813 + do { /* PaX: patched PLT emulation #3 */
11814 + unsigned int sethi, bajmpl, nop;
11815 +
11816 + err = get_user(sethi, (unsigned int *)regs->tpc);
11817 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11818 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11819 +
11820 + if (err)
11821 + break;
11822 +
11823 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11824 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11825 + nop == 0x01000000U)
11826 + {
11827 + unsigned long addr;
11828 +
11829 + addr = (sethi & 0x003FFFFFU) << 10;
11830 + regs->u_regs[UREG_G1] = addr;
11831 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11832 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11833 + else
11834 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11835 +
11836 + if (test_thread_flag(TIF_32BIT))
11837 + addr &= 0xFFFFFFFFUL;
11838 +
11839 + regs->tpc = addr;
11840 + regs->tnpc = addr+4;
11841 + return 2;
11842 + }
11843 + } while (0);
11844 +
11845 + do { /* PaX: patched PLT emulation #4 */
11846 + unsigned int sethi, mov1, call, mov2;
11847 +
11848 + err = get_user(sethi, (unsigned int *)regs->tpc);
11849 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11850 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
11851 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11852 +
11853 + if (err)
11854 + break;
11855 +
11856 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11857 + mov1 == 0x8210000FU &&
11858 + (call & 0xC0000000U) == 0x40000000U &&
11859 + mov2 == 0x9E100001U)
11860 + {
11861 + unsigned long addr;
11862 +
11863 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11864 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11865 +
11866 + if (test_thread_flag(TIF_32BIT))
11867 + addr &= 0xFFFFFFFFUL;
11868 +
11869 + regs->tpc = addr;
11870 + regs->tnpc = addr+4;
11871 + return 2;
11872 + }
11873 + } while (0);
11874 +
11875 + do { /* PaX: patched PLT emulation #5 */
11876 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11877 +
11878 + err = get_user(sethi, (unsigned int *)regs->tpc);
11879 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11880 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11881 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11882 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11883 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11884 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11885 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11886 +
11887 + if (err)
11888 + break;
11889 +
11890 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11891 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11892 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11893 + (or1 & 0xFFFFE000U) == 0x82106000U &&
11894 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
11895 + sllx == 0x83287020U &&
11896 + jmpl == 0x81C04005U &&
11897 + nop == 0x01000000U)
11898 + {
11899 + unsigned long addr;
11900 +
11901 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11902 + regs->u_regs[UREG_G1] <<= 32;
11903 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11904 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11905 + regs->tpc = addr;
11906 + regs->tnpc = addr+4;
11907 + return 2;
11908 + }
11909 + } while (0);
11910 +
11911 + do { /* PaX: patched PLT emulation #6 */
11912 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11913 +
11914 + err = get_user(sethi, (unsigned int *)regs->tpc);
11915 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11916 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11917 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11918 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
11919 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11920 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11921 +
11922 + if (err)
11923 + break;
11924 +
11925 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11926 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
11927 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11928 + sllx == 0x83287020U &&
11929 + (or & 0xFFFFE000U) == 0x8A116000U &&
11930 + jmpl == 0x81C04005U &&
11931 + nop == 0x01000000U)
11932 + {
11933 + unsigned long addr;
11934 +
11935 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11936 + regs->u_regs[UREG_G1] <<= 32;
11937 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11938 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11939 + regs->tpc = addr;
11940 + regs->tnpc = addr+4;
11941 + return 2;
11942 + }
11943 + } while (0);
11944 +
11945 + do { /* PaX: unpatched PLT emulation step 1 */
11946 + unsigned int sethi, ba, nop;
11947 +
11948 + err = get_user(sethi, (unsigned int *)regs->tpc);
11949 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11950 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11951 +
11952 + if (err)
11953 + break;
11954 +
11955 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
11956 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11957 + nop == 0x01000000U)
11958 + {
11959 + unsigned long addr;
11960 + unsigned int save, call;
11961 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11962 +
11963 + if ((ba & 0xFFC00000U) == 0x30800000U)
11964 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11965 + else
11966 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11967 +
11968 + if (test_thread_flag(TIF_32BIT))
11969 + addr &= 0xFFFFFFFFUL;
11970 +
11971 + err = get_user(save, (unsigned int *)addr);
11972 + err |= get_user(call, (unsigned int *)(addr+4));
11973 + err |= get_user(nop, (unsigned int *)(addr+8));
11974 + if (err)
11975 + break;
11976 +
11977 +#ifdef CONFIG_PAX_DLRESOLVE
11978 + if (save == 0x9DE3BFA8U &&
11979 + (call & 0xC0000000U) == 0x40000000U &&
11980 + nop == 0x01000000U)
11981 + {
11982 + struct vm_area_struct *vma;
11983 + unsigned long call_dl_resolve;
11984 +
11985 + down_read(&current->mm->mmap_sem);
11986 + call_dl_resolve = current->mm->call_dl_resolve;
11987 + up_read(&current->mm->mmap_sem);
11988 + if (likely(call_dl_resolve))
11989 + goto emulate;
11990 +
11991 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11992 +
11993 + down_write(&current->mm->mmap_sem);
11994 + if (current->mm->call_dl_resolve) {
11995 + call_dl_resolve = current->mm->call_dl_resolve;
11996 + up_write(&current->mm->mmap_sem);
11997 + if (vma)
11998 + kmem_cache_free(vm_area_cachep, vma);
11999 + goto emulate;
12000 + }
12001 +
12002 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12003 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12004 + up_write(&current->mm->mmap_sem);
12005 + if (vma)
12006 + kmem_cache_free(vm_area_cachep, vma);
12007 + return 1;
12008 + }
12009 +
12010 + if (pax_insert_vma(vma, call_dl_resolve)) {
12011 + up_write(&current->mm->mmap_sem);
12012 + kmem_cache_free(vm_area_cachep, vma);
12013 + return 1;
12014 + }
12015 +
12016 + current->mm->call_dl_resolve = call_dl_resolve;
12017 + up_write(&current->mm->mmap_sem);
12018 +
12019 +emulate:
12020 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12021 + regs->tpc = call_dl_resolve;
12022 + regs->tnpc = addr+4;
12023 + return 3;
12024 + }
12025 +#endif
12026 +
12027 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12028 + if ((save & 0xFFC00000U) == 0x05000000U &&
12029 + (call & 0xFFFFE000U) == 0x85C0A000U &&
12030 + nop == 0x01000000U)
12031 + {
12032 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12033 + regs->u_regs[UREG_G2] = addr + 4;
12034 + addr = (save & 0x003FFFFFU) << 10;
12035 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12036 +
12037 + if (test_thread_flag(TIF_32BIT))
12038 + addr &= 0xFFFFFFFFUL;
12039 +
12040 + regs->tpc = addr;
12041 + regs->tnpc = addr+4;
12042 + return 3;
12043 + }
12044 +
12045 + /* PaX: 64-bit PLT stub */
12046 + err = get_user(sethi1, (unsigned int *)addr);
12047 + err |= get_user(sethi2, (unsigned int *)(addr+4));
12048 + err |= get_user(or1, (unsigned int *)(addr+8));
12049 + err |= get_user(or2, (unsigned int *)(addr+12));
12050 + err |= get_user(sllx, (unsigned int *)(addr+16));
12051 + err |= get_user(add, (unsigned int *)(addr+20));
12052 + err |= get_user(jmpl, (unsigned int *)(addr+24));
12053 + err |= get_user(nop, (unsigned int *)(addr+28));
12054 + if (err)
12055 + break;
12056 +
12057 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12058 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12059 + (or1 & 0xFFFFE000U) == 0x88112000U &&
12060 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
12061 + sllx == 0x89293020U &&
12062 + add == 0x8A010005U &&
12063 + jmpl == 0x89C14000U &&
12064 + nop == 0x01000000U)
12065 + {
12066 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12067 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12068 + regs->u_regs[UREG_G4] <<= 32;
12069 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12070 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12071 + regs->u_regs[UREG_G4] = addr + 24;
12072 + addr = regs->u_regs[UREG_G5];
12073 + regs->tpc = addr;
12074 + regs->tnpc = addr+4;
12075 + return 3;
12076 + }
12077 + }
12078 + } while (0);
12079 +
12080 +#ifdef CONFIG_PAX_DLRESOLVE
12081 + do { /* PaX: unpatched PLT emulation step 2 */
12082 + unsigned int save, call, nop;
12083 +
12084 + err = get_user(save, (unsigned int *)(regs->tpc-4));
12085 + err |= get_user(call, (unsigned int *)regs->tpc);
12086 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12087 + if (err)
12088 + break;
12089 +
12090 + if (save == 0x9DE3BFA8U &&
12091 + (call & 0xC0000000U) == 0x40000000U &&
12092 + nop == 0x01000000U)
12093 + {
12094 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12095 +
12096 + if (test_thread_flag(TIF_32BIT))
12097 + dl_resolve &= 0xFFFFFFFFUL;
12098 +
12099 + regs->u_regs[UREG_RETPC] = regs->tpc;
12100 + regs->tpc = dl_resolve;
12101 + regs->tnpc = dl_resolve+4;
12102 + return 3;
12103 + }
12104 + } while (0);
12105 +#endif
12106 +
12107 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12108 + unsigned int sethi, ba, nop;
12109 +
12110 + err = get_user(sethi, (unsigned int *)regs->tpc);
12111 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12112 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12113 +
12114 + if (err)
12115 + break;
12116 +
12117 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
12118 + (ba & 0xFFF00000U) == 0x30600000U &&
12119 + nop == 0x01000000U)
12120 + {
12121 + unsigned long addr;
12122 +
12123 + addr = (sethi & 0x003FFFFFU) << 10;
12124 + regs->u_regs[UREG_G1] = addr;
12125 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12126 +
12127 + if (test_thread_flag(TIF_32BIT))
12128 + addr &= 0xFFFFFFFFUL;
12129 +
12130 + regs->tpc = addr;
12131 + regs->tnpc = addr+4;
12132 + return 2;
12133 + }
12134 + } while (0);
12135 +
12136 +#endif
12137 +
12138 + return 1;
12139 +}
12140 +
12141 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12142 +{
12143 + unsigned long i;
12144 +
12145 + printk(KERN_ERR "PAX: bytes at PC: ");
12146 + for (i = 0; i < 8; i++) {
12147 + unsigned int c;
12148 + if (get_user(c, (unsigned int *)pc+i))
12149 + printk(KERN_CONT "???????? ");
12150 + else
12151 + printk(KERN_CONT "%08x ", c);
12152 + }
12153 + printk("\n");
12154 +}
12155 +#endif
12156 +
12157 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12158 {
12159 enum ctx_state prev_state = exception_enter();
12160 @@ -353,6 +816,29 @@ retry:
12161 if (!vma)
12162 goto bad_area;
12163
12164 +#ifdef CONFIG_PAX_PAGEEXEC
12165 + /* PaX: detect ITLB misses on non-exec pages */
12166 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12167 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12168 + {
12169 + if (address != regs->tpc)
12170 + goto good_area;
12171 +
12172 + up_read(&mm->mmap_sem);
12173 + switch (pax_handle_fetch_fault(regs)) {
12174 +
12175 +#ifdef CONFIG_PAX_EMUPLT
12176 + case 2:
12177 + case 3:
12178 + return;
12179 +#endif
12180 +
12181 + }
12182 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12183 + do_group_exit(SIGKILL);
12184 + }
12185 +#endif
12186 +
12187 /* Pure DTLB misses do not tell us whether the fault causing
12188 * load/store/atomic was a write or not, it only says that there
12189 * was no match. So in such a case we (carefully) read the
12190 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12191 index d329537..2c3746a 100644
12192 --- a/arch/sparc/mm/hugetlbpage.c
12193 +++ b/arch/sparc/mm/hugetlbpage.c
12194 @@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12195 unsigned long addr,
12196 unsigned long len,
12197 unsigned long pgoff,
12198 - unsigned long flags)
12199 + unsigned long flags,
12200 + unsigned long offset)
12201 {
12202 + struct mm_struct *mm = current->mm;
12203 unsigned long task_size = TASK_SIZE;
12204 struct vm_unmapped_area_info info;
12205
12206 @@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12207
12208 info.flags = 0;
12209 info.length = len;
12210 - info.low_limit = TASK_UNMAPPED_BASE;
12211 + info.low_limit = mm->mmap_base;
12212 info.high_limit = min(task_size, VA_EXCLUDE_START);
12213 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12214 info.align_offset = 0;
12215 + info.threadstack_offset = offset;
12216 addr = vm_unmapped_area(&info);
12217
12218 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12219 VM_BUG_ON(addr != -ENOMEM);
12220 info.low_limit = VA_EXCLUDE_END;
12221 +
12222 +#ifdef CONFIG_PAX_RANDMMAP
12223 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12224 + info.low_limit += mm->delta_mmap;
12225 +#endif
12226 +
12227 info.high_limit = task_size;
12228 addr = vm_unmapped_area(&info);
12229 }
12230 @@ -55,7 +64,8 @@ static unsigned long
12231 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12232 const unsigned long len,
12233 const unsigned long pgoff,
12234 - const unsigned long flags)
12235 + const unsigned long flags,
12236 + const unsigned long offset)
12237 {
12238 struct mm_struct *mm = current->mm;
12239 unsigned long addr = addr0;
12240 @@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12241 info.high_limit = mm->mmap_base;
12242 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12243 info.align_offset = 0;
12244 + info.threadstack_offset = offset;
12245 addr = vm_unmapped_area(&info);
12246
12247 /*
12248 @@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12249 VM_BUG_ON(addr != -ENOMEM);
12250 info.flags = 0;
12251 info.low_limit = TASK_UNMAPPED_BASE;
12252 +
12253 +#ifdef CONFIG_PAX_RANDMMAP
12254 + if (mm->pax_flags & MF_PAX_RANDMMAP)
12255 + info.low_limit += mm->delta_mmap;
12256 +#endif
12257 +
12258 info.high_limit = STACK_TOP32;
12259 addr = vm_unmapped_area(&info);
12260 }
12261 @@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12262 struct mm_struct *mm = current->mm;
12263 struct vm_area_struct *vma;
12264 unsigned long task_size = TASK_SIZE;
12265 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12266
12267 if (test_thread_flag(TIF_32BIT))
12268 task_size = STACK_TOP32;
12269 @@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12270 return addr;
12271 }
12272
12273 +#ifdef CONFIG_PAX_RANDMMAP
12274 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12275 +#endif
12276 +
12277 if (addr) {
12278 addr = ALIGN(addr, HPAGE_SIZE);
12279 vma = find_vma(mm, addr);
12280 - if (task_size - len >= addr &&
12281 - (!vma || addr + len <= vma->vm_start))
12282 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12283 return addr;
12284 }
12285 if (mm->get_unmapped_area == arch_get_unmapped_area)
12286 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12287 - pgoff, flags);
12288 + pgoff, flags, offset);
12289 else
12290 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12291 - pgoff, flags);
12292 + pgoff, flags, offset);
12293 }
12294
12295 pte_t *huge_pte_alloc(struct mm_struct *mm,
12296 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12297 index 2d91c62..17a8fff 100644
12298 --- a/arch/sparc/mm/init_64.c
12299 +++ b/arch/sparc/mm/init_64.c
12300 @@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12301 int num_kernel_image_mappings;
12302
12303 #ifdef CONFIG_DEBUG_DCFLUSH
12304 -atomic_t dcpage_flushes = ATOMIC_INIT(0);
12305 +atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12306 #ifdef CONFIG_SMP
12307 -atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12308 +atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12309 #endif
12310 #endif
12311
12312 @@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12313 {
12314 BUG_ON(tlb_type == hypervisor);
12315 #ifdef CONFIG_DEBUG_DCFLUSH
12316 - atomic_inc(&dcpage_flushes);
12317 + atomic_inc_unchecked(&dcpage_flushes);
12318 #endif
12319
12320 #ifdef DCACHE_ALIASING_POSSIBLE
12321 @@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12322
12323 #ifdef CONFIG_DEBUG_DCFLUSH
12324 seq_printf(m, "DCPageFlushes\t: %d\n",
12325 - atomic_read(&dcpage_flushes));
12326 + atomic_read_unchecked(&dcpage_flushes));
12327 #ifdef CONFIG_SMP
12328 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12329 - atomic_read(&dcpage_flushes_xcall));
12330 + atomic_read_unchecked(&dcpage_flushes_xcall));
12331 #endif /* CONFIG_SMP */
12332 #endif /* CONFIG_DEBUG_DCFLUSH */
12333 }
12334 diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12335 index 7cca418..53fc030 100644
12336 --- a/arch/tile/Kconfig
12337 +++ b/arch/tile/Kconfig
12338 @@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12339
12340 config KEXEC
12341 bool "kexec system call"
12342 + depends on !GRKERNSEC_KMEM
12343 ---help---
12344 kexec is a system call that implements the ability to shutdown your
12345 current kernel, and to start another kernel. It is like a reboot
12346 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12347 index 7b11c5f..755a026 100644
12348 --- a/arch/tile/include/asm/atomic_64.h
12349 +++ b/arch/tile/include/asm/atomic_64.h
12350 @@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12351
12352 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12353
12354 +#define atomic64_read_unchecked(v) atomic64_read(v)
12355 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12356 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12357 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12358 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12359 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
12360 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12361 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
12362 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12363 +
12364 /* Define this to indicate that cmpxchg is an efficient operation. */
12365 #define __HAVE_ARCH_CMPXCHG
12366
12367 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12368 index 6160761..00cac88 100644
12369 --- a/arch/tile/include/asm/cache.h
12370 +++ b/arch/tile/include/asm/cache.h
12371 @@ -15,11 +15,12 @@
12372 #ifndef _ASM_TILE_CACHE_H
12373 #define _ASM_TILE_CACHE_H
12374
12375 +#include <linux/const.h>
12376 #include <arch/chip.h>
12377
12378 /* bytes per L1 data cache line */
12379 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12380 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12381 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12382
12383 /* bytes per L2 cache line */
12384 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12385 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12386 index b6cde32..c0cb736 100644
12387 --- a/arch/tile/include/asm/uaccess.h
12388 +++ b/arch/tile/include/asm/uaccess.h
12389 @@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12390 const void __user *from,
12391 unsigned long n)
12392 {
12393 - int sz = __compiletime_object_size(to);
12394 + size_t sz = __compiletime_object_size(to);
12395
12396 - if (likely(sz == -1 || sz >= n))
12397 + if (likely(sz == (size_t)-1 || sz >= n))
12398 n = _copy_from_user(to, from, n);
12399 else
12400 copy_from_user_overflow();
12401 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12402 index e514899..f8743c4 100644
12403 --- a/arch/tile/mm/hugetlbpage.c
12404 +++ b/arch/tile/mm/hugetlbpage.c
12405 @@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12406 info.high_limit = TASK_SIZE;
12407 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12408 info.align_offset = 0;
12409 + info.threadstack_offset = 0;
12410 return vm_unmapped_area(&info);
12411 }
12412
12413 @@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12414 info.high_limit = current->mm->mmap_base;
12415 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12416 info.align_offset = 0;
12417 + info.threadstack_offset = 0;
12418 addr = vm_unmapped_area(&info);
12419
12420 /*
12421 diff --git a/arch/um/Makefile b/arch/um/Makefile
12422 index e4b1a96..16162f8 100644
12423 --- a/arch/um/Makefile
12424 +++ b/arch/um/Makefile
12425 @@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12426 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12427 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12428
12429 +ifdef CONSTIFY_PLUGIN
12430 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12431 +endif
12432 +
12433 #This will adjust *FLAGS accordingly to the platform.
12434 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12435
12436 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12437 index 19e1bdd..3665b77 100644
12438 --- a/arch/um/include/asm/cache.h
12439 +++ b/arch/um/include/asm/cache.h
12440 @@ -1,6 +1,7 @@
12441 #ifndef __UM_CACHE_H
12442 #define __UM_CACHE_H
12443
12444 +#include <linux/const.h>
12445
12446 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12447 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12448 @@ -12,6 +13,6 @@
12449 # define L1_CACHE_SHIFT 5
12450 #endif
12451
12452 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12453 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12454
12455 #endif
12456 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12457 index 2e0a6b1..a64d0f5 100644
12458 --- a/arch/um/include/asm/kmap_types.h
12459 +++ b/arch/um/include/asm/kmap_types.h
12460 @@ -8,6 +8,6 @@
12461
12462 /* No more #include "asm/arch/kmap_types.h" ! */
12463
12464 -#define KM_TYPE_NR 14
12465 +#define KM_TYPE_NR 15
12466
12467 #endif
12468 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12469 index 71c5d13..4c7b9f1 100644
12470 --- a/arch/um/include/asm/page.h
12471 +++ b/arch/um/include/asm/page.h
12472 @@ -14,6 +14,9 @@
12473 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12474 #define PAGE_MASK (~(PAGE_SIZE-1))
12475
12476 +#define ktla_ktva(addr) (addr)
12477 +#define ktva_ktla(addr) (addr)
12478 +
12479 #ifndef __ASSEMBLY__
12480
12481 struct page;
12482 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12483 index 0032f92..cd151e0 100644
12484 --- a/arch/um/include/asm/pgtable-3level.h
12485 +++ b/arch/um/include/asm/pgtable-3level.h
12486 @@ -58,6 +58,7 @@
12487 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12488 #define pud_populate(mm, pud, pmd) \
12489 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12490 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12491
12492 #ifdef CONFIG_64BIT
12493 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12494 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12495 index f17bca8..48adb87 100644
12496 --- a/arch/um/kernel/process.c
12497 +++ b/arch/um/kernel/process.c
12498 @@ -356,22 +356,6 @@ int singlestepping(void * t)
12499 return 2;
12500 }
12501
12502 -/*
12503 - * Only x86 and x86_64 have an arch_align_stack().
12504 - * All other arches have "#define arch_align_stack(x) (x)"
12505 - * in their asm/exec.h
12506 - * As this is included in UML from asm-um/system-generic.h,
12507 - * we can use it to behave as the subarch does.
12508 - */
12509 -#ifndef arch_align_stack
12510 -unsigned long arch_align_stack(unsigned long sp)
12511 -{
12512 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12513 - sp -= get_random_int() % 8192;
12514 - return sp & ~0xf;
12515 -}
12516 -#endif
12517 -
12518 unsigned long get_wchan(struct task_struct *p)
12519 {
12520 unsigned long stack_page, sp, ip;
12521 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12522 index ad8f795..2c7eec6 100644
12523 --- a/arch/unicore32/include/asm/cache.h
12524 +++ b/arch/unicore32/include/asm/cache.h
12525 @@ -12,8 +12,10 @@
12526 #ifndef __UNICORE_CACHE_H__
12527 #define __UNICORE_CACHE_H__
12528
12529 -#define L1_CACHE_SHIFT (5)
12530 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12531 +#include <linux/const.h>
12532 +
12533 +#define L1_CACHE_SHIFT 5
12534 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12535
12536 /*
12537 * Memory returned by kmalloc() may be used for DMA, so we must make
12538 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12539 index 41a503c..cf98b04 100644
12540 --- a/arch/x86/Kconfig
12541 +++ b/arch/x86/Kconfig
12542 @@ -129,7 +129,7 @@ config X86
12543 select RTC_LIB
12544 select HAVE_DEBUG_STACKOVERFLOW
12545 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12546 - select HAVE_CC_STACKPROTECTOR
12547 + select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12548 select GENERIC_CPU_AUTOPROBE
12549 select HAVE_ARCH_AUDITSYSCALL
12550 select ARCH_SUPPORTS_ATOMIC_RMW
12551 @@ -262,7 +262,7 @@ config X86_HT
12552
12553 config X86_32_LAZY_GS
12554 def_bool y
12555 - depends on X86_32 && !CC_STACKPROTECTOR
12556 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12557
12558 config ARCH_HWEIGHT_CFLAGS
12559 string
12560 @@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12561
12562 menuconfig HYPERVISOR_GUEST
12563 bool "Linux guest support"
12564 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12565 ---help---
12566 Say Y here to enable options for running Linux under various hyper-
12567 visors. This option enables basic hypervisor detection and platform
12568 @@ -973,6 +974,7 @@ config VM86
12569
12570 config X86_16BIT
12571 bool "Enable support for 16-bit segments" if EXPERT
12572 + depends on !GRKERNSEC
12573 default y
12574 ---help---
12575 This option is required by programs like Wine to run 16-bit
12576 @@ -1128,6 +1130,7 @@ choice
12577
12578 config NOHIGHMEM
12579 bool "off"
12580 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12581 ---help---
12582 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12583 However, the address space of 32-bit x86 processors is only 4
12584 @@ -1164,6 +1167,7 @@ config NOHIGHMEM
12585
12586 config HIGHMEM4G
12587 bool "4GB"
12588 + depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12589 ---help---
12590 Select this if you have a 32-bit processor and between 1 and 4
12591 gigabytes of physical RAM.
12592 @@ -1216,7 +1220,7 @@ config PAGE_OFFSET
12593 hex
12594 default 0xB0000000 if VMSPLIT_3G_OPT
12595 default 0x80000000 if VMSPLIT_2G
12596 - default 0x78000000 if VMSPLIT_2G_OPT
12597 + default 0x70000000 if VMSPLIT_2G_OPT
12598 default 0x40000000 if VMSPLIT_1G
12599 default 0xC0000000
12600 depends on X86_32
12601 @@ -1631,6 +1635,7 @@ source kernel/Kconfig.hz
12602
12603 config KEXEC
12604 bool "kexec system call"
12605 + depends on !GRKERNSEC_KMEM
12606 ---help---
12607 kexec is a system call that implements the ability to shutdown your
12608 current kernel, and to start another kernel. It is like a reboot
12609 @@ -1816,7 +1821,9 @@ config X86_NEED_RELOCS
12610
12611 config PHYSICAL_ALIGN
12612 hex "Alignment value to which kernel should be aligned"
12613 - default "0x200000"
12614 + default "0x1000000"
12615 + range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12616 + range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12617 range 0x2000 0x1000000 if X86_32
12618 range 0x200000 0x1000000 if X86_64
12619 ---help---
12620 @@ -1899,6 +1906,7 @@ config COMPAT_VDSO
12621 def_bool n
12622 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12623 depends on X86_32 || IA32_EMULATION
12624 + depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12625 ---help---
12626 Certain buggy versions of glibc will crash if they are
12627 presented with a 32-bit vDSO that is not mapped at the address
12628 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12629 index 6983314..54ad7e8 100644
12630 --- a/arch/x86/Kconfig.cpu
12631 +++ b/arch/x86/Kconfig.cpu
12632 @@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12633
12634 config X86_F00F_BUG
12635 def_bool y
12636 - depends on M586MMX || M586TSC || M586 || M486
12637 + depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12638
12639 config X86_INVD_BUG
12640 def_bool y
12641 @@ -327,7 +327,7 @@ config X86_INVD_BUG
12642
12643 config X86_ALIGNMENT_16
12644 def_bool y
12645 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12646 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12647
12648 config X86_INTEL_USERCOPY
12649 def_bool y
12650 @@ -369,7 +369,7 @@ config X86_CMPXCHG64
12651 # generates cmov.
12652 config X86_CMOV
12653 def_bool y
12654 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12655 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12656
12657 config X86_MINIMUM_CPU_FAMILY
12658 int
12659 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12660 index 61bd2ad..50b625d 100644
12661 --- a/arch/x86/Kconfig.debug
12662 +++ b/arch/x86/Kconfig.debug
12663 @@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12664 config DEBUG_RODATA
12665 bool "Write protect kernel read-only data structures"
12666 default y
12667 - depends on DEBUG_KERNEL
12668 + depends on DEBUG_KERNEL && BROKEN
12669 ---help---
12670 Mark the kernel read-only data as write-protected in the pagetables,
12671 in order to catch accidental (and incorrect) writes to such const
12672 @@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12673
12674 config DEBUG_SET_MODULE_RONX
12675 bool "Set loadable kernel module data as NX and text as RO"
12676 - depends on MODULES
12677 + depends on MODULES && BROKEN
12678 ---help---
12679 This option helps catch unintended modifications to loadable
12680 kernel module's text and read-only data. It also prevents execution
12681 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12682 index 920e616..ac3d4df 100644
12683 --- a/arch/x86/Makefile
12684 +++ b/arch/x86/Makefile
12685 @@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12686 # CPU-specific tuning. Anything which can be shared with UML should go here.
12687 include $(srctree)/arch/x86/Makefile_32.cpu
12688 KBUILD_CFLAGS += $(cflags-y)
12689 -
12690 - # temporary until string.h is fixed
12691 - KBUILD_CFLAGS += -ffreestanding
12692 else
12693 BITS := 64
12694 UTS_MACHINE := x86_64
12695 @@ -107,6 +104,9 @@ else
12696 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12697 endif
12698
12699 +# temporary until string.h is fixed
12700 +KBUILD_CFLAGS += -ffreestanding
12701 +
12702 # Make sure compiler does not have buggy stack-protector support.
12703 ifdef CONFIG_CC_STACKPROTECTOR
12704 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12705 @@ -180,6 +180,7 @@ archheaders:
12706 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12707
12708 archprepare:
12709 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12710 ifeq ($(CONFIG_KEXEC_FILE),y)
12711 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12712 endif
12713 @@ -263,3 +264,9 @@ define archhelp
12714 echo ' FDARGS="..." arguments for the booted kernel'
12715 echo ' FDINITRD=file initrd for the booted kernel'
12716 endef
12717 +
12718 +define OLD_LD
12719 +
12720 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12721 +*** Please upgrade your binutils to 2.18 or newer
12722 +endef
12723 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12724 index 5b016e2..04ef69c 100644
12725 --- a/arch/x86/boot/Makefile
12726 +++ b/arch/x86/boot/Makefile
12727 @@ -55,6 +55,9 @@ endif
12728 # ---------------------------------------------------------------------------
12729
12730 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12731 +ifdef CONSTIFY_PLUGIN
12732 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12733 +endif
12734 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12735 GCOV_PROFILE := n
12736
12737 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12738 index 878e4b9..20537ab 100644
12739 --- a/arch/x86/boot/bitops.h
12740 +++ b/arch/x86/boot/bitops.h
12741 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12742 u8 v;
12743 const u32 *p = (const u32 *)addr;
12744
12745 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12746 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12747 return v;
12748 }
12749
12750 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12751
12752 static inline void set_bit(int nr, void *addr)
12753 {
12754 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12755 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12756 }
12757
12758 #endif /* BOOT_BITOPS_H */
12759 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12760 index bd49ec6..94c7f58 100644
12761 --- a/arch/x86/boot/boot.h
12762 +++ b/arch/x86/boot/boot.h
12763 @@ -84,7 +84,7 @@ static inline void io_delay(void)
12764 static inline u16 ds(void)
12765 {
12766 u16 seg;
12767 - asm("movw %%ds,%0" : "=rm" (seg));
12768 + asm volatile("movw %%ds,%0" : "=rm" (seg));
12769 return seg;
12770 }
12771
12772 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12773 index 45abc36..97bea2d 100644
12774 --- a/arch/x86/boot/compressed/Makefile
12775 +++ b/arch/x86/boot/compressed/Makefile
12776 @@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12777 KBUILD_CFLAGS += -mno-mmx -mno-sse
12778 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12779 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12780 +ifdef CONSTIFY_PLUGIN
12781 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12782 +endif
12783
12784 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12785 GCOV_PROFILE := n
12786 diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12787 index a53440e..c3dbf1e 100644
12788 --- a/arch/x86/boot/compressed/efi_stub_32.S
12789 +++ b/arch/x86/boot/compressed/efi_stub_32.S
12790 @@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12791 * parameter 2, ..., param n. To make things easy, we save the return
12792 * address of efi_call_phys in a global variable.
12793 */
12794 - popl %ecx
12795 - movl %ecx, saved_return_addr(%edx)
12796 - /* get the function pointer into ECX*/
12797 - popl %ecx
12798 - movl %ecx, efi_rt_function_ptr(%edx)
12799 + popl saved_return_addr(%edx)
12800 + popl efi_rt_function_ptr(%edx)
12801
12802 /*
12803 * 3. Call the physical function.
12804 */
12805 - call *%ecx
12806 + call *efi_rt_function_ptr(%edx)
12807
12808 /*
12809 * 4. Balance the stack. And because EAX contain the return value,
12810 @@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12811 1: popl %edx
12812 subl $1b, %edx
12813
12814 - movl efi_rt_function_ptr(%edx), %ecx
12815 - pushl %ecx
12816 + pushl efi_rt_function_ptr(%edx)
12817
12818 /*
12819 * 10. Push the saved return address onto the stack and return.
12820 */
12821 - movl saved_return_addr(%edx), %ecx
12822 - pushl %ecx
12823 - ret
12824 + jmpl *saved_return_addr(%edx)
12825 ENDPROC(efi_call_phys)
12826 .previous
12827
12828 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12829 index 1d7fbbc..36ecd58 100644
12830 --- a/arch/x86/boot/compressed/head_32.S
12831 +++ b/arch/x86/boot/compressed/head_32.S
12832 @@ -140,10 +140,10 @@ preferred_addr:
12833 addl %eax, %ebx
12834 notl %eax
12835 andl %eax, %ebx
12836 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12837 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12838 jge 1f
12839 #endif
12840 - movl $LOAD_PHYSICAL_ADDR, %ebx
12841 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12842 1:
12843
12844 /* Target address to relocate to for decompression */
12845 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12846 index 6b1766c..ad465c9 100644
12847 --- a/arch/x86/boot/compressed/head_64.S
12848 +++ b/arch/x86/boot/compressed/head_64.S
12849 @@ -94,10 +94,10 @@ ENTRY(startup_32)
12850 addl %eax, %ebx
12851 notl %eax
12852 andl %eax, %ebx
12853 - cmpl $LOAD_PHYSICAL_ADDR, %ebx
12854 + cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12855 jge 1f
12856 #endif
12857 - movl $LOAD_PHYSICAL_ADDR, %ebx
12858 + movl $____LOAD_PHYSICAL_ADDR, %ebx
12859 1:
12860
12861 /* Target address to relocate to for decompression */
12862 @@ -322,10 +322,10 @@ preferred_addr:
12863 addq %rax, %rbp
12864 notq %rax
12865 andq %rax, %rbp
12866 - cmpq $LOAD_PHYSICAL_ADDR, %rbp
12867 + cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12868 jge 1f
12869 #endif
12870 - movq $LOAD_PHYSICAL_ADDR, %rbp
12871 + movq $____LOAD_PHYSICAL_ADDR, %rbp
12872 1:
12873
12874 /* Target address to relocate to for decompression */
12875 @@ -434,8 +434,8 @@ gdt:
12876 .long gdt
12877 .word 0
12878 .quad 0x0000000000000000 /* NULL descriptor */
12879 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
12880 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
12881 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
12882 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
12883 .quad 0x0080890000000000 /* TS descriptor */
12884 .quad 0x0000000000000000 /* TS continued */
12885 gdt_end:
12886 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12887 index 30dd59a..cd9edc3 100644
12888 --- a/arch/x86/boot/compressed/misc.c
12889 +++ b/arch/x86/boot/compressed/misc.c
12890 @@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12891 * Calculate the delta between where vmlinux was linked to load
12892 * and where it was actually loaded.
12893 */
12894 - delta = min_addr - LOAD_PHYSICAL_ADDR;
12895 + delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12896 if (!delta) {
12897 debug_putstr("No relocation needed... ");
12898 return;
12899 @@ -312,7 +312,7 @@ static void parse_elf(void *output)
12900 Elf32_Ehdr ehdr;
12901 Elf32_Phdr *phdrs, *phdr;
12902 #endif
12903 - void *dest;
12904 + void *dest, *prev;
12905 int i;
12906
12907 memcpy(&ehdr, output, sizeof(ehdr));
12908 @@ -339,13 +339,16 @@ static void parse_elf(void *output)
12909 case PT_LOAD:
12910 #ifdef CONFIG_RELOCATABLE
12911 dest = output;
12912 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12913 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12914 #else
12915 dest = (void *)(phdr->p_paddr);
12916 #endif
12917 memcpy(dest,
12918 output + phdr->p_offset,
12919 phdr->p_filesz);
12920 + if (i)
12921 + memset(prev, 0xff, dest - prev);
12922 + prev = dest + phdr->p_filesz;
12923 break;
12924 default: /* Ignore other PT_* */ break;
12925 }
12926 @@ -402,7 +405,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12927 error("Destination address too large");
12928 #endif
12929 #ifndef CONFIG_RELOCATABLE
12930 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12931 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12932 error("Wrong destination address");
12933 #endif
12934
12935 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12936 index 1fd7d57..0f7d096 100644
12937 --- a/arch/x86/boot/cpucheck.c
12938 +++ b/arch/x86/boot/cpucheck.c
12939 @@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12940 u32 ecx = MSR_K7_HWCR;
12941 u32 eax, edx;
12942
12943 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12944 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12945 eax &= ~(1 << 15);
12946 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12947 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12948
12949 get_cpuflags(); /* Make sure it really did something */
12950 err = check_cpuflags();
12951 @@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12952 u32 ecx = MSR_VIA_FCR;
12953 u32 eax, edx;
12954
12955 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12956 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12957 eax |= (1<<1)|(1<<7);
12958 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12959 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12960
12961 set_bit(X86_FEATURE_CX8, cpu.flags);
12962 err = check_cpuflags();
12963 @@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12964 u32 eax, edx;
12965 u32 level = 1;
12966
12967 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969 - asm("cpuid"
12970 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12971 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12972 + asm volatile("cpuid"
12973 : "+a" (level), "=d" (cpu.flags[0])
12974 : : "ecx", "ebx");
12975 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12976 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12977
12978 err = check_cpuflags();
12979 } else if (err == 0x01 &&
12980 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12981 index 16ef025..91e033b 100644
12982 --- a/arch/x86/boot/header.S
12983 +++ b/arch/x86/boot/header.S
12984 @@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12985 # single linked list of
12986 # struct setup_data
12987
12988 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12989 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12990
12991 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12992 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12993 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12994 +#else
12995 #define VO_INIT_SIZE (VO__end - VO__text)
12996 +#endif
12997 #if ZO_INIT_SIZE > VO_INIT_SIZE
12998 #define INIT_SIZE ZO_INIT_SIZE
12999 #else
13000 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13001 index db75d07..8e6d0af 100644
13002 --- a/arch/x86/boot/memory.c
13003 +++ b/arch/x86/boot/memory.c
13004 @@ -19,7 +19,7 @@
13005
13006 static int detect_memory_e820(void)
13007 {
13008 - int count = 0;
13009 + unsigned int count = 0;
13010 struct biosregs ireg, oreg;
13011 struct e820entry *desc = boot_params.e820_map;
13012 static struct e820entry buf; /* static so it is zeroed */
13013 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13014 index ba3e100..6501b8f 100644
13015 --- a/arch/x86/boot/video-vesa.c
13016 +++ b/arch/x86/boot/video-vesa.c
13017 @@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13018
13019 boot_params.screen_info.vesapm_seg = oreg.es;
13020 boot_params.screen_info.vesapm_off = oreg.di;
13021 + boot_params.screen_info.vesapm_size = oreg.cx;
13022 }
13023
13024 /*
13025 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13026 index 43eda28..5ab5fdb 100644
13027 --- a/arch/x86/boot/video.c
13028 +++ b/arch/x86/boot/video.c
13029 @@ -96,7 +96,7 @@ static void store_mode_params(void)
13030 static unsigned int get_entry(void)
13031 {
13032 char entry_buf[4];
13033 - int i, len = 0;
13034 + unsigned int i, len = 0;
13035 int key;
13036 unsigned int v;
13037
13038 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13039 index 9105655..41779c1 100644
13040 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
13041 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13042 @@ -8,6 +8,8 @@
13043 * including this sentence is retained in full.
13044 */
13045
13046 +#include <asm/alternative-asm.h>
13047 +
13048 .extern crypto_ft_tab
13049 .extern crypto_it_tab
13050 .extern crypto_fl_tab
13051 @@ -70,6 +72,8 @@
13052 je B192; \
13053 leaq 32(r9),r9;
13054
13055 +#define ret pax_force_retaddr; ret
13056 +
13057 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13058 movq r1,r2; \
13059 movq r3,r4; \
13060 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13061 index 477e9d7..c92c7d8 100644
13062 --- a/arch/x86/crypto/aesni-intel_asm.S
13063 +++ b/arch/x86/crypto/aesni-intel_asm.S
13064 @@ -31,6 +31,7 @@
13065
13066 #include <linux/linkage.h>
13067 #include <asm/inst.h>
13068 +#include <asm/alternative-asm.h>
13069
13070 #ifdef __x86_64__
13071 .data
13072 @@ -205,7 +206,7 @@ enc: .octa 0x2
13073 * num_initial_blocks = b mod 4
13074 * encrypt the initial num_initial_blocks blocks and apply ghash on
13075 * the ciphertext
13076 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13077 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13078 * are clobbered
13079 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13080 */
13081 @@ -214,8 +215,8 @@ enc: .octa 0x2
13082 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13083 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13084 mov arg7, %r10 # %r10 = AAD
13085 - mov arg8, %r12 # %r12 = aadLen
13086 - mov %r12, %r11
13087 + mov arg8, %r15 # %r15 = aadLen
13088 + mov %r15, %r11
13089 pxor %xmm\i, %xmm\i
13090 _get_AAD_loop\num_initial_blocks\operation:
13091 movd (%r10), \TMP1
13092 @@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13093 psrldq $4, %xmm\i
13094 pxor \TMP1, %xmm\i
13095 add $4, %r10
13096 - sub $4, %r12
13097 + sub $4, %r15
13098 jne _get_AAD_loop\num_initial_blocks\operation
13099 cmp $16, %r11
13100 je _get_AAD_loop2_done\num_initial_blocks\operation
13101 - mov $16, %r12
13102 + mov $16, %r15
13103 _get_AAD_loop2\num_initial_blocks\operation:
13104 psrldq $4, %xmm\i
13105 - sub $4, %r12
13106 - cmp %r11, %r12
13107 + sub $4, %r15
13108 + cmp %r11, %r15
13109 jne _get_AAD_loop2\num_initial_blocks\operation
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111 movdqa SHUF_MASK(%rip), %xmm14
13112 @@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13113 * num_initial_blocks = b mod 4
13114 * encrypt the initial num_initial_blocks blocks and apply ghash on
13115 * the ciphertext
13116 -* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117 +* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13118 * are clobbered
13119 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13120 */
13121 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13122 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13123 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13124 mov arg7, %r10 # %r10 = AAD
13125 - mov arg8, %r12 # %r12 = aadLen
13126 - mov %r12, %r11
13127 + mov arg8, %r15 # %r15 = aadLen
13128 + mov %r15, %r11
13129 pxor %xmm\i, %xmm\i
13130 _get_AAD_loop\num_initial_blocks\operation:
13131 movd (%r10), \TMP1
13132 @@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13133 psrldq $4, %xmm\i
13134 pxor \TMP1, %xmm\i
13135 add $4, %r10
13136 - sub $4, %r12
13137 + sub $4, %r15
13138 jne _get_AAD_loop\num_initial_blocks\operation
13139 cmp $16, %r11
13140 je _get_AAD_loop2_done\num_initial_blocks\operation
13141 - mov $16, %r12
13142 + mov $16, %r15
13143 _get_AAD_loop2\num_initial_blocks\operation:
13144 psrldq $4, %xmm\i
13145 - sub $4, %r12
13146 - cmp %r11, %r12
13147 + sub $4, %r15
13148 + cmp %r11, %r15
13149 jne _get_AAD_loop2\num_initial_blocks\operation
13150 _get_AAD_loop2_done\num_initial_blocks\operation:
13151 movdqa SHUF_MASK(%rip), %xmm14
13152 @@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13153 *
13154 *****************************************************************************/
13155 ENTRY(aesni_gcm_dec)
13156 - push %r12
13157 + push %r15
13158 push %r13
13159 push %r14
13160 mov %rsp, %r14
13161 @@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13162 */
13163 sub $VARIABLE_OFFSET, %rsp
13164 and $~63, %rsp # align rsp to 64 bytes
13165 - mov %arg6, %r12
13166 - movdqu (%r12), %xmm13 # %xmm13 = HashKey
13167 + mov %arg6, %r15
13168 + movdqu (%r15), %xmm13 # %xmm13 = HashKey
13169 movdqa SHUF_MASK(%rip), %xmm2
13170 PSHUFB_XMM %xmm2, %xmm13
13171
13172 @@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13173 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13174 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13175 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13176 - mov %r13, %r12
13177 - and $(3<<4), %r12
13178 + mov %r13, %r15
13179 + and $(3<<4), %r15
13180 jz _initial_num_blocks_is_0_decrypt
13181 - cmp $(2<<4), %r12
13182 + cmp $(2<<4), %r15
13183 jb _initial_num_blocks_is_1_decrypt
13184 je _initial_num_blocks_is_2_decrypt
13185 _initial_num_blocks_is_3_decrypt:
13186 @@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13187 sub $16, %r11
13188 add %r13, %r11
13189 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13190 - lea SHIFT_MASK+16(%rip), %r12
13191 - sub %r13, %r12
13192 + lea SHIFT_MASK+16(%rip), %r15
13193 + sub %r13, %r15
13194 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13195 # (%r13 is the number of bytes in plaintext mod 16)
13196 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13197 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13198 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13199
13200 movdqa %xmm1, %xmm2
13201 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13202 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13203 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13204 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13206 pand %xmm1, %xmm2
13207 @@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13208 sub $1, %r13
13209 jne _less_than_8_bytes_left_decrypt
13210 _multiple_of_16_bytes_decrypt:
13211 - mov arg8, %r12 # %r13 = aadLen (number of bytes)
13212 - shl $3, %r12 # convert into number of bits
13213 - movd %r12d, %xmm15 # len(A) in %xmm15
13214 + mov arg8, %r15 # %r13 = aadLen (number of bytes)
13215 + shl $3, %r15 # convert into number of bits
13216 + movd %r15d, %xmm15 # len(A) in %xmm15
13217 shl $3, %arg4 # len(C) in bits (*128)
13218 MOVQ_R64_XMM %arg4, %xmm1
13219 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13220 @@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13221 mov %r14, %rsp
13222 pop %r14
13223 pop %r13
13224 - pop %r12
13225 + pop %r15
13226 + pax_force_retaddr
13227 ret
13228 ENDPROC(aesni_gcm_dec)
13229
13230 @@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13231 * poly = x^128 + x^127 + x^126 + x^121 + 1
13232 ***************************************************************************/
13233 ENTRY(aesni_gcm_enc)
13234 - push %r12
13235 + push %r15
13236 push %r13
13237 push %r14
13238 mov %rsp, %r14
13239 @@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13240 #
13241 sub $VARIABLE_OFFSET, %rsp
13242 and $~63, %rsp
13243 - mov %arg6, %r12
13244 - movdqu (%r12), %xmm13
13245 + mov %arg6, %r15
13246 + movdqu (%r15), %xmm13
13247 movdqa SHUF_MASK(%rip), %xmm2
13248 PSHUFB_XMM %xmm2, %xmm13
13249
13250 @@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13251 movdqa %xmm13, HashKey(%rsp)
13252 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13253 and $-16, %r13
13254 - mov %r13, %r12
13255 + mov %r13, %r15
13256
13257 # Encrypt first few blocks
13258
13259 - and $(3<<4), %r12
13260 + and $(3<<4), %r15
13261 jz _initial_num_blocks_is_0_encrypt
13262 - cmp $(2<<4), %r12
13263 + cmp $(2<<4), %r15
13264 jb _initial_num_blocks_is_1_encrypt
13265 je _initial_num_blocks_is_2_encrypt
13266 _initial_num_blocks_is_3_encrypt:
13267 @@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13268 sub $16, %r11
13269 add %r13, %r11
13270 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13271 - lea SHIFT_MASK+16(%rip), %r12
13272 - sub %r13, %r12
13273 + lea SHIFT_MASK+16(%rip), %r15
13274 + sub %r13, %r15
13275 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13276 # (%r13 is the number of bytes in plaintext mod 16)
13277 - movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13278 + movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13279 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13280 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13281 - movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13282 + movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13283 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13284 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13285 movdqa SHUF_MASK(%rip), %xmm10
13286 @@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13287 sub $1, %r13
13288 jne _less_than_8_bytes_left_encrypt
13289 _multiple_of_16_bytes_encrypt:
13290 - mov arg8, %r12 # %r12 = addLen (number of bytes)
13291 - shl $3, %r12
13292 - movd %r12d, %xmm15 # len(A) in %xmm15
13293 + mov arg8, %r15 # %r15 = addLen (number of bytes)
13294 + shl $3, %r15
13295 + movd %r15d, %xmm15 # len(A) in %xmm15
13296 shl $3, %arg4 # len(C) in bits (*128)
13297 MOVQ_R64_XMM %arg4, %xmm1
13298 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13299 @@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13300 mov %r14, %rsp
13301 pop %r14
13302 pop %r13
13303 - pop %r12
13304 + pop %r15
13305 + pax_force_retaddr
13306 ret
13307 ENDPROC(aesni_gcm_enc)
13308
13309 @@ -1722,6 +1725,7 @@ _key_expansion_256a:
13310 pxor %xmm1, %xmm0
13311 movaps %xmm0, (TKEYP)
13312 add $0x10, TKEYP
13313 + pax_force_retaddr
13314 ret
13315 ENDPROC(_key_expansion_128)
13316 ENDPROC(_key_expansion_256a)
13317 @@ -1748,6 +1752,7 @@ _key_expansion_192a:
13318 shufps $0b01001110, %xmm2, %xmm1
13319 movaps %xmm1, 0x10(TKEYP)
13320 add $0x20, TKEYP
13321 + pax_force_retaddr
13322 ret
13323 ENDPROC(_key_expansion_192a)
13324
13325 @@ -1768,6 +1773,7 @@ _key_expansion_192b:
13326
13327 movaps %xmm0, (TKEYP)
13328 add $0x10, TKEYP
13329 + pax_force_retaddr
13330 ret
13331 ENDPROC(_key_expansion_192b)
13332
13333 @@ -1781,6 +1787,7 @@ _key_expansion_256b:
13334 pxor %xmm1, %xmm2
13335 movaps %xmm2, (TKEYP)
13336 add $0x10, TKEYP
13337 + pax_force_retaddr
13338 ret
13339 ENDPROC(_key_expansion_256b)
13340
13341 @@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13342 #ifndef __x86_64__
13343 popl KEYP
13344 #endif
13345 + pax_force_retaddr
13346 ret
13347 ENDPROC(aesni_set_key)
13348
13349 @@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13350 popl KLEN
13351 popl KEYP
13352 #endif
13353 + pax_force_retaddr
13354 ret
13355 ENDPROC(aesni_enc)
13356
13357 @@ -1974,6 +1983,7 @@ _aesni_enc1:
13358 AESENC KEY STATE
13359 movaps 0x70(TKEYP), KEY
13360 AESENCLAST KEY STATE
13361 + pax_force_retaddr
13362 ret
13363 ENDPROC(_aesni_enc1)
13364
13365 @@ -2083,6 +2093,7 @@ _aesni_enc4:
13366 AESENCLAST KEY STATE2
13367 AESENCLAST KEY STATE3
13368 AESENCLAST KEY STATE4
13369 + pax_force_retaddr
13370 ret
13371 ENDPROC(_aesni_enc4)
13372
13373 @@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13374 popl KLEN
13375 popl KEYP
13376 #endif
13377 + pax_force_retaddr
13378 ret
13379 ENDPROC(aesni_dec)
13380
13381 @@ -2164,6 +2176,7 @@ _aesni_dec1:
13382 AESDEC KEY STATE
13383 movaps 0x70(TKEYP), KEY
13384 AESDECLAST KEY STATE
13385 + pax_force_retaddr
13386 ret
13387 ENDPROC(_aesni_dec1)
13388
13389 @@ -2273,6 +2286,7 @@ _aesni_dec4:
13390 AESDECLAST KEY STATE2
13391 AESDECLAST KEY STATE3
13392 AESDECLAST KEY STATE4
13393 + pax_force_retaddr
13394 ret
13395 ENDPROC(_aesni_dec4)
13396
13397 @@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13398 popl KEYP
13399 popl LEN
13400 #endif
13401 + pax_force_retaddr
13402 ret
13403 ENDPROC(aesni_ecb_enc)
13404
13405 @@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13406 popl KEYP
13407 popl LEN
13408 #endif
13409 + pax_force_retaddr
13410 ret
13411 ENDPROC(aesni_ecb_dec)
13412
13413 @@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13414 popl LEN
13415 popl IVP
13416 #endif
13417 + pax_force_retaddr
13418 ret
13419 ENDPROC(aesni_cbc_enc)
13420
13421 @@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13422 popl LEN
13423 popl IVP
13424 #endif
13425 + pax_force_retaddr
13426 ret
13427 ENDPROC(aesni_cbc_dec)
13428
13429 @@ -2550,6 +2568,7 @@ _aesni_inc_init:
13430 mov $1, TCTR_LOW
13431 MOVQ_R64_XMM TCTR_LOW INC
13432 MOVQ_R64_XMM CTR TCTR_LOW
13433 + pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_inc_init)
13436
13437 @@ -2579,6 +2598,7 @@ _aesni_inc:
13438 .Linc_low:
13439 movaps CTR, IV
13440 PSHUFB_XMM BSWAP_MASK IV
13441 + pax_force_retaddr
13442 ret
13443 ENDPROC(_aesni_inc)
13444
13445 @@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13446 .Lctr_enc_ret:
13447 movups IV, (IVP)
13448 .Lctr_enc_just_ret:
13449 + pax_force_retaddr
13450 ret
13451 ENDPROC(aesni_ctr_enc)
13452
13453 @@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13454 pxor INC, STATE4
13455 movdqu STATE4, 0x70(OUTP)
13456
13457 + pax_force_retaddr
13458 ret
13459 ENDPROC(aesni_xts_crypt8)
13460
13461 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13462 index 246c670..466e2d6 100644
13463 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13465 @@ -21,6 +21,7 @@
13466 */
13467
13468 #include <linux/linkage.h>
13469 +#include <asm/alternative-asm.h>
13470
13471 .file "blowfish-x86_64-asm.S"
13472 .text
13473 @@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13474 jnz .L__enc_xor;
13475
13476 write_block();
13477 + pax_force_retaddr
13478 ret;
13479 .L__enc_xor:
13480 xor_block();
13481 + pax_force_retaddr
13482 ret;
13483 ENDPROC(__blowfish_enc_blk)
13484
13485 @@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13486
13487 movq %r11, %rbp;
13488
13489 + pax_force_retaddr
13490 ret;
13491 ENDPROC(blowfish_dec_blk)
13492
13493 @@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13494
13495 popq %rbx;
13496 popq %rbp;
13497 + pax_force_retaddr
13498 ret;
13499
13500 .L__enc_xor4:
13501 @@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13502
13503 popq %rbx;
13504 popq %rbp;
13505 + pax_force_retaddr
13506 ret;
13507 ENDPROC(__blowfish_enc_blk_4way)
13508
13509 @@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13510 popq %rbx;
13511 popq %rbp;
13512
13513 + pax_force_retaddr
13514 ret;
13515 ENDPROC(blowfish_dec_blk_4way)
13516 diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13517 index ce71f92..1dce7ec 100644
13518 --- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519 +++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13520 @@ -16,6 +16,7 @@
13521 */
13522
13523 #include <linux/linkage.h>
13524 +#include <asm/alternative-asm.h>
13525
13526 #define CAMELLIA_TABLE_BYTE_LEN 272
13527
13528 @@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13529 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13530 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13531 %rcx, (%r9));
13532 + pax_force_retaddr
13533 ret;
13534 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13535
13536 @@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13537 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13538 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13539 %rax, (%r9));
13540 + pax_force_retaddr
13541 ret;
13542 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13543
13544 @@ -780,6 +783,7 @@ __camellia_enc_blk16:
13545 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13546 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13547
13548 + pax_force_retaddr
13549 ret;
13550
13551 .align 8
13552 @@ -865,6 +869,7 @@ __camellia_dec_blk16:
13553 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13554 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13555
13556 + pax_force_retaddr
13557 ret;
13558
13559 .align 8
13560 @@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13561 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13562 %xmm8, %rsi);
13563
13564 + pax_force_retaddr
13565 ret;
13566 ENDPROC(camellia_ecb_enc_16way)
13567
13568 @@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13569 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13570 %xmm8, %rsi);
13571
13572 + pax_force_retaddr
13573 ret;
13574 ENDPROC(camellia_ecb_dec_16way)
13575
13576 @@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13577 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13578 %xmm8, %rsi);
13579
13580 + pax_force_retaddr
13581 ret;
13582 ENDPROC(camellia_cbc_dec_16way)
13583
13584 @@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13585 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13586 %xmm8, %rsi);
13587
13588 + pax_force_retaddr
13589 ret;
13590 ENDPROC(camellia_ctr_16way)
13591
13592 @@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13593 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13594 %xmm8, %rsi);
13595
13596 + pax_force_retaddr
13597 ret;
13598 ENDPROC(camellia_xts_crypt_16way)
13599
13600 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13601 index 0e0b886..5a3123c 100644
13602 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13604 @@ -11,6 +11,7 @@
13605 */
13606
13607 #include <linux/linkage.h>
13608 +#include <asm/alternative-asm.h>
13609
13610 #define CAMELLIA_TABLE_BYTE_LEN 272
13611
13612 @@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13613 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13614 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13615 %rcx, (%r9));
13616 + pax_force_retaddr
13617 ret;
13618 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13619
13620 @@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13621 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13622 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13623 %rax, (%r9));
13624 + pax_force_retaddr
13625 ret;
13626 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13627
13628 @@ -820,6 +823,7 @@ __camellia_enc_blk32:
13629 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13630 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13631
13632 + pax_force_retaddr
13633 ret;
13634
13635 .align 8
13636 @@ -905,6 +909,7 @@ __camellia_dec_blk32:
13637 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13638 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13639
13640 + pax_force_retaddr
13641 ret;
13642
13643 .align 8
13644 @@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13645
13646 vzeroupper;
13647
13648 + pax_force_retaddr
13649 ret;
13650 ENDPROC(camellia_ecb_enc_32way)
13651
13652 @@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13653
13654 vzeroupper;
13655
13656 + pax_force_retaddr
13657 ret;
13658 ENDPROC(camellia_ecb_dec_32way)
13659
13660 @@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13661
13662 vzeroupper;
13663
13664 + pax_force_retaddr
13665 ret;
13666 ENDPROC(camellia_cbc_dec_32way)
13667
13668 @@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13669
13670 vzeroupper;
13671
13672 + pax_force_retaddr
13673 ret;
13674 ENDPROC(camellia_ctr_32way)
13675
13676 @@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13677
13678 vzeroupper;
13679
13680 + pax_force_retaddr
13681 ret;
13682 ENDPROC(camellia_xts_crypt_32way)
13683
13684 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13685 index 310319c..db3d7b5 100644
13686 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13687 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13688 @@ -21,6 +21,7 @@
13689 */
13690
13691 #include <linux/linkage.h>
13692 +#include <asm/alternative-asm.h>
13693
13694 .file "camellia-x86_64-asm_64.S"
13695 .text
13696 @@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13697 enc_outunpack(mov, RT1);
13698
13699 movq RRBP, %rbp;
13700 + pax_force_retaddr
13701 ret;
13702
13703 .L__enc_xor:
13704 enc_outunpack(xor, RT1);
13705
13706 movq RRBP, %rbp;
13707 + pax_force_retaddr
13708 ret;
13709 ENDPROC(__camellia_enc_blk)
13710
13711 @@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13712 dec_outunpack();
13713
13714 movq RRBP, %rbp;
13715 + pax_force_retaddr
13716 ret;
13717 ENDPROC(camellia_dec_blk)
13718
13719 @@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13720
13721 movq RRBP, %rbp;
13722 popq %rbx;
13723 + pax_force_retaddr
13724 ret;
13725
13726 .L__enc2_xor:
13727 @@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13728
13729 movq RRBP, %rbp;
13730 popq %rbx;
13731 + pax_force_retaddr
13732 ret;
13733 ENDPROC(__camellia_enc_blk_2way)
13734
13735 @@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13736
13737 movq RRBP, %rbp;
13738 movq RXOR, %rbx;
13739 + pax_force_retaddr
13740 ret;
13741 ENDPROC(camellia_dec_blk_2way)
13742 diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13743 index c35fd5d..2d8c7db 100644
13744 --- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745 +++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13746 @@ -24,6 +24,7 @@
13747 */
13748
13749 #include <linux/linkage.h>
13750 +#include <asm/alternative-asm.h>
13751
13752 .file "cast5-avx-x86_64-asm_64.S"
13753
13754 @@ -281,6 +282,7 @@ __cast5_enc_blk16:
13755 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13756 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13757
13758 + pax_force_retaddr
13759 ret;
13760 ENDPROC(__cast5_enc_blk16)
13761
13762 @@ -352,6 +354,7 @@ __cast5_dec_blk16:
13763 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13764 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13765
13766 + pax_force_retaddr
13767 ret;
13768
13769 .L__skip_dec:
13770 @@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13771 vmovdqu RR4, (6*4*4)(%r11);
13772 vmovdqu RL4, (7*4*4)(%r11);
13773
13774 + pax_force_retaddr
13775 ret;
13776 ENDPROC(cast5_ecb_enc_16way)
13777
13778 @@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13779 vmovdqu RR4, (6*4*4)(%r11);
13780 vmovdqu RL4, (7*4*4)(%r11);
13781
13782 + pax_force_retaddr
13783 ret;
13784 ENDPROC(cast5_ecb_dec_16way)
13785
13786 @@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13787 * %rdx: src
13788 */
13789
13790 - pushq %r12;
13791 + pushq %r14;
13792
13793 movq %rsi, %r11;
13794 - movq %rdx, %r12;
13795 + movq %rdx, %r14;
13796
13797 vmovdqu (0*16)(%rdx), RL1;
13798 vmovdqu (1*16)(%rdx), RR1;
13799 @@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13800 call __cast5_dec_blk16;
13801
13802 /* xor with src */
13803 - vmovq (%r12), RX;
13804 + vmovq (%r14), RX;
13805 vpshufd $0x4f, RX, RX;
13806 vpxor RX, RR1, RR1;
13807 - vpxor 0*16+8(%r12), RL1, RL1;
13808 - vpxor 1*16+8(%r12), RR2, RR2;
13809 - vpxor 2*16+8(%r12), RL2, RL2;
13810 - vpxor 3*16+8(%r12), RR3, RR3;
13811 - vpxor 4*16+8(%r12), RL3, RL3;
13812 - vpxor 5*16+8(%r12), RR4, RR4;
13813 - vpxor 6*16+8(%r12), RL4, RL4;
13814 + vpxor 0*16+8(%r14), RL1, RL1;
13815 + vpxor 1*16+8(%r14), RR2, RR2;
13816 + vpxor 2*16+8(%r14), RL2, RL2;
13817 + vpxor 3*16+8(%r14), RR3, RR3;
13818 + vpxor 4*16+8(%r14), RL3, RL3;
13819 + vpxor 5*16+8(%r14), RR4, RR4;
13820 + vpxor 6*16+8(%r14), RL4, RL4;
13821
13822 vmovdqu RR1, (0*16)(%r11);
13823 vmovdqu RL1, (1*16)(%r11);
13824 @@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13825 vmovdqu RR4, (6*16)(%r11);
13826 vmovdqu RL4, (7*16)(%r11);
13827
13828 - popq %r12;
13829 + popq %r14;
13830
13831 + pax_force_retaddr
13832 ret;
13833 ENDPROC(cast5_cbc_dec_16way)
13834
13835 @@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13836 * %rcx: iv (big endian, 64bit)
13837 */
13838
13839 - pushq %r12;
13840 + pushq %r14;
13841
13842 movq %rsi, %r11;
13843 - movq %rdx, %r12;
13844 + movq %rdx, %r14;
13845
13846 vpcmpeqd RTMP, RTMP, RTMP;
13847 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13848 @@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13849 call __cast5_enc_blk16;
13850
13851 /* dst = src ^ iv */
13852 - vpxor (0*16)(%r12), RR1, RR1;
13853 - vpxor (1*16)(%r12), RL1, RL1;
13854 - vpxor (2*16)(%r12), RR2, RR2;
13855 - vpxor (3*16)(%r12), RL2, RL2;
13856 - vpxor (4*16)(%r12), RR3, RR3;
13857 - vpxor (5*16)(%r12), RL3, RL3;
13858 - vpxor (6*16)(%r12), RR4, RR4;
13859 - vpxor (7*16)(%r12), RL4, RL4;
13860 + vpxor (0*16)(%r14), RR1, RR1;
13861 + vpxor (1*16)(%r14), RL1, RL1;
13862 + vpxor (2*16)(%r14), RR2, RR2;
13863 + vpxor (3*16)(%r14), RL2, RL2;
13864 + vpxor (4*16)(%r14), RR3, RR3;
13865 + vpxor (5*16)(%r14), RL3, RL3;
13866 + vpxor (6*16)(%r14), RR4, RR4;
13867 + vpxor (7*16)(%r14), RL4, RL4;
13868 vmovdqu RR1, (0*16)(%r11);
13869 vmovdqu RL1, (1*16)(%r11);
13870 vmovdqu RR2, (2*16)(%r11);
13871 @@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13872 vmovdqu RR4, (6*16)(%r11);
13873 vmovdqu RL4, (7*16)(%r11);
13874
13875 - popq %r12;
13876 + popq %r14;
13877
13878 + pax_force_retaddr
13879 ret;
13880 ENDPROC(cast5_ctr_16way)
13881 diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13882 index e3531f8..e123f35 100644
13883 --- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884 +++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13885 @@ -24,6 +24,7 @@
13886 */
13887
13888 #include <linux/linkage.h>
13889 +#include <asm/alternative-asm.h>
13890 #include "glue_helper-asm-avx.S"
13891
13892 .file "cast6-avx-x86_64-asm_64.S"
13893 @@ -295,6 +296,7 @@ __cast6_enc_blk8:
13894 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13895 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13896
13897 + pax_force_retaddr
13898 ret;
13899 ENDPROC(__cast6_enc_blk8)
13900
13901 @@ -340,6 +342,7 @@ __cast6_dec_blk8:
13902 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13903 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13904
13905 + pax_force_retaddr
13906 ret;
13907 ENDPROC(__cast6_dec_blk8)
13908
13909 @@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13910
13911 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13912
13913 + pax_force_retaddr
13914 ret;
13915 ENDPROC(cast6_ecb_enc_8way)
13916
13917 @@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13918
13919 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13920
13921 + pax_force_retaddr
13922 ret;
13923 ENDPROC(cast6_ecb_dec_8way)
13924
13925 @@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13926 * %rdx: src
13927 */
13928
13929 - pushq %r12;
13930 + pushq %r14;
13931
13932 movq %rsi, %r11;
13933 - movq %rdx, %r12;
13934 + movq %rdx, %r14;
13935
13936 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13937
13938 call __cast6_dec_blk8;
13939
13940 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13942
13943 - popq %r12;
13944 + popq %r14;
13945
13946 + pax_force_retaddr
13947 ret;
13948 ENDPROC(cast6_cbc_dec_8way)
13949
13950 @@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13951 * %rcx: iv (little endian, 128bit)
13952 */
13953
13954 - pushq %r12;
13955 + pushq %r14;
13956
13957 movq %rsi, %r11;
13958 - movq %rdx, %r12;
13959 + movq %rdx, %r14;
13960
13961 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13962 RD2, RX, RKR, RKM);
13963
13964 call __cast6_enc_blk8;
13965
13966 - store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967 + store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13968
13969 - popq %r12;
13970 + popq %r14;
13971
13972 + pax_force_retaddr
13973 ret;
13974 ENDPROC(cast6_ctr_8way)
13975
13976 @@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13977 /* dst <= regs xor IVs(in dst) */
13978 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13979
13980 + pax_force_retaddr
13981 ret;
13982 ENDPROC(cast6_xts_enc_8way)
13983
13984 @@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13985 /* dst <= regs xor IVs(in dst) */
13986 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13987
13988 + pax_force_retaddr
13989 ret;
13990 ENDPROC(cast6_xts_dec_8way)
13991 diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13992 index 26d49eb..c0a8c84 100644
13993 --- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994 +++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13995 @@ -45,6 +45,7 @@
13996
13997 #include <asm/inst.h>
13998 #include <linux/linkage.h>
13999 +#include <asm/alternative-asm.h>
14000
14001 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14002
14003 @@ -309,6 +310,7 @@ do_return:
14004 popq %rsi
14005 popq %rdi
14006 popq %rbx
14007 + pax_force_retaddr
14008 ret
14009
14010 ################################################################
14011 diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14012 index 5d1e007..098cb4f 100644
14013 --- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014 +++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14015 @@ -18,6 +18,7 @@
14016
14017 #include <linux/linkage.h>
14018 #include <asm/inst.h>
14019 +#include <asm/alternative-asm.h>
14020
14021 .data
14022
14023 @@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14024 psrlq $1, T2
14025 pxor T2, T1
14026 pxor T1, DATA
14027 + pax_force_retaddr
14028 ret
14029 ENDPROC(__clmul_gf128mul_ble)
14030
14031 @@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14032 call __clmul_gf128mul_ble
14033 PSHUFB_XMM BSWAP DATA
14034 movups DATA, (%rdi)
14035 + pax_force_retaddr
14036 ret
14037 ENDPROC(clmul_ghash_mul)
14038
14039 @@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14040 PSHUFB_XMM BSWAP DATA
14041 movups DATA, (%rdi)
14042 .Lupdate_just_ret:
14043 + pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_update)
14046 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14047 index 9279e0b..c4b3d2c 100644
14048 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14050 @@ -1,4 +1,5 @@
14051 #include <linux/linkage.h>
14052 +#include <asm/alternative-asm.h>
14053
14054 # enter salsa20_encrypt_bytes
14055 ENTRY(salsa20_encrypt_bytes)
14056 @@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14057 add %r11,%rsp
14058 mov %rdi,%rax
14059 mov %rsi,%rdx
14060 + pax_force_retaddr
14061 ret
14062 # bytesatleast65:
14063 ._bytesatleast65:
14064 @@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068 + pax_force_retaddr
14069 ret
14070 ENDPROC(salsa20_keysetup)
14071
14072 @@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076 + pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_ivsetup)
14079 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14080 index 2f202f4..d9164d6 100644
14081 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14083 @@ -24,6 +24,7 @@
14084 */
14085
14086 #include <linux/linkage.h>
14087 +#include <asm/alternative-asm.h>
14088 #include "glue_helper-asm-avx.S"
14089
14090 .file "serpent-avx-x86_64-asm_64.S"
14091 @@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14092 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14093 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14094
14095 + pax_force_retaddr
14096 ret;
14097 ENDPROC(__serpent_enc_blk8_avx)
14098
14099 @@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14100 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14101 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14102
14103 + pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_dec_blk8_avx)
14106
14107 @@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14108
14109 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14110
14111 + pax_force_retaddr
14112 ret;
14113 ENDPROC(serpent_ecb_enc_8way_avx)
14114
14115 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14116
14117 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14118
14119 + pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_dec_8way_avx)
14122
14123 @@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14124
14125 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127 + pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_cbc_dec_8way_avx)
14130
14131 @@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14132
14133 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14134
14135 + pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_ctr_8way_avx)
14138
14139 @@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14140 /* dst <= regs xor IVs(in dst) */
14141 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143 + pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_xts_enc_8way_avx)
14146
14147 @@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14150
14151 + pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_dec_8way_avx)
14154 diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14155 index b222085..abd483c 100644
14156 --- a/arch/x86/crypto/serpent-avx2-asm_64.S
14157 +++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14158 @@ -15,6 +15,7 @@
14159 */
14160
14161 #include <linux/linkage.h>
14162 +#include <asm/alternative-asm.h>
14163 #include "glue_helper-asm-avx2.S"
14164
14165 .file "serpent-avx2-asm_64.S"
14166 @@ -610,6 +611,7 @@ __serpent_enc_blk16:
14167 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14168 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14169
14170 + pax_force_retaddr
14171 ret;
14172 ENDPROC(__serpent_enc_blk16)
14173
14174 @@ -664,6 +666,7 @@ __serpent_dec_blk16:
14175 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14176 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14177
14178 + pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_dec_blk16)
14181
14182 @@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14183
14184 vzeroupper;
14185
14186 + pax_force_retaddr
14187 ret;
14188 ENDPROC(serpent_ecb_enc_16way)
14189
14190 @@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14191
14192 vzeroupper;
14193
14194 + pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_dec_16way)
14197
14198 @@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14199
14200 vzeroupper;
14201
14202 + pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_cbc_dec_16way)
14205
14206 @@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14207
14208 vzeroupper;
14209
14210 + pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_ctr_16way)
14213
14214 @@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14215
14216 vzeroupper;
14217
14218 + pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_xts_enc_16way)
14221
14222 @@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14223
14224 vzeroupper;
14225
14226 + pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_dec_16way)
14229 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14230 index acc066c..1559cc4 100644
14231 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14233 @@ -25,6 +25,7 @@
14234 */
14235
14236 #include <linux/linkage.h>
14237 +#include <asm/alternative-asm.h>
14238
14239 .file "serpent-sse2-x86_64-asm_64.S"
14240 .text
14241 @@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14242 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14243 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14244
14245 + pax_force_retaddr
14246 ret;
14247
14248 .L__enc_xor8:
14249 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14250 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14251
14252 + pax_force_retaddr
14253 ret;
14254 ENDPROC(__serpent_enc_blk_8way)
14255
14256 @@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14257 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14258 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14259
14260 + pax_force_retaddr
14261 ret;
14262 ENDPROC(serpent_dec_blk_8way)
14263 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14264 index a410950..9dfe7ad 100644
14265 --- a/arch/x86/crypto/sha1_ssse3_asm.S
14266 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
14267 @@ -29,6 +29,7 @@
14268 */
14269
14270 #include <linux/linkage.h>
14271 +#include <asm/alternative-asm.h>
14272
14273 #define CTX %rdi // arg1
14274 #define BUF %rsi // arg2
14275 @@ -75,9 +76,9 @@
14276
14277 push %rbx
14278 push %rbp
14279 - push %r12
14280 + push %r14
14281
14282 - mov %rsp, %r12
14283 + mov %rsp, %r14
14284 sub $64, %rsp # allocate workspace
14285 and $~15, %rsp # align stack
14286
14287 @@ -99,11 +100,12 @@
14288 xor %rax, %rax
14289 rep stosq
14290
14291 - mov %r12, %rsp # deallocate workspace
14292 + mov %r14, %rsp # deallocate workspace
14293
14294 - pop %r12
14295 + pop %r14
14296 pop %rbp
14297 pop %rbx
14298 + pax_force_retaddr
14299 ret
14300
14301 ENDPROC(\name)
14302 diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14303 index 642f156..51a513c 100644
14304 --- a/arch/x86/crypto/sha256-avx-asm.S
14305 +++ b/arch/x86/crypto/sha256-avx-asm.S
14306 @@ -49,6 +49,7 @@
14307
14308 #ifdef CONFIG_AS_AVX
14309 #include <linux/linkage.h>
14310 +#include <asm/alternative-asm.h>
14311
14312 ## assume buffers not aligned
14313 #define VMOVDQ vmovdqu
14314 @@ -460,6 +461,7 @@ done_hash:
14315 popq %r13
14316 popq %rbp
14317 popq %rbx
14318 + pax_force_retaddr
14319 ret
14320 ENDPROC(sha256_transform_avx)
14321
14322 diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14323 index 9e86944..3795e6a 100644
14324 --- a/arch/x86/crypto/sha256-avx2-asm.S
14325 +++ b/arch/x86/crypto/sha256-avx2-asm.S
14326 @@ -50,6 +50,7 @@
14327
14328 #ifdef CONFIG_AS_AVX2
14329 #include <linux/linkage.h>
14330 +#include <asm/alternative-asm.h>
14331
14332 ## assume buffers not aligned
14333 #define VMOVDQ vmovdqu
14334 @@ -720,6 +721,7 @@ done_hash:
14335 popq %r12
14336 popq %rbp
14337 popq %rbx
14338 + pax_force_retaddr
14339 ret
14340 ENDPROC(sha256_transform_rorx)
14341
14342 diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14343 index f833b74..8c62a9e 100644
14344 --- a/arch/x86/crypto/sha256-ssse3-asm.S
14345 +++ b/arch/x86/crypto/sha256-ssse3-asm.S
14346 @@ -47,6 +47,7 @@
14347 ########################################################################
14348
14349 #include <linux/linkage.h>
14350 +#include <asm/alternative-asm.h>
14351
14352 ## assume buffers not aligned
14353 #define MOVDQ movdqu
14354 @@ -471,6 +472,7 @@ done_hash:
14355 popq %rbp
14356 popq %rbx
14357
14358 + pax_force_retaddr
14359 ret
14360 ENDPROC(sha256_transform_ssse3)
14361
14362 diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14363 index 974dde9..a823ff9 100644
14364 --- a/arch/x86/crypto/sha512-avx-asm.S
14365 +++ b/arch/x86/crypto/sha512-avx-asm.S
14366 @@ -49,6 +49,7 @@
14367
14368 #ifdef CONFIG_AS_AVX
14369 #include <linux/linkage.h>
14370 +#include <asm/alternative-asm.h>
14371
14372 .text
14373
14374 @@ -364,6 +365,7 @@ updateblock:
14375 mov frame_RSPSAVE(%rsp), %rsp
14376
14377 nowork:
14378 + pax_force_retaddr
14379 ret
14380 ENDPROC(sha512_transform_avx)
14381
14382 diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14383 index 568b961..ed20c37 100644
14384 --- a/arch/x86/crypto/sha512-avx2-asm.S
14385 +++ b/arch/x86/crypto/sha512-avx2-asm.S
14386 @@ -51,6 +51,7 @@
14387
14388 #ifdef CONFIG_AS_AVX2
14389 #include <linux/linkage.h>
14390 +#include <asm/alternative-asm.h>
14391
14392 .text
14393
14394 @@ -678,6 +679,7 @@ done_hash:
14395
14396 # Restore Stack Pointer
14397 mov frame_RSPSAVE(%rsp), %rsp
14398 + pax_force_retaddr
14399 ret
14400 ENDPROC(sha512_transform_rorx)
14401
14402 diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14403 index fb56855..6edd768 100644
14404 --- a/arch/x86/crypto/sha512-ssse3-asm.S
14405 +++ b/arch/x86/crypto/sha512-ssse3-asm.S
14406 @@ -48,6 +48,7 @@
14407 ########################################################################
14408
14409 #include <linux/linkage.h>
14410 +#include <asm/alternative-asm.h>
14411
14412 .text
14413
14414 @@ -363,6 +364,7 @@ updateblock:
14415 mov frame_RSPSAVE(%rsp), %rsp
14416
14417 nowork:
14418 + pax_force_retaddr
14419 ret
14420 ENDPROC(sha512_transform_ssse3)
14421
14422 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14423 index 0505813..b067311 100644
14424 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14426 @@ -24,6 +24,7 @@
14427 */
14428
14429 #include <linux/linkage.h>
14430 +#include <asm/alternative-asm.h>
14431 #include "glue_helper-asm-avx.S"
14432
14433 .file "twofish-avx-x86_64-asm_64.S"
14434 @@ -284,6 +285,7 @@ __twofish_enc_blk8:
14435 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14436 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14437
14438 + pax_force_retaddr
14439 ret;
14440 ENDPROC(__twofish_enc_blk8)
14441
14442 @@ -324,6 +326,7 @@ __twofish_dec_blk8:
14443 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14445
14446 + pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_dec_blk8)
14449
14450 @@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14451
14452 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14453
14454 + pax_force_retaddr
14455 ret;
14456 ENDPROC(twofish_ecb_enc_8way)
14457
14458 @@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14459
14460 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14461
14462 + pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_dec_8way)
14465
14466 @@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14467 * %rdx: src
14468 */
14469
14470 - pushq %r12;
14471 + pushq %r14;
14472
14473 movq %rsi, %r11;
14474 - movq %rdx, %r12;
14475 + movq %rdx, %r14;
14476
14477 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14478
14479 call __twofish_dec_blk8;
14480
14481 - store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14482 + store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14483
14484 - popq %r12;
14485 + popq %r14;
14486
14487 + pax_force_retaddr
14488 ret;
14489 ENDPROC(twofish_cbc_dec_8way)
14490
14491 @@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14492 * %rcx: iv (little endian, 128bit)
14493 */
14494
14495 - pushq %r12;
14496 + pushq %r14;
14497
14498 movq %rsi, %r11;
14499 - movq %rdx, %r12;
14500 + movq %rdx, %r14;
14501
14502 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14503 RD2, RX0, RX1, RY0);
14504
14505 call __twofish_enc_blk8;
14506
14507 - store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14508 + store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14509
14510 - popq %r12;
14511 + popq %r14;
14512
14513 + pax_force_retaddr
14514 ret;
14515 ENDPROC(twofish_ctr_8way)
14516
14517 @@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14518 /* dst <= regs xor IVs(in dst) */
14519 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14520
14521 + pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_xts_enc_8way)
14524
14525 @@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14528
14529 + pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_dec_8way)
14532 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14533 index 1c3b7ce..02f578d 100644
14534 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14536 @@ -21,6 +21,7 @@
14537 */
14538
14539 #include <linux/linkage.h>
14540 +#include <asm/alternative-asm.h>
14541
14542 .file "twofish-x86_64-asm-3way.S"
14543 .text
14544 @@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14545 popq %r13;
14546 popq %r14;
14547 popq %r15;
14548 + pax_force_retaddr
14549 ret;
14550
14551 .L__enc_xor3:
14552 @@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556 + pax_force_retaddr
14557 ret;
14558 ENDPROC(__twofish_enc_blk_3way)
14559
14560 @@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564 + pax_force_retaddr
14565 ret;
14566 ENDPROC(twofish_dec_blk_3way)
14567 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14568 index a039d21..524b8b2 100644
14569 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14570 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14571 @@ -22,6 +22,7 @@
14572
14573 #include <linux/linkage.h>
14574 #include <asm/asm-offsets.h>
14575 +#include <asm/alternative-asm.h>
14576
14577 #define a_offset 0
14578 #define b_offset 4
14579 @@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14580
14581 popq R1
14582 movq $1,%rax
14583 + pax_force_retaddr
14584 ret
14585 ENDPROC(twofish_enc_blk)
14586
14587 @@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14588
14589 popq R1
14590 movq $1,%rax
14591 + pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_dec_blk)
14594 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14595 index df91466..74b31cb 100644
14596 --- a/arch/x86/ia32/ia32_aout.c
14597 +++ b/arch/x86/ia32/ia32_aout.c
14598 @@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14599 unsigned long dump_start, dump_size;
14600 struct user32 dump;
14601
14602 + memset(&dump, 0, sizeof(dump));
14603 +
14604 fs = get_fs();
14605 set_fs(KERNEL_DS);
14606 has_dumped = 1;
14607 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14608 index f9e181a..300544c 100644
14609 --- a/arch/x86/ia32/ia32_signal.c
14610 +++ b/arch/x86/ia32/ia32_signal.c
14611 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14612 if (__get_user(set.sig[0], &frame->sc.oldmask)
14613 || (_COMPAT_NSIG_WORDS > 1
14614 && __copy_from_user((((char *) &set.sig) + 4),
14615 - &frame->extramask,
14616 + frame->extramask,
14617 sizeof(frame->extramask))))
14618 goto badframe;
14619
14620 @@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14621 sp -= frame_size;
14622 /* Align the stack pointer according to the i386 ABI,
14623 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14624 - sp = ((sp + 4) & -16ul) - 4;
14625 + sp = ((sp - 12) & -16ul) - 4;
14626 return (void __user *) sp;
14627 }
14628
14629 @@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14630 } else {
14631 /* Return stub is in 32bit vsyscall page */
14632 if (current->mm->context.vdso)
14633 - restorer = current->mm->context.vdso +
14634 - selected_vdso32->sym___kernel_sigreturn;
14635 + restorer = (void __force_user *)(current->mm->context.vdso +
14636 + selected_vdso32->sym___kernel_sigreturn);
14637 else
14638 - restorer = &frame->retcode;
14639 + restorer = frame->retcode;
14640 }
14641
14642 put_user_try {
14643 @@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14644 * These are actually not used anymore, but left because some
14645 * gdb versions depend on them as a marker.
14646 */
14647 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14648 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14649 } put_user_catch(err);
14650
14651 if (err)
14652 @@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14653 0xb8,
14654 __NR_ia32_rt_sigreturn,
14655 0x80cd,
14656 - 0,
14657 + 0
14658 };
14659
14660 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14661 @@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14662
14663 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14664 restorer = ksig->ka.sa.sa_restorer;
14665 + else if (current->mm->context.vdso)
14666 + /* Return stub is in 32bit vsyscall page */
14667 + restorer = (void __force_user *)(current->mm->context.vdso +
14668 + selected_vdso32->sym___kernel_rt_sigreturn);
14669 else
14670 - restorer = current->mm->context.vdso +
14671 - selected_vdso32->sym___kernel_rt_sigreturn;
14672 + restorer = frame->retcode;
14673 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14674
14675 /*
14676 * Not actually used anymore, but left because some gdb
14677 * versions need it.
14678 */
14679 - put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14680 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14681 } put_user_catch(err);
14682
14683 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14684 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14685 index ffe7122..899bad3 100644
14686 --- a/arch/x86/ia32/ia32entry.S
14687 +++ b/arch/x86/ia32/ia32entry.S
14688 @@ -15,8 +15,10 @@
14689 #include <asm/irqflags.h>
14690 #include <asm/asm.h>
14691 #include <asm/smap.h>
14692 +#include <asm/pgtable.h>
14693 #include <linux/linkage.h>
14694 #include <linux/err.h>
14695 +#include <asm/alternative-asm.h>
14696
14697 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14698 #include <linux/elf-em.h>
14699 @@ -62,12 +64,12 @@
14700 */
14701 .macro LOAD_ARGS32 offset, _r9=0
14702 .if \_r9
14703 - movl \offset+16(%rsp),%r9d
14704 + movl \offset+R9(%rsp),%r9d
14705 .endif
14706 - movl \offset+40(%rsp),%ecx
14707 - movl \offset+48(%rsp),%edx
14708 - movl \offset+56(%rsp),%esi
14709 - movl \offset+64(%rsp),%edi
14710 + movl \offset+RCX(%rsp),%ecx
14711 + movl \offset+RDX(%rsp),%edx
14712 + movl \offset+RSI(%rsp),%esi
14713 + movl \offset+RDI(%rsp),%edi
14714 movl %eax,%eax /* zero extension */
14715 .endm
14716
14717 @@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14718 ENDPROC(native_irq_enable_sysexit)
14719 #endif
14720
14721 + .macro pax_enter_kernel_user
14722 + pax_set_fptr_mask
14723 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14724 + call pax_enter_kernel_user
14725 +#endif
14726 + .endm
14727 +
14728 + .macro pax_exit_kernel_user
14729 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14730 + call pax_exit_kernel_user
14731 +#endif
14732 +#ifdef CONFIG_PAX_RANDKSTACK
14733 + pushq %rax
14734 + pushq %r11
14735 + call pax_randomize_kstack
14736 + popq %r11
14737 + popq %rax
14738 +#endif
14739 + .endm
14740 +
14741 + .macro pax_erase_kstack
14742 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14743 + call pax_erase_kstack
14744 +#endif
14745 + .endm
14746 +
14747 /*
14748 * 32bit SYSENTER instruction entry.
14749 *
14750 @@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14751 CFI_REGISTER rsp,rbp
14752 SWAPGS_UNSAFE_STACK
14753 movq PER_CPU_VAR(kernel_stack), %rsp
14754 - addq $(KERNEL_STACK_OFFSET),%rsp
14755 - /*
14756 - * No need to follow this irqs on/off section: the syscall
14757 - * disabled irqs, here we enable it straight after entry:
14758 - */
14759 - ENABLE_INTERRUPTS(CLBR_NONE)
14760 movl %ebp,%ebp /* zero extension */
14761 pushq_cfi $__USER32_DS
14762 /*CFI_REL_OFFSET ss,0*/
14763 @@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14764 CFI_REL_OFFSET rsp,0
14765 pushfq_cfi
14766 /*CFI_REL_OFFSET rflags,0*/
14767 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14768 - CFI_REGISTER rip,r10
14769 + orl $X86_EFLAGS_IF,(%rsp)
14770 + GET_THREAD_INFO(%r11)
14771 + movl TI_sysenter_return(%r11), %r11d
14772 + CFI_REGISTER rip,r11
14773 pushq_cfi $__USER32_CS
14774 /*CFI_REL_OFFSET cs,0*/
14775 movl %eax, %eax
14776 - pushq_cfi %r10
14777 + pushq_cfi %r11
14778 CFI_REL_OFFSET rip,0
14779 pushq_cfi %rax
14780 cld
14781 SAVE_ARGS 0,1,0
14782 + pax_enter_kernel_user
14783 +
14784 +#ifdef CONFIG_PAX_RANDKSTACK
14785 + pax_erase_kstack
14786 +#endif
14787 +
14788 + /*
14789 + * No need to follow this irqs on/off section: the syscall
14790 + * disabled irqs, here we enable it straight after entry:
14791 + */
14792 + ENABLE_INTERRUPTS(CLBR_NONE)
14793 /* no need to do an access_ok check here because rbp has been
14794 32bit zero extended */
14795 +
14796 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14797 + addq pax_user_shadow_base,%rbp
14798 + ASM_PAX_OPEN_USERLAND
14799 +#endif
14800 +
14801 ASM_STAC
14802 1: movl (%rbp),%ebp
14803 _ASM_EXTABLE(1b,ia32_badarg)
14804 ASM_CLAC
14805
14806 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14807 + ASM_PAX_CLOSE_USERLAND
14808 +#endif
14809 +
14810 /*
14811 * Sysenter doesn't filter flags, so we need to clear NT
14812 * ourselves. To save a few cycles, we can check whether
14813 @@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14814 jnz sysenter_fix_flags
14815 sysenter_flags_fixed:
14816
14817 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14818 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14819 + GET_THREAD_INFO(%r11)
14820 + orl $TS_COMPAT,TI_status(%r11)
14821 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14822 CFI_REMEMBER_STATE
14823 jnz sysenter_tracesys
14824 cmpq $(IA32_NR_syscalls-1),%rax
14825 @@ -172,15 +218,18 @@ sysenter_do_call:
14826 sysenter_dispatch:
14827 call *ia32_sys_call_table(,%rax,8)
14828 movq %rax,RAX-ARGOFFSET(%rsp)
14829 + GET_THREAD_INFO(%r11)
14830 DISABLE_INTERRUPTS(CLBR_NONE)
14831 TRACE_IRQS_OFF
14832 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14833 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14834 jnz sysexit_audit
14835 sysexit_from_sys_call:
14836 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14837 + pax_exit_kernel_user
14838 + pax_erase_kstack
14839 + andl $~TS_COMPAT,TI_status(%r11)
14840 /* clear IF, that popfq doesn't enable interrupts early */
14841 - andl $~0x200,EFLAGS-R11(%rsp)
14842 - movl RIP-R11(%rsp),%edx /* User %eip */
14843 + andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14844 + movl RIP(%rsp),%edx /* User %eip */
14845 CFI_REGISTER rip,rdx
14846 RESTORE_ARGS 0,24,0,0,0,0
14847 xorq %r8,%r8
14848 @@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852 +
14853 + pax_erase_kstack
14854 +
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858 @@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867 @@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871 + GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877 + testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881 @@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890 @@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894 +
14895 + pax_erase_kstack
14896 +
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900 @@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905 + CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912 + SAVE_ARGS 8*6,0,0
14913 + pax_enter_kernel_user
14914 +
14915 +#ifdef CONFIG_PAX_RANDKSTACK
14916 + pax_erase_kstack
14917 +#endif
14918 +
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924 - SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928 @@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932 +
14933 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14934 + ASM_PAX_OPEN_USERLAND
14935 + movq pax_user_shadow_base,%r8
14936 + addq RSP-ARGOFFSET(%rsp),%r8
14937 +#endif
14938 +
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945 +
14946 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14947 + ASM_PAX_CLOSE_USERLAND
14948 +#endif
14949 +
14950 + GET_THREAD_INFO(%r11)
14951 + orl $TS_COMPAT,TI_status(%r11)
14952 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956 @@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960 + GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968 - RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969 + pax_exit_kernel_user
14970 + pax_erase_kstack
14971 + andl $~TS_COMPAT,TI_status(%r11)
14972 + RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976 @@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985 @@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989 +
14990 + pax_erase_kstack
14991 +
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997 +
14998 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14999 + ASM_PAX_CLOSE_USERLAND
15000 +#endif
15001 +
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005 @@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009 - /*
15010 - * No need to follow this irqs on/off section: the syscall
15011 - * disabled irqs and here we enable it straight after entry:
15012 - */
15013 - ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022 + pax_enter_kernel_user
15023 +
15024 +#ifdef CONFIG_PAX_RANDKSTACK
15025 + pax_erase_kstack
15026 +#endif
15027 +
15028 + /*
15029 + * No need to follow this irqs on/off section: the syscall
15030 + * disabled irqs and here we enable it straight after entry:
15031 + */
15032 + ENABLE_INTERRUPTS(CLBR_NONE)
15033 + GET_THREAD_INFO(%r11)
15034 + orl $TS_COMPAT,TI_status(%r11)
15035 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039 @@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043 +
15044 + pax_erase_kstack
15045 +
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050 index 8e0ceec..af13504 100644
15051 --- a/arch/x86/ia32/sys_ia32.c
15052 +++ b/arch/x86/ia32/sys_ia32.c
15053 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057 - typeof(ubuf->st_uid) uid = 0;
15058 - typeof(ubuf->st_gid) gid = 0;
15059 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065 index 372231c..51b537d 100644
15066 --- a/arch/x86/include/asm/alternative-asm.h
15067 +++ b/arch/x86/include/asm/alternative-asm.h
15068 @@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072 +#ifdef KERNEXEC_PLUGIN
15073 + .macro pax_force_retaddr_bts rip=0
15074 + btsq $63,\rip(%rsp)
15075 + .endm
15076 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077 + .macro pax_force_retaddr rip=0, reload=0
15078 + btsq $63,\rip(%rsp)
15079 + .endm
15080 + .macro pax_force_fptr ptr
15081 + btsq $63,\ptr
15082 + .endm
15083 + .macro pax_set_fptr_mask
15084 + .endm
15085 +#endif
15086 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087 + .macro pax_force_retaddr rip=0, reload=0
15088 + .if \reload
15089 + pax_set_fptr_mask
15090 + .endif
15091 + orq %r12,\rip(%rsp)
15092 + .endm
15093 + .macro pax_force_fptr ptr
15094 + orq %r12,\ptr
15095 + .endm
15096 + .macro pax_set_fptr_mask
15097 + movabs $0x8000000000000000,%r12
15098 + .endm
15099 +#endif
15100 +#else
15101 + .macro pax_force_retaddr rip=0, reload=0
15102 + .endm
15103 + .macro pax_force_fptr ptr
15104 + .endm
15105 + .macro pax_force_retaddr_bts rip=0
15106 + .endm
15107 + .macro pax_set_fptr_mask
15108 + .endm
15109 +#endif
15110 +
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115 index 473bdbe..b1e3377 100644
15116 --- a/arch/x86/include/asm/alternative.h
15117 +++ b/arch/x86/include/asm/alternative.h
15118 @@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15123 + ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127 @@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131 - ".pushsection .altinstr_replacement, \"ax\"\n" \
15132 + ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137 index 465b309..ab7e51f 100644
15138 --- a/arch/x86/include/asm/apic.h
15139 +++ b/arch/x86/include/asm/apic.h
15140 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144 -extern unsigned int apic_verbosity;
15145 +extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150 index 20370c6..a2eb9b0 100644
15151 --- a/arch/x86/include/asm/apm.h
15152 +++ b/arch/x86/include/asm/apm.h
15153 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157 - "lcall *%%cs:apm_bios_entry\n\t"
15158 + "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166 - "lcall *%%cs:apm_bios_entry\n\t"
15167 + "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172 index 5e5cd12..3d18208 100644
15173 --- a/arch/x86/include/asm/atomic.h
15174 +++ b/arch/x86/include/asm/atomic.h
15175 @@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179 + * atomic_read_unchecked - read atomic variable
15180 + * @v: pointer of type atomic_unchecked_t
15181 + *
15182 + * Atomically reads the value of @v.
15183 + */
15184 +static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185 +{
15186 + return ACCESS_ONCE((v)->counter);
15187 +}
15188 +
15189 +/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193 @@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197 + * atomic_set_unchecked - set atomic variable
15198 + * @v: pointer of type atomic_unchecked_t
15199 + * @i: required value
15200 + *
15201 + * Atomically sets the value of @v to @i.
15202 + */
15203 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204 +{
15205 + v->counter = i;
15206 +}
15207 +
15208 +/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212 @@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216 - asm volatile(LOCK_PREFIX "addl %1,%0"
15217 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218 +
15219 +#ifdef CONFIG_PAX_REFCOUNT
15220 + "jno 0f\n"
15221 + LOCK_PREFIX "subl %1,%0\n"
15222 + "int $4\n0:\n"
15223 + _ASM_EXTABLE(0b, 0b)
15224 +#endif
15225 +
15226 + : "+m" (v->counter)
15227 + : "ir" (i));
15228 +}
15229 +
15230 +/**
15231 + * atomic_add_unchecked - add integer to atomic variable
15232 + * @i: integer value to add
15233 + * @v: pointer of type atomic_unchecked_t
15234 + *
15235 + * Atomically adds @i to @v.
15236 + */
15237 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238 +{
15239 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243 @@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247 - asm volatile(LOCK_PREFIX "subl %1,%0"
15248 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249 +
15250 +#ifdef CONFIG_PAX_REFCOUNT
15251 + "jno 0f\n"
15252 + LOCK_PREFIX "addl %1,%0\n"
15253 + "int $4\n0:\n"
15254 + _ASM_EXTABLE(0b, 0b)
15255 +#endif
15256 +
15257 + : "+m" (v->counter)
15258 + : "ir" (i));
15259 +}
15260 +
15261 +/**
15262 + * atomic_sub_unchecked - subtract integer from atomic variable
15263 + * @i: integer value to subtract
15264 + * @v: pointer of type atomic_unchecked_t
15265 + *
15266 + * Atomically subtracts @i from @v.
15267 + */
15268 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269 +{
15270 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274 @@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278 - GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279 + GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283 @@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287 - asm volatile(LOCK_PREFIX "incl %0"
15288 + asm volatile(LOCK_PREFIX "incl %0\n"
15289 +
15290 +#ifdef CONFIG_PAX_REFCOUNT
15291 + "jno 0f\n"
15292 + LOCK_PREFIX "decl %0\n"
15293 + "int $4\n0:\n"
15294 + _ASM_EXTABLE(0b, 0b)
15295 +#endif
15296 +
15297 + : "+m" (v->counter));
15298 +}
15299 +
15300 +/**
15301 + * atomic_inc_unchecked - increment atomic variable
15302 + * @v: pointer of type atomic_unchecked_t
15303 + *
15304 + * Atomically increments @v by 1.
15305 + */
15306 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307 +{
15308 + asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312 @@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316 - asm volatile(LOCK_PREFIX "decl %0"
15317 + asm volatile(LOCK_PREFIX "decl %0\n"
15318 +
15319 +#ifdef CONFIG_PAX_REFCOUNT
15320 + "jno 0f\n"
15321 + LOCK_PREFIX "incl %0\n"
15322 + "int $4\n0:\n"
15323 + _ASM_EXTABLE(0b, 0b)
15324 +#endif
15325 +
15326 + : "+m" (v->counter));
15327 +}
15328 +
15329 +/**
15330 + * atomic_dec_unchecked - decrement atomic variable
15331 + * @v: pointer of type atomic_unchecked_t
15332 + *
15333 + * Atomically decrements @v by 1.
15334 + */
15335 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336 +{
15337 + asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341 @@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345 - GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346 + GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350 @@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354 - GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355 + GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356 +}
15357 +
15358 +/**
15359 + * atomic_inc_and_test_unchecked - increment and test
15360 + * @v: pointer of type atomic_unchecked_t
15361 + *
15362 + * Atomically increments @v by 1
15363 + * and returns true if the result is zero, or false for all
15364 + * other cases.
15365 + */
15366 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367 +{
15368 + GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372 @@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376 - GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377 + GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381 @@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385 -static inline int atomic_add_return(int i, atomic_t *v)
15386 +static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387 +{
15388 + return i + xadd_check_overflow(&v->counter, i);
15389 +}
15390 +
15391 +/**
15392 + * atomic_add_return_unchecked - add integer and return
15393 + * @i: integer value to add
15394 + * @v: pointer of type atomic_unchecked_t
15395 + *
15396 + * Atomically adds @i to @v and returns @i + @v
15397 + */
15398 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402 @@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406 -static inline int atomic_sub_return(int i, atomic_t *v)
15407 +static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414 +{
15415 + return atomic_add_return_unchecked(1, v);
15416 +}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419 -static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420 +static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421 +{
15422 + return cmpxchg(&v->counter, old, new);
15423 +}
15424 +
15425 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429 @@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434 +{
15435 + return xchg(&v->counter, new);
15436 +}
15437 +
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441 @@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 * Atomically adds @a to @v, so long as @v was not already @u.
15443 * Returns the old value of @v.
15444 */
15445 -static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15446 +static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15447 {
15448 - int c, old;
15449 + int c, old, new;
15450 c = atomic_read(v);
15451 for (;;) {
15452 - if (unlikely(c == (u)))
15453 + if (unlikely(c == u))
15454 break;
15455 - old = atomic_cmpxchg((v), c, c + (a));
15456 +
15457 + asm volatile("addl %2,%0\n"
15458 +
15459 +#ifdef CONFIG_PAX_REFCOUNT
15460 + "jno 0f\n"
15461 + "subl %2,%0\n"
15462 + "int $4\n0:\n"
15463 + _ASM_EXTABLE(0b, 0b)
15464 +#endif
15465 +
15466 + : "=r" (new)
15467 + : "0" (c), "ir" (a));
15468 +
15469 + old = atomic_cmpxchg(v, c, new);
15470 if (likely(old == c))
15471 break;
15472 c = old;
15473 @@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15474 }
15475
15476 /**
15477 + * atomic_inc_not_zero_hint - increment if not null
15478 + * @v: pointer of type atomic_t
15479 + * @hint: probable value of the atomic before the increment
15480 + *
15481 + * This version of atomic_inc_not_zero() gives a hint of probable
15482 + * value of the atomic. This helps processor to not read the memory
15483 + * before doing the atomic read/modify/write cycle, lowering
15484 + * number of bus transactions on some arches.
15485 + *
15486 + * Returns: 0 if increment was not done, 1 otherwise.
15487 + */
15488 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15489 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15490 +{
15491 + int val, c = hint, new;
15492 +
15493 + /* sanity test, should be removed by compiler if hint is a constant */
15494 + if (!hint)
15495 + return __atomic_add_unless(v, 1, 0);
15496 +
15497 + do {
15498 + asm volatile("incl %0\n"
15499 +
15500 +#ifdef CONFIG_PAX_REFCOUNT
15501 + "jno 0f\n"
15502 + "decl %0\n"
15503 + "int $4\n0:\n"
15504 + _ASM_EXTABLE(0b, 0b)
15505 +#endif
15506 +
15507 + : "=r" (new)
15508 + : "0" (c));
15509 +
15510 + val = atomic_cmpxchg(v, c, new);
15511 + if (val == c)
15512 + return 1;
15513 + c = val;
15514 + } while (c);
15515 +
15516 + return 0;
15517 +}
15518 +
15519 +/**
15520 * atomic_inc_short - increment of a short integer
15521 * @v: pointer to type int
15522 *
15523 @@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15524 }
15525
15526 /* These are x86-specific, used by some header files */
15527 -#define atomic_clear_mask(mask, addr) \
15528 - asm volatile(LOCK_PREFIX "andl %0,%1" \
15529 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
15530 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15531 +{
15532 + asm volatile(LOCK_PREFIX "andl %1,%0"
15533 + : "+m" (v->counter)
15534 + : "r" (~(mask))
15535 + : "memory");
15536 +}
15537
15538 -#define atomic_set_mask(mask, addr) \
15539 - asm volatile(LOCK_PREFIX "orl %0,%1" \
15540 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15541 - : "memory")
15542 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15543 +{
15544 + asm volatile(LOCK_PREFIX "andl %1,%0"
15545 + : "+m" (v->counter)
15546 + : "r" (~(mask))
15547 + : "memory");
15548 +}
15549 +
15550 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15551 +{
15552 + asm volatile(LOCK_PREFIX "orl %1,%0"
15553 + : "+m" (v->counter)
15554 + : "r" (mask)
15555 + : "memory");
15556 +}
15557 +
15558 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15559 +{
15560 + asm volatile(LOCK_PREFIX "orl %1,%0"
15561 + : "+m" (v->counter)
15562 + : "r" (mask)
15563 + : "memory");
15564 +}
15565
15566 #ifdef CONFIG_X86_32
15567 # include <asm/atomic64_32.h>
15568 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15569 index b154de7..bf18a5a 100644
15570 --- a/arch/x86/include/asm/atomic64_32.h
15571 +++ b/arch/x86/include/asm/atomic64_32.h
15572 @@ -12,6 +12,14 @@ typedef struct {
15573 u64 __aligned(8) counter;
15574 } atomic64_t;
15575
15576 +#ifdef CONFIG_PAX_REFCOUNT
15577 +typedef struct {
15578 + u64 __aligned(8) counter;
15579 +} atomic64_unchecked_t;
15580 +#else
15581 +typedef atomic64_t atomic64_unchecked_t;
15582 +#endif
15583 +
15584 #define ATOMIC64_INIT(val) { (val) }
15585
15586 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15587 @@ -37,21 +45,31 @@ typedef struct {
15588 ATOMIC64_DECL_ONE(sym##_386)
15589
15590 ATOMIC64_DECL_ONE(add_386);
15591 +ATOMIC64_DECL_ONE(add_unchecked_386);
15592 ATOMIC64_DECL_ONE(sub_386);
15593 +ATOMIC64_DECL_ONE(sub_unchecked_386);
15594 ATOMIC64_DECL_ONE(inc_386);
15595 +ATOMIC64_DECL_ONE(inc_unchecked_386);
15596 ATOMIC64_DECL_ONE(dec_386);
15597 +ATOMIC64_DECL_ONE(dec_unchecked_386);
15598 #endif
15599
15600 #define alternative_atomic64(f, out, in...) \
15601 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15602
15603 ATOMIC64_DECL(read);
15604 +ATOMIC64_DECL(read_unchecked);
15605 ATOMIC64_DECL(set);
15606 +ATOMIC64_DECL(set_unchecked);
15607 ATOMIC64_DECL(xchg);
15608 ATOMIC64_DECL(add_return);
15609 +ATOMIC64_DECL(add_return_unchecked);
15610 ATOMIC64_DECL(sub_return);
15611 +ATOMIC64_DECL(sub_return_unchecked);
15612 ATOMIC64_DECL(inc_return);
15613 +ATOMIC64_DECL(inc_return_unchecked);
15614 ATOMIC64_DECL(dec_return);
15615 +ATOMIC64_DECL(dec_return_unchecked);
15616 ATOMIC64_DECL(dec_if_positive);
15617 ATOMIC64_DECL(inc_not_zero);
15618 ATOMIC64_DECL(add_unless);
15619 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15620 }
15621
15622 /**
15623 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15624 + * @p: pointer to type atomic64_unchecked_t
15625 + * @o: expected value
15626 + * @n: new value
15627 + *
15628 + * Atomically sets @v to @n if it was equal to @o and returns
15629 + * the old value.
15630 + */
15631 +
15632 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15633 +{
15634 + return cmpxchg64(&v->counter, o, n);
15635 +}
15636 +
15637 +/**
15638 * atomic64_xchg - xchg atomic64 variable
15639 * @v: pointer to type atomic64_t
15640 * @n: value to assign
15641 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15642 }
15643
15644 /**
15645 + * atomic64_set_unchecked - set atomic64 variable
15646 + * @v: pointer to type atomic64_unchecked_t
15647 + * @n: value to assign
15648 + *
15649 + * Atomically sets the value of @v to @n.
15650 + */
15651 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15652 +{
15653 + unsigned high = (unsigned)(i >> 32);
15654 + unsigned low = (unsigned)i;
15655 + alternative_atomic64(set, /* no output */,
15656 + "S" (v), "b" (low), "c" (high)
15657 + : "eax", "edx", "memory");
15658 +}
15659 +
15660 +/**
15661 * atomic64_read - read atomic64 variable
15662 * @v: pointer to type atomic64_t
15663 *
15664 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15665 }
15666
15667 /**
15668 + * atomic64_read_unchecked - read atomic64 variable
15669 + * @v: pointer to type atomic64_unchecked_t
15670 + *
15671 + * Atomically reads the value of @v and returns it.
15672 + */
15673 +static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15674 +{
15675 + long long r;
15676 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15677 + return r;
15678 + }
15679 +
15680 +/**
15681 * atomic64_add_return - add and return
15682 * @i: integer value to add
15683 * @v: pointer to type atomic64_t
15684 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15685 return i;
15686 }
15687
15688 +/**
15689 + * atomic64_add_return_unchecked - add and return
15690 + * @i: integer value to add
15691 + * @v: pointer to type atomic64_unchecked_t
15692 + *
15693 + * Atomically adds @i to @v and returns @i + *@v
15694 + */
15695 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15696 +{
15697 + alternative_atomic64(add_return_unchecked,
15698 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15699 + ASM_NO_INPUT_CLOBBER("memory"));
15700 + return i;
15701 +}
15702 +
15703 /*
15704 * Other variants with different arithmetic operators:
15705 */
15706 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15707 return a;
15708 }
15709
15710 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15711 +{
15712 + long long a;
15713 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
15714 + "S" (v) : "memory", "ecx");
15715 + return a;
15716 +}
15717 +
15718 static inline long long atomic64_dec_return(atomic64_t *v)
15719 {
15720 long long a;
15721 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15722 }
15723
15724 /**
15725 + * atomic64_add_unchecked - add integer to atomic64 variable
15726 + * @i: integer value to add
15727 + * @v: pointer to type atomic64_unchecked_t
15728 + *
15729 + * Atomically adds @i to @v.
15730 + */
15731 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15732 +{
15733 + __alternative_atomic64(add_unchecked, add_return_unchecked,
15734 + ASM_OUTPUT2("+A" (i), "+c" (v)),
15735 + ASM_NO_INPUT_CLOBBER("memory"));
15736 + return i;
15737 +}
15738 +
15739 +/**
15740 * atomic64_sub - subtract the atomic64 variable
15741 * @i: integer value to subtract
15742 * @v: pointer to type atomic64_t
15743 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15744 index f8d273e..02f39f3 100644
15745 --- a/arch/x86/include/asm/atomic64_64.h
15746 +++ b/arch/x86/include/asm/atomic64_64.h
15747 @@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15748 }
15749
15750 /**
15751 + * atomic64_read_unchecked - read atomic64 variable
15752 + * @v: pointer of type atomic64_unchecked_t
15753 + *
15754 + * Atomically reads the value of @v.
15755 + * Doesn't imply a read memory barrier.
15756 + */
15757 +static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15758 +{
15759 + return ACCESS_ONCE((v)->counter);
15760 +}
15761 +
15762 +/**
15763 * atomic64_set - set atomic64 variable
15764 * @v: pointer to type atomic64_t
15765 * @i: required value
15766 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15767 }
15768
15769 /**
15770 + * atomic64_set_unchecked - set atomic64 variable
15771 + * @v: pointer to type atomic64_unchecked_t
15772 + * @i: required value
15773 + *
15774 + * Atomically sets the value of @v to @i.
15775 + */
15776 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15777 +{
15778 + v->counter = i;
15779 +}
15780 +
15781 +/**
15782 * atomic64_add - add integer to atomic64 variable
15783 * @i: integer value to add
15784 * @v: pointer to type atomic64_t
15785 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15786 */
15787 static inline void atomic64_add(long i, atomic64_t *v)
15788 {
15789 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
15790 +
15791 +#ifdef CONFIG_PAX_REFCOUNT
15792 + "jno 0f\n"
15793 + LOCK_PREFIX "subq %1,%0\n"
15794 + "int $4\n0:\n"
15795 + _ASM_EXTABLE(0b, 0b)
15796 +#endif
15797 +
15798 + : "=m" (v->counter)
15799 + : "er" (i), "m" (v->counter));
15800 +}
15801 +
15802 +/**
15803 + * atomic64_add_unchecked - add integer to atomic64 variable
15804 + * @i: integer value to add
15805 + * @v: pointer to type atomic64_unchecked_t
15806 + *
15807 + * Atomically adds @i to @v.
15808 + */
15809 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15810 +{
15811 asm volatile(LOCK_PREFIX "addq %1,%0"
15812 : "=m" (v->counter)
15813 : "er" (i), "m" (v->counter));
15814 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15815 */
15816 static inline void atomic64_sub(long i, atomic64_t *v)
15817 {
15818 - asm volatile(LOCK_PREFIX "subq %1,%0"
15819 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15820 +
15821 +#ifdef CONFIG_PAX_REFCOUNT
15822 + "jno 0f\n"
15823 + LOCK_PREFIX "addq %1,%0\n"
15824 + "int $4\n0:\n"
15825 + _ASM_EXTABLE(0b, 0b)
15826 +#endif
15827 +
15828 + : "=m" (v->counter)
15829 + : "er" (i), "m" (v->counter));
15830 +}
15831 +
15832 +/**
15833 + * atomic64_sub_unchecked - subtract the atomic64 variable
15834 + * @i: integer value to subtract
15835 + * @v: pointer to type atomic64_unchecked_t
15836 + *
15837 + * Atomically subtracts @i from @v.
15838 + */
15839 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15840 +{
15841 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
15842 : "=m" (v->counter)
15843 : "er" (i), "m" (v->counter));
15844 }
15845 @@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15846 */
15847 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15848 {
15849 - GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15850 + GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15851 }
15852
15853 /**
15854 @@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15855 */
15856 static inline void atomic64_inc(atomic64_t *v)
15857 {
15858 + asm volatile(LOCK_PREFIX "incq %0\n"
15859 +
15860 +#ifdef CONFIG_PAX_REFCOUNT
15861 + "jno 0f\n"
15862 + LOCK_PREFIX "decq %0\n"
15863 + "int $4\n0:\n"
15864 + _ASM_EXTABLE(0b, 0b)
15865 +#endif
15866 +
15867 + : "=m" (v->counter)
15868 + : "m" (v->counter));
15869 +}
15870 +
15871 +/**
15872 + * atomic64_inc_unchecked - increment atomic64 variable
15873 + * @v: pointer to type atomic64_unchecked_t
15874 + *
15875 + * Atomically increments @v by 1.
15876 + */
15877 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15878 +{
15879 asm volatile(LOCK_PREFIX "incq %0"
15880 : "=m" (v->counter)
15881 : "m" (v->counter));
15882 @@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15883 */
15884 static inline void atomic64_dec(atomic64_t *v)
15885 {
15886 - asm volatile(LOCK_PREFIX "decq %0"
15887 + asm volatile(LOCK_PREFIX "decq %0\n"
15888 +
15889 +#ifdef CONFIG_PAX_REFCOUNT
15890 + "jno 0f\n"
15891 + LOCK_PREFIX "incq %0\n"
15892 + "int $4\n0:\n"
15893 + _ASM_EXTABLE(0b, 0b)
15894 +#endif
15895 +
15896 + : "=m" (v->counter)
15897 + : "m" (v->counter));
15898 +}
15899 +
15900 +/**
15901 + * atomic64_dec_unchecked - decrement atomic64 variable
15902 + * @v: pointer to type atomic64_t
15903 + *
15904 + * Atomically decrements @v by 1.
15905 + */
15906 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15907 +{
15908 + asm volatile(LOCK_PREFIX "decq %0\n"
15909 : "=m" (v->counter)
15910 : "m" (v->counter));
15911 }
15912 @@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15913 */
15914 static inline int atomic64_dec_and_test(atomic64_t *v)
15915 {
15916 - GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15917 + GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15918 }
15919
15920 /**
15921 @@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15922 */
15923 static inline int atomic64_inc_and_test(atomic64_t *v)
15924 {
15925 - GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15926 + GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15927 }
15928
15929 /**
15930 @@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15931 */
15932 static inline int atomic64_add_negative(long i, atomic64_t *v)
15933 {
15934 - GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15935 + GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15936 }
15937
15938 /**
15939 @@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15940 */
15941 static inline long atomic64_add_return(long i, atomic64_t *v)
15942 {
15943 + return i + xadd_check_overflow(&v->counter, i);
15944 +}
15945 +
15946 +/**
15947 + * atomic64_add_return_unchecked - add and return
15948 + * @i: integer value to add
15949 + * @v: pointer to type atomic64_unchecked_t
15950 + *
15951 + * Atomically adds @i to @v and returns @i + @v
15952 + */
15953 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15954 +{
15955 return i + xadd(&v->counter, i);
15956 }
15957
15958 @@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15959 }
15960
15961 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15962 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15963 +{
15964 + return atomic64_add_return_unchecked(1, v);
15965 +}
15966 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15967
15968 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969 @@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15970 return cmpxchg(&v->counter, old, new);
15971 }
15972
15973 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15974 +{
15975 + return cmpxchg(&v->counter, old, new);
15976 +}
15977 +
15978 static inline long atomic64_xchg(atomic64_t *v, long new)
15979 {
15980 return xchg(&v->counter, new);
15981 @@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15982 */
15983 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15984 {
15985 - long c, old;
15986 + long c, old, new;
15987 c = atomic64_read(v);
15988 for (;;) {
15989 - if (unlikely(c == (u)))
15990 + if (unlikely(c == u))
15991 break;
15992 - old = atomic64_cmpxchg((v), c, c + (a));
15993 +
15994 + asm volatile("add %2,%0\n"
15995 +
15996 +#ifdef CONFIG_PAX_REFCOUNT
15997 + "jno 0f\n"
15998 + "sub %2,%0\n"
15999 + "int $4\n0:\n"
16000 + _ASM_EXTABLE(0b, 0b)
16001 +#endif
16002 +
16003 + : "=r" (new)
16004 + : "0" (c), "ir" (a));
16005 +
16006 + old = atomic64_cmpxchg(v, c, new);
16007 if (likely(old == c))
16008 break;
16009 c = old;
16010 }
16011 - return c != (u);
16012 + return c != u;
16013 }
16014
16015 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16016 diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16017 index 0f4460b..fa1ee19 100644
16018 --- a/arch/x86/include/asm/barrier.h
16019 +++ b/arch/x86/include/asm/barrier.h
16020 @@ -107,7 +107,7 @@
16021 do { \
16022 compiletime_assert_atomic_type(*p); \
16023 smp_mb(); \
16024 - ACCESS_ONCE(*p) = (v); \
16025 + ACCESS_ONCE_RW(*p) = (v); \
16026 } while (0)
16027
16028 #define smp_load_acquire(p) \
16029 @@ -124,7 +124,7 @@ do { \
16030 do { \
16031 compiletime_assert_atomic_type(*p); \
16032 barrier(); \
16033 - ACCESS_ONCE(*p) = (v); \
16034 + ACCESS_ONCE_RW(*p) = (v); \
16035 } while (0)
16036
16037 #define smp_load_acquire(p) \
16038 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16039 index cfe3b95..d01b118 100644
16040 --- a/arch/x86/include/asm/bitops.h
16041 +++ b/arch/x86/include/asm/bitops.h
16042 @@ -50,7 +50,7 @@
16043 * a mask operation on a byte.
16044 */
16045 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16046 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16047 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16048 #define CONST_MASK(nr) (1 << ((nr) & 7))
16049
16050 /**
16051 @@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16052 */
16053 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16054 {
16055 - GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16057 }
16058
16059 /**
16060 @@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16061 */
16062 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16063 {
16064 - GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16066 }
16067
16068 /**
16069 @@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16070 */
16071 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16072 {
16073 - GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074 + GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16075 }
16076
16077 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16078 @@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16079 *
16080 * Undefined if no bit exists, so code should check against 0 first.
16081 */
16082 -static inline unsigned long __ffs(unsigned long word)
16083 +static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16084 {
16085 asm("rep; bsf %1,%0"
16086 : "=r" (word)
16087 @@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16088 *
16089 * Undefined if no zero exists, so code should check against ~0UL first.
16090 */
16091 -static inline unsigned long ffz(unsigned long word)
16092 +static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16093 {
16094 asm("rep; bsf %1,%0"
16095 : "=r" (word)
16096 @@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16097 *
16098 * Undefined if no set bit exists, so code should check against 0 first.
16099 */
16100 -static inline unsigned long __fls(unsigned long word)
16101 +static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16102 {
16103 asm("bsr %1,%0"
16104 : "=r" (word)
16105 @@ -434,7 +434,7 @@ static inline int ffs(int x)
16106 * set bit if value is nonzero. The last (most significant) bit is
16107 * at position 32.
16108 */
16109 -static inline int fls(int x)
16110 +static inline int __intentional_overflow(-1) fls(int x)
16111 {
16112 int r;
16113
16114 @@ -476,7 +476,7 @@ static inline int fls(int x)
16115 * at position 64.
16116 */
16117 #ifdef CONFIG_X86_64
16118 -static __always_inline int fls64(__u64 x)
16119 +static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16120 {
16121 int bitpos = -1;
16122 /*
16123 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16124 index 4fa687a..60f2d39 100644
16125 --- a/arch/x86/include/asm/boot.h
16126 +++ b/arch/x86/include/asm/boot.h
16127 @@ -6,10 +6,15 @@
16128 #include <uapi/asm/boot.h>
16129
16130 /* Physical address where kernel should be loaded. */
16131 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16133 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16134 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16135
16136 +#ifndef __ASSEMBLY__
16137 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
16138 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16139 +#endif
16140 +
16141 /* Minimum kernel alignment, as a power of two */
16142 #ifdef CONFIG_X86_64
16143 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16144 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16145 index 48f99f1..d78ebf9 100644
16146 --- a/arch/x86/include/asm/cache.h
16147 +++ b/arch/x86/include/asm/cache.h
16148 @@ -5,12 +5,13 @@
16149
16150 /* L1 cache line size */
16151 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16152 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16153 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16154
16155 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16156 +#define __read_only __attribute__((__section__(".data..read_only")))
16157
16158 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16159 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16160 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16161
16162 #ifdef CONFIG_X86_VSMP
16163 #ifdef CONFIG_SMP
16164 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16165 index 9863ee3..4a1f8e1 100644
16166 --- a/arch/x86/include/asm/cacheflush.h
16167 +++ b/arch/x86/include/asm/cacheflush.h
16168 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16169 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16170
16171 if (pg_flags == _PGMT_DEFAULT)
16172 - return -1;
16173 + return ~0UL;
16174 else if (pg_flags == _PGMT_WC)
16175 return _PAGE_CACHE_WC;
16176 else if (pg_flags == _PGMT_UC_MINUS)
16177 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16178 index 76659b6..72b8439 100644
16179 --- a/arch/x86/include/asm/calling.h
16180 +++ b/arch/x86/include/asm/calling.h
16181 @@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16182 #define RSP 152
16183 #define SS 160
16184
16185 -#define ARGOFFSET R11
16186 -#define SWFRAME ORIG_RAX
16187 +#define ARGOFFSET R15
16188
16189 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16190 - subq $9*8+\addskip, %rsp
16191 - CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16192 - movq_cfi rdi, 8*8
16193 - movq_cfi rsi, 7*8
16194 - movq_cfi rdx, 6*8
16195 + subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16196 + CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16197 + movq_cfi rdi, RDI
16198 + movq_cfi rsi, RSI
16199 + movq_cfi rdx, RDX
16200
16201 .if \save_rcx
16202 - movq_cfi rcx, 5*8
16203 + movq_cfi rcx, RCX
16204 .endif
16205
16206 .if \rax_enosys
16207 - movq $-ENOSYS, 4*8(%rsp)
16208 + movq $-ENOSYS, RAX(%rsp)
16209 .else
16210 - movq_cfi rax, 4*8
16211 + movq_cfi rax, RAX
16212 .endif
16213
16214 .if \save_r891011
16215 - movq_cfi r8, 3*8
16216 - movq_cfi r9, 2*8
16217 - movq_cfi r10, 1*8
16218 - movq_cfi r11, 0*8
16219 + movq_cfi r8, R8
16220 + movq_cfi r9, R9
16221 + movq_cfi r10, R10
16222 + movq_cfi r11, R11
16223 .endif
16224
16225 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16226 + movq_cfi r12, R12
16227 +#endif
16228 +
16229 .endm
16230
16231 -#define ARG_SKIP (9*8)
16232 +#define ARG_SKIP ORIG_RAX
16233
16234 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16235 rstor_r8910=1, rstor_rdx=1
16236 +
16237 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16238 + movq_cfi_restore R12, r12
16239 +#endif
16240 +
16241 .if \rstor_r11
16242 - movq_cfi_restore 0*8, r11
16243 + movq_cfi_restore R11, r11
16244 .endif
16245
16246 .if \rstor_r8910
16247 - movq_cfi_restore 1*8, r10
16248 - movq_cfi_restore 2*8, r9
16249 - movq_cfi_restore 3*8, r8
16250 + movq_cfi_restore R10, r10
16251 + movq_cfi_restore R9, r9
16252 + movq_cfi_restore R8, r8
16253 .endif
16254
16255 .if \rstor_rax
16256 - movq_cfi_restore 4*8, rax
16257 + movq_cfi_restore RAX, rax
16258 .endif
16259
16260 .if \rstor_rcx
16261 - movq_cfi_restore 5*8, rcx
16262 + movq_cfi_restore RCX, rcx
16263 .endif
16264
16265 .if \rstor_rdx
16266 - movq_cfi_restore 6*8, rdx
16267 + movq_cfi_restore RDX, rdx
16268 .endif
16269
16270 - movq_cfi_restore 7*8, rsi
16271 - movq_cfi_restore 8*8, rdi
16272 + movq_cfi_restore RSI, rsi
16273 + movq_cfi_restore RDI, rdi
16274
16275 - .if ARG_SKIP+\addskip > 0
16276 - addq $ARG_SKIP+\addskip, %rsp
16277 - CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16278 + .if ORIG_RAX+\addskip > 0
16279 + addq $ORIG_RAX+\addskip, %rsp
16280 + CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16281 .endif
16282 .endm
16283
16284 - .macro LOAD_ARGS offset, skiprax=0
16285 - movq \offset(%rsp), %r11
16286 - movq \offset+8(%rsp), %r10
16287 - movq \offset+16(%rsp), %r9
16288 - movq \offset+24(%rsp), %r8
16289 - movq \offset+40(%rsp), %rcx
16290 - movq \offset+48(%rsp), %rdx
16291 - movq \offset+56(%rsp), %rsi
16292 - movq \offset+64(%rsp), %rdi
16293 + .macro LOAD_ARGS skiprax=0
16294 + movq R11(%rsp), %r11
16295 + movq R10(%rsp), %r10
16296 + movq R9(%rsp), %r9
16297 + movq R8(%rsp), %r8
16298 + movq RCX(%rsp), %rcx
16299 + movq RDX(%rsp), %rdx
16300 + movq RSI(%rsp), %rsi
16301 + movq RDI(%rsp), %rdi
16302 .if \skiprax
16303 .else
16304 - movq \offset+72(%rsp), %rax
16305 + movq ORIG_RAX(%rsp), %rax
16306 .endif
16307 .endm
16308
16309 -#define REST_SKIP (6*8)
16310 -
16311 .macro SAVE_REST
16312 - subq $REST_SKIP, %rsp
16313 - CFI_ADJUST_CFA_OFFSET REST_SKIP
16314 - movq_cfi rbx, 5*8
16315 - movq_cfi rbp, 4*8
16316 - movq_cfi r12, 3*8
16317 - movq_cfi r13, 2*8
16318 - movq_cfi r14, 1*8
16319 - movq_cfi r15, 0*8
16320 + movq_cfi rbx, RBX
16321 + movq_cfi rbp, RBP
16322 +
16323 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16324 + movq_cfi r12, R12
16325 +#endif
16326 +
16327 + movq_cfi r13, R13
16328 + movq_cfi r14, R14
16329 + movq_cfi r15, R15
16330 .endm
16331
16332 .macro RESTORE_REST
16333 - movq_cfi_restore 0*8, r15
16334 - movq_cfi_restore 1*8, r14
16335 - movq_cfi_restore 2*8, r13
16336 - movq_cfi_restore 3*8, r12
16337 - movq_cfi_restore 4*8, rbp
16338 - movq_cfi_restore 5*8, rbx
16339 - addq $REST_SKIP, %rsp
16340 - CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16341 + movq_cfi_restore R15, r15
16342 + movq_cfi_restore R14, r14
16343 + movq_cfi_restore R13, r13
16344 +
16345 +#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16346 + movq_cfi_restore R12, r12
16347 +#endif
16348 +
16349 + movq_cfi_restore RBP, rbp
16350 + movq_cfi_restore RBX, rbx
16351 .endm
16352
16353 .macro SAVE_ALL
16354 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16355 index f50de69..2b0a458 100644
16356 --- a/arch/x86/include/asm/checksum_32.h
16357 +++ b/arch/x86/include/asm/checksum_32.h
16358 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16359 int len, __wsum sum,
16360 int *src_err_ptr, int *dst_err_ptr);
16361
16362 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16363 + int len, __wsum sum,
16364 + int *src_err_ptr, int *dst_err_ptr);
16365 +
16366 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16367 + int len, __wsum sum,
16368 + int *src_err_ptr, int *dst_err_ptr);
16369 +
16370 /*
16371 * Note: when you get a NULL pointer exception here this means someone
16372 * passed in an incorrect kernel address to one of these functions.
16373 @@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16374
16375 might_sleep();
16376 stac();
16377 - ret = csum_partial_copy_generic((__force void *)src, dst,
16378 + ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16379 len, sum, err_ptr, NULL);
16380 clac();
16381
16382 @@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16383 might_sleep();
16384 if (access_ok(VERIFY_WRITE, dst, len)) {
16385 stac();
16386 - ret = csum_partial_copy_generic(src, (__force void *)dst,
16387 + ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16388 len, sum, NULL, err_ptr);
16389 clac();
16390 return ret;
16391 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16392 index 99c105d7..2f667ac 100644
16393 --- a/arch/x86/include/asm/cmpxchg.h
16394 +++ b/arch/x86/include/asm/cmpxchg.h
16395 @@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16396 __compiletime_error("Bad argument size for cmpxchg");
16397 extern void __xadd_wrong_size(void)
16398 __compiletime_error("Bad argument size for xadd");
16399 +extern void __xadd_check_overflow_wrong_size(void)
16400 + __compiletime_error("Bad argument size for xadd_check_overflow");
16401 extern void __add_wrong_size(void)
16402 __compiletime_error("Bad argument size for add");
16403 +extern void __add_check_overflow_wrong_size(void)
16404 + __compiletime_error("Bad argument size for add_check_overflow");
16405
16406 /*
16407 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16408 @@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16409 __ret; \
16410 })
16411
16412 +#ifdef CONFIG_PAX_REFCOUNT
16413 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16414 + ({ \
16415 + __typeof__ (*(ptr)) __ret = (arg); \
16416 + switch (sizeof(*(ptr))) { \
16417 + case __X86_CASE_L: \
16418 + asm volatile (lock #op "l %0, %1\n" \
16419 + "jno 0f\n" \
16420 + "mov %0,%1\n" \
16421 + "int $4\n0:\n" \
16422 + _ASM_EXTABLE(0b, 0b) \
16423 + : "+r" (__ret), "+m" (*(ptr)) \
16424 + : : "memory", "cc"); \
16425 + break; \
16426 + case __X86_CASE_Q: \
16427 + asm volatile (lock #op "q %q0, %1\n" \
16428 + "jno 0f\n" \
16429 + "mov %0,%1\n" \
16430 + "int $4\n0:\n" \
16431 + _ASM_EXTABLE(0b, 0b) \
16432 + : "+r" (__ret), "+m" (*(ptr)) \
16433 + : : "memory", "cc"); \
16434 + break; \
16435 + default: \
16436 + __ ## op ## _check_overflow_wrong_size(); \
16437 + } \
16438 + __ret; \
16439 + })
16440 +#else
16441 +#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16442 +#endif
16443 +
16444 /*
16445 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16446 * Since this is generally used to protect other memory information, we
16447 @@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16448 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16449 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16450
16451 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16452 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16453 +
16454 #define __add(ptr, inc, lock) \
16455 ({ \
16456 __typeof__ (*(ptr)) __ret = (inc); \
16457 diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16458 index 59c6c40..5e0b22c 100644
16459 --- a/arch/x86/include/asm/compat.h
16460 +++ b/arch/x86/include/asm/compat.h
16461 @@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16462 typedef u32 compat_uint_t;
16463 typedef u32 compat_ulong_t;
16464 typedef u64 __attribute__((aligned(4))) compat_u64;
16465 -typedef u32 compat_uptr_t;
16466 +typedef u32 __user compat_uptr_t;
16467
16468 struct compat_timespec {
16469 compat_time_t tv_sec;
16470 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16471 index 0bb1335..8f1aec7 100644
16472 --- a/arch/x86/include/asm/cpufeature.h
16473 +++ b/arch/x86/include/asm/cpufeature.h
16474 @@ -207,7 +207,7 @@
16475 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16476 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16477 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16478 -
16479 +#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16480
16481 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16482 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16483 @@ -215,7 +215,7 @@
16484 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16485 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16486 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16487 -#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16488 +#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16489 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16490 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16491 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16492 @@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16493 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16494 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16495 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16496 +#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16497
16498 #if __GNUC__ >= 4
16499 extern void warn_pre_alternatives(void);
16500 @@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16501
16502 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16503 t_warn:
16504 - warn_pre_alternatives();
16505 + if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16506 + warn_pre_alternatives();
16507 return false;
16508 #endif
16509
16510 @@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16511 ".section .discard,\"aw\",@progbits\n"
16512 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16513 ".previous\n"
16514 - ".section .altinstr_replacement,\"ax\"\n"
16515 + ".section .altinstr_replacement,\"a\"\n"
16516 "3: movb $1,%0\n"
16517 "4:\n"
16518 ".previous\n"
16519 @@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16520 " .byte 2b - 1b\n" /* src len */
16521 " .byte 4f - 3f\n" /* repl len */
16522 ".previous\n"
16523 - ".section .altinstr_replacement,\"ax\"\n"
16524 + ".section .altinstr_replacement,\"a\"\n"
16525 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16526 "4:\n"
16527 ".previous\n"
16528 @@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16529 ".section .discard,\"aw\",@progbits\n"
16530 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16531 ".previous\n"
16532 - ".section .altinstr_replacement,\"ax\"\n"
16533 + ".section .altinstr_replacement,\"a\"\n"
16534 "3: movb $0,%0\n"
16535 "4:\n"
16536 ".previous\n"
16537 @@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16538 ".section .discard,\"aw\",@progbits\n"
16539 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16540 ".previous\n"
16541 - ".section .altinstr_replacement,\"ax\"\n"
16542 + ".section .altinstr_replacement,\"a\"\n"
16543 "5: movb $1,%0\n"
16544 "6:\n"
16545 ".previous\n"
16546 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16547 index 50d033a..37deb26 100644
16548 --- a/arch/x86/include/asm/desc.h
16549 +++ b/arch/x86/include/asm/desc.h
16550 @@ -4,6 +4,7 @@
16551 #include <asm/desc_defs.h>
16552 #include <asm/ldt.h>
16553 #include <asm/mmu.h>
16554 +#include <asm/pgtable.h>
16555
16556 #include <linux/smp.h>
16557 #include <linux/percpu.h>
16558 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16559
16560 desc->type = (info->read_exec_only ^ 1) << 1;
16561 desc->type |= info->contents << 2;
16562 + desc->type |= info->seg_not_present ^ 1;
16563
16564 desc->s = 1;
16565 desc->dpl = 0x3;
16566 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16567 }
16568
16569 extern struct desc_ptr idt_descr;
16570 -extern gate_desc idt_table[];
16571 -extern struct desc_ptr debug_idt_descr;
16572 -extern gate_desc debug_idt_table[];
16573 -
16574 -struct gdt_page {
16575 - struct desc_struct gdt[GDT_ENTRIES];
16576 -} __attribute__((aligned(PAGE_SIZE)));
16577 -
16578 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16579 +extern gate_desc idt_table[IDT_ENTRIES];
16580 +extern const struct desc_ptr debug_idt_descr;
16581 +extern gate_desc debug_idt_table[IDT_ENTRIES];
16582
16583 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16584 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16585 {
16586 - return per_cpu(gdt_page, cpu).gdt;
16587 + return cpu_gdt_table[cpu];
16588 }
16589
16590 #ifdef CONFIG_X86_64
16591 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16592 unsigned long base, unsigned dpl, unsigned flags,
16593 unsigned short seg)
16594 {
16595 - gate->a = (seg << 16) | (base & 0xffff);
16596 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16597 + gate->gate.offset_low = base;
16598 + gate->gate.seg = seg;
16599 + gate->gate.reserved = 0;
16600 + gate->gate.type = type;
16601 + gate->gate.s = 0;
16602 + gate->gate.dpl = dpl;
16603 + gate->gate.p = 1;
16604 + gate->gate.offset_high = base >> 16;
16605 }
16606
16607 #endif
16608 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16609
16610 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16611 {
16612 + pax_open_kernel();
16613 memcpy(&idt[entry], gate, sizeof(*gate));
16614 + pax_close_kernel();
16615 }
16616
16617 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16618 {
16619 + pax_open_kernel();
16620 memcpy(&ldt[entry], desc, 8);
16621 + pax_close_kernel();
16622 }
16623
16624 static inline void
16625 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16626 default: size = sizeof(*gdt); break;
16627 }
16628
16629 + pax_open_kernel();
16630 memcpy(&gdt[entry], desc, size);
16631 + pax_close_kernel();
16632 }
16633
16634 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16635 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16636
16637 static inline void native_load_tr_desc(void)
16638 {
16639 + pax_open_kernel();
16640 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16641 + pax_close_kernel();
16642 }
16643
16644 static inline void native_load_gdt(const struct desc_ptr *dtr)
16645 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16646 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16647 unsigned int i;
16648
16649 + pax_open_kernel();
16650 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16651 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16652 + pax_close_kernel();
16653 }
16654
16655 #define _LDT_empty(info) \
16656 @@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16657 preempt_enable();
16658 }
16659
16660 -static inline unsigned long get_desc_base(const struct desc_struct *desc)
16661 +static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16662 {
16663 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16664 }
16665 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16666 }
16667
16668 #ifdef CONFIG_X86_64
16669 -static inline void set_nmi_gate(int gate, void *addr)
16670 +static inline void set_nmi_gate(int gate, const void *addr)
16671 {
16672 gate_desc s;
16673
16674 @@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16675 #endif
16676
16677 #ifdef CONFIG_TRACING
16678 -extern struct desc_ptr trace_idt_descr;
16679 -extern gate_desc trace_idt_table[];
16680 +extern const struct desc_ptr trace_idt_descr;
16681 +extern gate_desc trace_idt_table[IDT_ENTRIES];
16682 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16683 {
16684 write_idt_entry(trace_idt_table, entry, gate);
16685 }
16686
16687 -static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16688 +static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16689 unsigned dpl, unsigned ist, unsigned seg)
16690 {
16691 gate_desc s;
16692 @@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16693 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16694 #endif
16695
16696 -static inline void _set_gate(int gate, unsigned type, void *addr,
16697 +static inline void _set_gate(int gate, unsigned type, const void *addr,
16698 unsigned dpl, unsigned ist, unsigned seg)
16699 {
16700 gate_desc s;
16701 @@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16702 #define set_intr_gate(n, addr) \
16703 do { \
16704 BUG_ON((unsigned)n > 0xFF); \
16705 - _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16706 + _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16707 __KERNEL_CS); \
16708 - _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16709 + _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16710 0, 0, __KERNEL_CS); \
16711 } while (0)
16712
16713 @@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16714 /*
16715 * This routine sets up an interrupt gate at directory privilege level 3.
16716 */
16717 -static inline void set_system_intr_gate(unsigned int n, void *addr)
16718 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
16719 {
16720 BUG_ON((unsigned)n > 0xFF);
16721 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16722 }
16723
16724 -static inline void set_system_trap_gate(unsigned int n, void *addr)
16725 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16729 }
16730
16731 -static inline void set_trap_gate(unsigned int n, void *addr)
16732 +static inline void set_trap_gate(unsigned int n, const void *addr)
16733 {
16734 BUG_ON((unsigned)n > 0xFF);
16735 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16736 @@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16737 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16738 {
16739 BUG_ON((unsigned)n > 0xFF);
16740 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16741 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16742 }
16743
16744 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16745 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16746 {
16747 BUG_ON((unsigned)n > 0xFF);
16748 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16749 }
16750
16751 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16752 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16753 {
16754 BUG_ON((unsigned)n > 0xFF);
16755 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16756 @@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16757 else
16758 load_idt((const struct desc_ptr *)&idt_descr);
16759 }
16760 +
16761 +#ifdef CONFIG_X86_32
16762 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16763 +{
16764 + struct desc_struct d;
16765 +
16766 + if (likely(limit))
16767 + limit = (limit - 1UL) >> PAGE_SHIFT;
16768 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
16769 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16770 +}
16771 +#endif
16772 +
16773 #endif /* _ASM_X86_DESC_H */
16774 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16775 index 278441f..b95a174 100644
16776 --- a/arch/x86/include/asm/desc_defs.h
16777 +++ b/arch/x86/include/asm/desc_defs.h
16778 @@ -31,6 +31,12 @@ struct desc_struct {
16779 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16780 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16781 };
16782 + struct {
16783 + u16 offset_low;
16784 + u16 seg;
16785 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16786 + unsigned offset_high: 16;
16787 + } gate;
16788 };
16789 } __attribute__((packed));
16790
16791 diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16792 index ced283a..ffe04cc 100644
16793 --- a/arch/x86/include/asm/div64.h
16794 +++ b/arch/x86/include/asm/div64.h
16795 @@ -39,7 +39,7 @@
16796 __mod; \
16797 })
16798
16799 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16800 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16801 {
16802 union {
16803 u64 v64;
16804 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16805 index ca3347a..1a5082a 100644
16806 --- a/arch/x86/include/asm/elf.h
16807 +++ b/arch/x86/include/asm/elf.h
16808 @@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16809
16810 #include <asm/vdso.h>
16811
16812 -#ifdef CONFIG_X86_64
16813 -extern unsigned int vdso64_enabled;
16814 -#endif
16815 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16816 extern unsigned int vdso32_enabled;
16817 #endif
16818 @@ -249,7 +246,25 @@ extern int force_personality32;
16819 the loader. We need to make sure that it is out of the way of the program
16820 that it will "exec", and that there is sufficient room for the brk. */
16821
16822 +#ifdef CONFIG_PAX_SEGMEXEC
16823 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16824 +#else
16825 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16826 +#endif
16827 +
16828 +#ifdef CONFIG_PAX_ASLR
16829 +#ifdef CONFIG_X86_32
16830 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16831 +
16832 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16833 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16834 +#else
16835 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
16836 +
16837 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16838 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16839 +#endif
16840 +#endif
16841
16842 /* This yields a mask that user programs can use to figure out what
16843 instruction set this CPU supports. This could be done in user space,
16844 @@ -298,17 +313,13 @@ do { \
16845
16846 #define ARCH_DLINFO \
16847 do { \
16848 - if (vdso64_enabled) \
16849 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16850 - (unsigned long __force)current->mm->context.vdso); \
16851 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16852 } while (0)
16853
16854 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16855 #define ARCH_DLINFO_X32 \
16856 do { \
16857 - if (vdso64_enabled) \
16858 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16859 - (unsigned long __force)current->mm->context.vdso); \
16860 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16861 } while (0)
16862
16863 #define AT_SYSINFO 32
16864 @@ -323,10 +334,10 @@ else \
16865
16866 #endif /* !CONFIG_X86_32 */
16867
16868 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16869 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16870
16871 #define VDSO_ENTRY \
16872 - ((unsigned long)current->mm->context.vdso + \
16873 + (current->mm->context.vdso + \
16874 selected_vdso32->sym___kernel_vsyscall)
16875
16876 struct linux_binprm;
16877 @@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16878 int uses_interp);
16879 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16880
16881 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16882 -#define arch_randomize_brk arch_randomize_brk
16883 -
16884 /*
16885 * True on X86_32 or when emulating IA32 on X86_64
16886 */
16887 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16888 index 77a99ac..39ff7f5 100644
16889 --- a/arch/x86/include/asm/emergency-restart.h
16890 +++ b/arch/x86/include/asm/emergency-restart.h
16891 @@ -1,6 +1,6 @@
16892 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16893 #define _ASM_X86_EMERGENCY_RESTART_H
16894
16895 -extern void machine_emergency_restart(void);
16896 +extern void machine_emergency_restart(void) __noreturn;
16897
16898 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16899 diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16900 index 1c7eefe..d0e4702 100644
16901 --- a/arch/x86/include/asm/floppy.h
16902 +++ b/arch/x86/include/asm/floppy.h
16903 @@ -229,18 +229,18 @@ static struct fd_routine_l {
16904 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16905 } fd_routine[] = {
16906 {
16907 - request_dma,
16908 - free_dma,
16909 - get_dma_residue,
16910 - dma_mem_alloc,
16911 - hard_dma_setup
16912 + ._request_dma = request_dma,
16913 + ._free_dma = free_dma,
16914 + ._get_dma_residue = get_dma_residue,
16915 + ._dma_mem_alloc = dma_mem_alloc,
16916 + ._dma_setup = hard_dma_setup
16917 },
16918 {
16919 - vdma_request_dma,
16920 - vdma_nop,
16921 - vdma_get_dma_residue,
16922 - vdma_mem_alloc,
16923 - vdma_dma_setup
16924 + ._request_dma = vdma_request_dma,
16925 + ._free_dma = vdma_nop,
16926 + ._get_dma_residue = vdma_get_dma_residue,
16927 + ._dma_mem_alloc = vdma_mem_alloc,
16928 + ._dma_setup = vdma_dma_setup
16929 }
16930 };
16931
16932 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16933 index e97622f..d0ba77a 100644
16934 --- a/arch/x86/include/asm/fpu-internal.h
16935 +++ b/arch/x86/include/asm/fpu-internal.h
16936 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16937 #define user_insn(insn, output, input...) \
16938 ({ \
16939 int err; \
16940 + pax_open_userland(); \
16941 asm volatile(ASM_STAC "\n" \
16942 - "1:" #insn "\n\t" \
16943 + "1:" \
16944 + __copyuser_seg \
16945 + #insn "\n\t" \
16946 "2: " ASM_CLAC "\n" \
16947 ".section .fixup,\"ax\"\n" \
16948 "3: movl $-1,%[err]\n" \
16949 @@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16950 _ASM_EXTABLE(1b, 3b) \
16951 : [err] "=r" (err), output \
16952 : "0"(0), input); \
16953 + pax_close_userland(); \
16954 err; \
16955 })
16956
16957 @@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16958 "fnclex\n\t"
16959 "emms\n\t"
16960 "fildl %P[addr]" /* set F?P to defined value */
16961 - : : [addr] "m" (tsk->thread.fpu.has_fpu));
16962 + : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16963 }
16964
16965 return fpu_restore_checking(&tsk->thread.fpu);
16966 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16967 index b4c1f54..e290c08 100644
16968 --- a/arch/x86/include/asm/futex.h
16969 +++ b/arch/x86/include/asm/futex.h
16970 @@ -12,6 +12,7 @@
16971 #include <asm/smap.h>
16972
16973 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16974 + typecheck(u32 __user *, uaddr); \
16975 asm volatile("\t" ASM_STAC "\n" \
16976 "1:\t" insn "\n" \
16977 "2:\t" ASM_CLAC "\n" \
16978 @@ -20,15 +21,16 @@
16979 "\tjmp\t2b\n" \
16980 "\t.previous\n" \
16981 _ASM_EXTABLE(1b, 3b) \
16982 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16983 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16984 : "i" (-EFAULT), "0" (oparg), "1" (0))
16985
16986 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16987 + typecheck(u32 __user *, uaddr); \
16988 asm volatile("\t" ASM_STAC "\n" \
16989 "1:\tmovl %2, %0\n" \
16990 "\tmovl\t%0, %3\n" \
16991 "\t" insn "\n" \
16992 - "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16993 + "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16994 "\tjnz\t1b\n" \
16995 "3:\t" ASM_CLAC "\n" \
16996 "\t.section .fixup,\"ax\"\n" \
16997 @@ -38,7 +40,7 @@
16998 _ASM_EXTABLE(1b, 4b) \
16999 _ASM_EXTABLE(2b, 4b) \
17000 : "=&a" (oldval), "=&r" (ret), \
17001 - "+m" (*uaddr), "=&r" (tem) \
17002 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17003 : "r" (oparg), "i" (-EFAULT), "1" (0))
17004
17005 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006 @@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17007
17008 pagefault_disable();
17009
17010 + pax_open_userland();
17011 switch (op) {
17012 case FUTEX_OP_SET:
17013 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17014 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17015 break;
17016 case FUTEX_OP_ADD:
17017 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17018 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17019 uaddr, oparg);
17020 break;
17021 case FUTEX_OP_OR:
17022 @@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17023 default:
17024 ret = -ENOSYS;
17025 }
17026 + pax_close_userland();
17027
17028 pagefault_enable();
17029
17030 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17031 index 4615906..788c817 100644
17032 --- a/arch/x86/include/asm/hw_irq.h
17033 +++ b/arch/x86/include/asm/hw_irq.h
17034 @@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
17035 extern void enable_IO_APIC(void);
17036
17037 /* Statistics */
17038 -extern atomic_t irq_err_count;
17039 -extern atomic_t irq_mis_count;
17040 +extern atomic_unchecked_t irq_err_count;
17041 +extern atomic_unchecked_t irq_mis_count;
17042
17043 /* EISA */
17044 extern void eisa_set_level_irq(unsigned int irq);
17045 diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17046 index ccffa53..3c90c87 100644
17047 --- a/arch/x86/include/asm/i8259.h
17048 +++ b/arch/x86/include/asm/i8259.h
17049 @@ -62,7 +62,7 @@ struct legacy_pic {
17050 void (*init)(int auto_eoi);
17051 int (*irq_pending)(unsigned int irq);
17052 void (*make_irq)(unsigned int irq);
17053 -};
17054 +} __do_const;
17055
17056 extern struct legacy_pic *legacy_pic;
17057 extern struct legacy_pic null_legacy_pic;
17058 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17059 index b8237d8..3e8864e 100644
17060 --- a/arch/x86/include/asm/io.h
17061 +++ b/arch/x86/include/asm/io.h
17062 @@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17063 "m" (*(volatile type __force *)addr) barrier); }
17064
17065 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17066 -build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17067 -build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17068 +build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17069 +build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17070
17071 build_mmio_read(__readb, "b", unsigned char, "=q", )
17072 -build_mmio_read(__readw, "w", unsigned short, "=r", )
17073 -build_mmio_read(__readl, "l", unsigned int, "=r", )
17074 +build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17075 +build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17076
17077 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17078 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17079 @@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17080 * this function
17081 */
17082
17083 -static inline phys_addr_t virt_to_phys(volatile void *address)
17084 +static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17085 {
17086 return __pa(address);
17087 }
17088 @@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17089 return ioremap_nocache(offset, size);
17090 }
17091
17092 -extern void iounmap(volatile void __iomem *addr);
17093 +extern void iounmap(const volatile void __iomem *addr);
17094
17095 extern void set_iounmap_nonlazy(void);
17096
17097 @@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17098
17099 #include <linux/vmalloc.h>
17100
17101 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17102 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17103 +{
17104 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17105 +}
17106 +
17107 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17108 +{
17109 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17110 +}
17111 +
17112 /*
17113 * Convert a virtual cached pointer to an uncached pointer
17114 */
17115 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17116 index 0a8b519..80e7d5b 100644
17117 --- a/arch/x86/include/asm/irqflags.h
17118 +++ b/arch/x86/include/asm/irqflags.h
17119 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17120 sti; \
17121 sysexit
17122
17123 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
17124 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17125 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
17126 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17127 +
17128 #else
17129 #define INTERRUPT_RETURN iret
17130 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17131 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17132 index 4421b5d..8543006 100644
17133 --- a/arch/x86/include/asm/kprobes.h
17134 +++ b/arch/x86/include/asm/kprobes.h
17135 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17136 #define RELATIVEJUMP_SIZE 5
17137 #define RELATIVECALL_OPCODE 0xe8
17138 #define RELATIVE_ADDR_SIZE 4
17139 -#define MAX_STACK_SIZE 64
17140 -#define MIN_STACK_SIZE(ADDR) \
17141 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17142 - THREAD_SIZE - (unsigned long)(ADDR))) \
17143 - ? (MAX_STACK_SIZE) \
17144 - : (((unsigned long)current_thread_info()) + \
17145 - THREAD_SIZE - (unsigned long)(ADDR)))
17146 +#define MAX_STACK_SIZE 64UL
17147 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17148
17149 #define flush_insn_slot(p) do { } while (0)
17150
17151 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17152 index 6ed0c30..74fb6c3 100644
17153 --- a/arch/x86/include/asm/kvm_host.h
17154 +++ b/arch/x86/include/asm/kvm_host.h
17155 @@ -51,6 +51,7 @@
17156 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17157
17158 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17159 +#define CR3_PCID_INVD (1UL << 63)
17160 #define CR4_RESERVED_BITS \
17161 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17162 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17163 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17164 index 4ad6560..75c7bdd 100644
17165 --- a/arch/x86/include/asm/local.h
17166 +++ b/arch/x86/include/asm/local.h
17167 @@ -10,33 +10,97 @@ typedef struct {
17168 atomic_long_t a;
17169 } local_t;
17170
17171 +typedef struct {
17172 + atomic_long_unchecked_t a;
17173 +} local_unchecked_t;
17174 +
17175 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17176
17177 #define local_read(l) atomic_long_read(&(l)->a)
17178 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17179 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17180 +#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17181
17182 static inline void local_inc(local_t *l)
17183 {
17184 - asm volatile(_ASM_INC "%0"
17185 + asm volatile(_ASM_INC "%0\n"
17186 +
17187 +#ifdef CONFIG_PAX_REFCOUNT
17188 + "jno 0f\n"
17189 + _ASM_DEC "%0\n"
17190 + "int $4\n0:\n"
17191 + _ASM_EXTABLE(0b, 0b)
17192 +#endif
17193 +
17194 + : "+m" (l->a.counter));
17195 +}
17196 +
17197 +static inline void local_inc_unchecked(local_unchecked_t *l)
17198 +{
17199 + asm volatile(_ASM_INC "%0\n"
17200 : "+m" (l->a.counter));
17201 }
17202
17203 static inline void local_dec(local_t *l)
17204 {
17205 - asm volatile(_ASM_DEC "%0"
17206 + asm volatile(_ASM_DEC "%0\n"
17207 +
17208 +#ifdef CONFIG_PAX_REFCOUNT
17209 + "jno 0f\n"
17210 + _ASM_INC "%0\n"
17211 + "int $4\n0:\n"
17212 + _ASM_EXTABLE(0b, 0b)
17213 +#endif
17214 +
17215 + : "+m" (l->a.counter));
17216 +}
17217 +
17218 +static inline void local_dec_unchecked(local_unchecked_t *l)
17219 +{
17220 + asm volatile(_ASM_DEC "%0\n"
17221 : "+m" (l->a.counter));
17222 }
17223
17224 static inline void local_add(long i, local_t *l)
17225 {
17226 - asm volatile(_ASM_ADD "%1,%0"
17227 + asm volatile(_ASM_ADD "%1,%0\n"
17228 +
17229 +#ifdef CONFIG_PAX_REFCOUNT
17230 + "jno 0f\n"
17231 + _ASM_SUB "%1,%0\n"
17232 + "int $4\n0:\n"
17233 + _ASM_EXTABLE(0b, 0b)
17234 +#endif
17235 +
17236 + : "+m" (l->a.counter)
17237 + : "ir" (i));
17238 +}
17239 +
17240 +static inline void local_add_unchecked(long i, local_unchecked_t *l)
17241 +{
17242 + asm volatile(_ASM_ADD "%1,%0\n"
17243 : "+m" (l->a.counter)
17244 : "ir" (i));
17245 }
17246
17247 static inline void local_sub(long i, local_t *l)
17248 {
17249 - asm volatile(_ASM_SUB "%1,%0"
17250 + asm volatile(_ASM_SUB "%1,%0\n"
17251 +
17252 +#ifdef CONFIG_PAX_REFCOUNT
17253 + "jno 0f\n"
17254 + _ASM_ADD "%1,%0\n"
17255 + "int $4\n0:\n"
17256 + _ASM_EXTABLE(0b, 0b)
17257 +#endif
17258 +
17259 + : "+m" (l->a.counter)
17260 + : "ir" (i));
17261 +}
17262 +
17263 +static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17264 +{
17265 + asm volatile(_ASM_SUB "%1,%0\n"
17266 : "+m" (l->a.counter)
17267 : "ir" (i));
17268 }
17269 @@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17270 */
17271 static inline int local_sub_and_test(long i, local_t *l)
17272 {
17273 - GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17274 + GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17275 }
17276
17277 /**
17278 @@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17279 */
17280 static inline int local_dec_and_test(local_t *l)
17281 {
17282 - GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17283 + GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17284 }
17285
17286 /**
17287 @@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17288 */
17289 static inline int local_inc_and_test(local_t *l)
17290 {
17291 - GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17292 + GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17293 }
17294
17295 /**
17296 @@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17297 */
17298 static inline int local_add_negative(long i, local_t *l)
17299 {
17300 - GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17301 + GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17302 }
17303
17304 /**
17305 @@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17306 static inline long local_add_return(long i, local_t *l)
17307 {
17308 long __i = i;
17309 + asm volatile(_ASM_XADD "%0, %1\n"
17310 +
17311 +#ifdef CONFIG_PAX_REFCOUNT
17312 + "jno 0f\n"
17313 + _ASM_MOV "%0,%1\n"
17314 + "int $4\n0:\n"
17315 + _ASM_EXTABLE(0b, 0b)
17316 +#endif
17317 +
17318 + : "+r" (i), "+m" (l->a.counter)
17319 + : : "memory");
17320 + return i + __i;
17321 +}
17322 +
17323 +/**
17324 + * local_add_return_unchecked - add and return
17325 + * @i: integer value to add
17326 + * @l: pointer to type local_unchecked_t
17327 + *
17328 + * Atomically adds @i to @l and returns @i + @l
17329 + */
17330 +static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17331 +{
17332 + long __i = i;
17333 asm volatile(_ASM_XADD "%0, %1;"
17334 : "+r" (i), "+m" (l->a.counter)
17335 : : "memory");
17336 @@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17337
17338 #define local_cmpxchg(l, o, n) \
17339 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17340 +#define local_cmpxchg_unchecked(l, o, n) \
17341 + (cmpxchg_local(&((l)->a.counter), (o), (n)))
17342 /* Always has a lock prefix */
17343 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17344
17345 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17346 new file mode 100644
17347 index 0000000..2bfd3ba
17348 --- /dev/null
17349 +++ b/arch/x86/include/asm/mman.h
17350 @@ -0,0 +1,15 @@
17351 +#ifndef _X86_MMAN_H
17352 +#define _X86_MMAN_H
17353 +
17354 +#include <uapi/asm/mman.h>
17355 +
17356 +#ifdef __KERNEL__
17357 +#ifndef __ASSEMBLY__
17358 +#ifdef CONFIG_X86_32
17359 +#define arch_mmap_check i386_mmap_check
17360 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17361 +#endif
17362 +#endif
17363 +#endif
17364 +
17365 +#endif /* X86_MMAN_H */
17366 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17367 index 876e74e..e20bfb1 100644
17368 --- a/arch/x86/include/asm/mmu.h
17369 +++ b/arch/x86/include/asm/mmu.h
17370 @@ -9,7 +9,7 @@
17371 * we put the segment information here.
17372 */
17373 typedef struct {
17374 - void *ldt;
17375 + struct desc_struct *ldt;
17376 int size;
17377
17378 #ifdef CONFIG_X86_64
17379 @@ -18,7 +18,19 @@ typedef struct {
17380 #endif
17381
17382 struct mutex lock;
17383 - void __user *vdso;
17384 + unsigned long vdso;
17385 +
17386 +#ifdef CONFIG_X86_32
17387 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17388 + unsigned long user_cs_base;
17389 + unsigned long user_cs_limit;
17390 +
17391 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17392 + cpumask_t cpu_user_cs_mask;
17393 +#endif
17394 +
17395 +#endif
17396 +#endif
17397 } mm_context_t;
17398
17399 #ifdef CONFIG_SMP
17400 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17401 index 166af2a..648c200 100644
17402 --- a/arch/x86/include/asm/mmu_context.h
17403 +++ b/arch/x86/include/asm/mmu_context.h
17404 @@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17405
17406 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17407 {
17408 +
17409 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17410 + if (!(static_cpu_has(X86_FEATURE_PCID))) {
17411 + unsigned int i;
17412 + pgd_t *pgd;
17413 +
17414 + pax_open_kernel();
17415 + pgd = get_cpu_pgd(smp_processor_id(), kernel);
17416 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17417 + set_pgd_batched(pgd+i, native_make_pgd(0));
17418 + pax_close_kernel();
17419 + }
17420 +#endif
17421 +
17422 #ifdef CONFIG_SMP
17423 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17424 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17425 @@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17426 struct task_struct *tsk)
17427 {
17428 unsigned cpu = smp_processor_id();
17429 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17430 + int tlbstate = TLBSTATE_OK;
17431 +#endif
17432
17433 if (likely(prev != next)) {
17434 #ifdef CONFIG_SMP
17435 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17436 + tlbstate = this_cpu_read(cpu_tlbstate.state);
17437 +#endif
17438 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17439 this_cpu_write(cpu_tlbstate.active_mm, next);
17440 #endif
17441 cpumask_set_cpu(cpu, mm_cpumask(next));
17442
17443 /* Re-load page tables */
17444 +#ifdef CONFIG_PAX_PER_CPU_PGD
17445 + pax_open_kernel();
17446 +
17447 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17448 + if (static_cpu_has(X86_FEATURE_PCID))
17449 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17450 + else
17451 +#endif
17452 +
17453 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17454 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17455 + pax_close_kernel();
17456 + 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));
17457 +
17458 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17459 + if (static_cpu_has(X86_FEATURE_PCID)) {
17460 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17461 + u64 descriptor[2];
17462 + descriptor[0] = PCID_USER;
17463 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17464 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17465 + descriptor[0] = PCID_KERNEL;
17466 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17467 + }
17468 + } else {
17469 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17470 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17471 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17472 + else
17473 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17474 + }
17475 + } else
17476 +#endif
17477 +
17478 + load_cr3(get_cpu_pgd(cpu, kernel));
17479 +#else
17480 load_cr3(next->pgd);
17481 +#endif
17482 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17483
17484 /* Stop flush ipis for the previous mm */
17485 @@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17486 /* Load the LDT, if the LDT is different: */
17487 if (unlikely(prev->context.ldt != next->context.ldt))
17488 load_LDT_nolock(&next->context);
17489 +
17490 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17491 + if (!(__supported_pte_mask & _PAGE_NX)) {
17492 + smp_mb__before_atomic();
17493 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17494 + smp_mb__after_atomic();
17495 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17496 + }
17497 +#endif
17498 +
17499 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17500 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17501 + prev->context.user_cs_limit != next->context.user_cs_limit))
17502 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17503 +#ifdef CONFIG_SMP
17504 + else if (unlikely(tlbstate != TLBSTATE_OK))
17505 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17506 +#endif
17507 +#endif
17508 +
17509 }
17510 + else {
17511 +
17512 +#ifdef CONFIG_PAX_PER_CPU_PGD
17513 + pax_open_kernel();
17514 +
17515 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17516 + if (static_cpu_has(X86_FEATURE_PCID))
17517 + __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17518 + else
17519 +#endif
17520 +
17521 + __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17522 + __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17523 + pax_close_kernel();
17524 + 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));
17525 +
17526 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17527 + if (static_cpu_has(X86_FEATURE_PCID)) {
17528 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
17529 + u64 descriptor[2];
17530 + descriptor[0] = PCID_USER;
17531 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17532 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17533 + descriptor[0] = PCID_KERNEL;
17534 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17535 + }
17536 + } else {
17537 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17538 + if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17539 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17540 + else
17541 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17542 + }
17543 + } else
17544 +#endif
17545 +
17546 + load_cr3(get_cpu_pgd(cpu, kernel));
17547 +#endif
17548 +
17549 #ifdef CONFIG_SMP
17550 - else {
17551 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17552 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17553
17554 @@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17555 * tlb flush IPI delivery. We must reload CR3
17556 * to make sure to use no freed page tables.
17557 */
17558 +
17559 +#ifndef CONFIG_PAX_PER_CPU_PGD
17560 load_cr3(next->pgd);
17561 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17562 +#endif
17563 +
17564 load_LDT_nolock(&next->context);
17565 +
17566 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17567 + if (!(__supported_pte_mask & _PAGE_NX))
17568 + cpu_set(cpu, next->context.cpu_user_cs_mask);
17569 +#endif
17570 +
17571 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17572 +#ifdef CONFIG_PAX_PAGEEXEC
17573 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17574 +#endif
17575 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17576 +#endif
17577 +
17578 }
17579 +#endif
17580 }
17581 -#endif
17582 }
17583
17584 #define activate_mm(prev, next) \
17585 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17586 index e3b7819..b257c64 100644
17587 --- a/arch/x86/include/asm/module.h
17588 +++ b/arch/x86/include/asm/module.h
17589 @@ -5,6 +5,7 @@
17590
17591 #ifdef CONFIG_X86_64
17592 /* X86_64 does not define MODULE_PROC_FAMILY */
17593 +#define MODULE_PROC_FAMILY ""
17594 #elif defined CONFIG_M486
17595 #define MODULE_PROC_FAMILY "486 "
17596 #elif defined CONFIG_M586
17597 @@ -57,8 +58,20 @@
17598 #error unknown processor family
17599 #endif
17600
17601 -#ifdef CONFIG_X86_32
17602 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17603 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17604 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17605 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17606 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17607 +#else
17608 +#define MODULE_PAX_KERNEXEC ""
17609 #endif
17610
17611 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17612 +#define MODULE_PAX_UDEREF "UDEREF "
17613 +#else
17614 +#define MODULE_PAX_UDEREF ""
17615 +#endif
17616 +
17617 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17618 +
17619 #endif /* _ASM_X86_MODULE_H */
17620 diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17621 index 5f2fc44..106caa6 100644
17622 --- a/arch/x86/include/asm/nmi.h
17623 +++ b/arch/x86/include/asm/nmi.h
17624 @@ -36,26 +36,35 @@ enum {
17625
17626 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17627
17628 +struct nmiaction;
17629 +
17630 +struct nmiwork {
17631 + const struct nmiaction *action;
17632 + u64 max_duration;
17633 + struct irq_work irq_work;
17634 +};
17635 +
17636 struct nmiaction {
17637 struct list_head list;
17638 nmi_handler_t handler;
17639 - u64 max_duration;
17640 - struct irq_work irq_work;
17641 unsigned long flags;
17642 const char *name;
17643 -};
17644 + struct nmiwork *work;
17645 +} __do_const;
17646
17647 #define register_nmi_handler(t, fn, fg, n, init...) \
17648 ({ \
17649 - static struct nmiaction init fn##_na = { \
17650 + static struct nmiwork fn##_nw; \
17651 + static const struct nmiaction init fn##_na = { \
17652 .handler = (fn), \
17653 .name = (n), \
17654 .flags = (fg), \
17655 + .work = &fn##_nw, \
17656 }; \
17657 __register_nmi_handler((t), &fn##_na); \
17658 })
17659
17660 -int __register_nmi_handler(unsigned int, struct nmiaction *);
17661 +int __register_nmi_handler(unsigned int, const struct nmiaction *);
17662
17663 void unregister_nmi_handler(unsigned int, const char *);
17664
17665 diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17666 index 802dde3..9183e68 100644
17667 --- a/arch/x86/include/asm/page.h
17668 +++ b/arch/x86/include/asm/page.h
17669 @@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17670 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17671
17672 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17673 +#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17674
17675 #define __boot_va(x) __va(x)
17676 #define __boot_pa(x) __pa(x)
17677 @@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17678 * virt_to_page(kaddr) returns a valid pointer if and only if
17679 * virt_addr_valid(kaddr) returns true.
17680 */
17681 -#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17682 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17683 extern bool __virt_addr_valid(unsigned long kaddr);
17684 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17685
17686 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17687 +#define virt_to_page(kaddr) \
17688 + ({ \
17689 + const void *__kaddr = (const void *)(kaddr); \
17690 + BUG_ON(!virt_addr_valid(__kaddr)); \
17691 + pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17692 + })
17693 +#else
17694 +#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17695 +#endif
17696 +
17697 #endif /* __ASSEMBLY__ */
17698
17699 #include <asm-generic/memory_model.h>
17700 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17701 index f408caf..4a0455e 100644
17702 --- a/arch/x86/include/asm/page_64.h
17703 +++ b/arch/x86/include/asm/page_64.h
17704 @@ -7,9 +7,9 @@
17705
17706 /* duplicated to the one in bootmem.h */
17707 extern unsigned long max_pfn;
17708 -extern unsigned long phys_base;
17709 +extern const unsigned long phys_base;
17710
17711 -static inline unsigned long __phys_addr_nodebug(unsigned long x)
17712 +static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17713 {
17714 unsigned long y = x - __START_KERNEL_map;
17715
17716 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17717 index cd6e1610..70f4418 100644
17718 --- a/arch/x86/include/asm/paravirt.h
17719 +++ b/arch/x86/include/asm/paravirt.h
17720 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17721 return (pmd_t) { ret };
17722 }
17723
17724 -static inline pmdval_t pmd_val(pmd_t pmd)
17725 +static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17726 {
17727 pmdval_t ret;
17728
17729 @@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17730 val);
17731 }
17732
17733 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17734 +{
17735 + pgdval_t val = native_pgd_val(pgd);
17736 +
17737 + if (sizeof(pgdval_t) > sizeof(long))
17738 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17739 + val, (u64)val >> 32);
17740 + else
17741 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17742 + val);
17743 +}
17744 +
17745 static inline void pgd_clear(pgd_t *pgdp)
17746 {
17747 set_pgd(pgdp, __pgd(0));
17748 @@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17749 pv_mmu_ops.set_fixmap(idx, phys, flags);
17750 }
17751
17752 +#ifdef CONFIG_PAX_KERNEXEC
17753 +static inline unsigned long pax_open_kernel(void)
17754 +{
17755 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17756 +}
17757 +
17758 +static inline unsigned long pax_close_kernel(void)
17759 +{
17760 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17761 +}
17762 +#else
17763 +static inline unsigned long pax_open_kernel(void) { return 0; }
17764 +static inline unsigned long pax_close_kernel(void) { return 0; }
17765 +#endif
17766 +
17767 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17768
17769 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17770 @@ -906,7 +933,7 @@ extern void default_banner(void);
17771
17772 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17773 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17774 -#define PARA_INDIRECT(addr) *%cs:addr
17775 +#define PARA_INDIRECT(addr) *%ss:addr
17776 #endif
17777
17778 #define INTERRUPT_RETURN \
17779 @@ -981,6 +1008,21 @@ extern void default_banner(void);
17780 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17781 CLBR_NONE, \
17782 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17783 +
17784 +#define GET_CR0_INTO_RDI \
17785 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17786 + mov %rax,%rdi
17787 +
17788 +#define SET_RDI_INTO_CR0 \
17789 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17790 +
17791 +#define GET_CR3_INTO_RDI \
17792 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17793 + mov %rax,%rdi
17794 +
17795 +#define SET_RDI_INTO_CR3 \
17796 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17797 +
17798 #endif /* CONFIG_X86_32 */
17799
17800 #endif /* __ASSEMBLY__ */
17801 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17802 index 7549b8b..f0edfda 100644
17803 --- a/arch/x86/include/asm/paravirt_types.h
17804 +++ b/arch/x86/include/asm/paravirt_types.h
17805 @@ -84,7 +84,7 @@ struct pv_init_ops {
17806 */
17807 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17808 unsigned long addr, unsigned len);
17809 -};
17810 +} __no_const __no_randomize_layout;
17811
17812
17813 struct pv_lazy_ops {
17814 @@ -92,13 +92,13 @@ struct pv_lazy_ops {
17815 void (*enter)(void);
17816 void (*leave)(void);
17817 void (*flush)(void);
17818 -};
17819 +} __no_randomize_layout;
17820
17821 struct pv_time_ops {
17822 unsigned long long (*sched_clock)(void);
17823 unsigned long long (*steal_clock)(int cpu);
17824 unsigned long (*get_tsc_khz)(void);
17825 -};
17826 +} __no_const __no_randomize_layout;
17827
17828 struct pv_cpu_ops {
17829 /* hooks for various privileged instructions */
17830 @@ -192,7 +192,7 @@ struct pv_cpu_ops {
17831
17832 void (*start_context_switch)(struct task_struct *prev);
17833 void (*end_context_switch)(struct task_struct *next);
17834 -};
17835 +} __no_const __no_randomize_layout;
17836
17837 struct pv_irq_ops {
17838 /*
17839 @@ -215,7 +215,7 @@ struct pv_irq_ops {
17840 #ifdef CONFIG_X86_64
17841 void (*adjust_exception_frame)(void);
17842 #endif
17843 -};
17844 +} __no_randomize_layout;
17845
17846 struct pv_apic_ops {
17847 #ifdef CONFIG_X86_LOCAL_APIC
17848 @@ -223,7 +223,7 @@ struct pv_apic_ops {
17849 unsigned long start_eip,
17850 unsigned long start_esp);
17851 #endif
17852 -};
17853 +} __no_const __no_randomize_layout;
17854
17855 struct pv_mmu_ops {
17856 unsigned long (*read_cr2)(void);
17857 @@ -313,6 +313,7 @@ struct pv_mmu_ops {
17858 struct paravirt_callee_save make_pud;
17859
17860 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17861 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17862 #endif /* PAGETABLE_LEVELS == 4 */
17863 #endif /* PAGETABLE_LEVELS >= 3 */
17864
17865 @@ -324,7 +325,13 @@ struct pv_mmu_ops {
17866 an mfn. We can tell which is which from the index. */
17867 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17868 phys_addr_t phys, pgprot_t flags);
17869 -};
17870 +
17871 +#ifdef CONFIG_PAX_KERNEXEC
17872 + unsigned long (*pax_open_kernel)(void);
17873 + unsigned long (*pax_close_kernel)(void);
17874 +#endif
17875 +
17876 +} __no_randomize_layout;
17877
17878 struct arch_spinlock;
17879 #ifdef CONFIG_SMP
17880 @@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17881 struct pv_lock_ops {
17882 struct paravirt_callee_save lock_spinning;
17883 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17884 -};
17885 +} __no_randomize_layout;
17886
17887 /* This contains all the paravirt structures: we get a convenient
17888 * number for each function using the offset which we use to indicate
17889 - * what to patch. */
17890 + * what to patch.
17891 + * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17892 + */
17893 +
17894 struct paravirt_patch_template {
17895 struct pv_init_ops pv_init_ops;
17896 struct pv_time_ops pv_time_ops;
17897 @@ -349,7 +359,7 @@ struct paravirt_patch_template {
17898 struct pv_apic_ops pv_apic_ops;
17899 struct pv_mmu_ops pv_mmu_ops;
17900 struct pv_lock_ops pv_lock_ops;
17901 -};
17902 +} __no_randomize_layout;
17903
17904 extern struct pv_info pv_info;
17905 extern struct pv_init_ops pv_init_ops;
17906 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17907 index c4412e9..90e88c5 100644
17908 --- a/arch/x86/include/asm/pgalloc.h
17909 +++ b/arch/x86/include/asm/pgalloc.h
17910 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17911 pmd_t *pmd, pte_t *pte)
17912 {
17913 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17914 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17915 +}
17916 +
17917 +static inline void pmd_populate_user(struct mm_struct *mm,
17918 + pmd_t *pmd, pte_t *pte)
17919 +{
17920 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17921 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17922 }
17923
17924 @@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17925
17926 #ifdef CONFIG_X86_PAE
17927 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17928 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17929 +{
17930 + pud_populate(mm, pudp, pmd);
17931 +}
17932 #else /* !CONFIG_X86_PAE */
17933 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17934 {
17935 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17936 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17937 }
17938 +
17939 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17940 +{
17941 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17942 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17943 +}
17944 #endif /* CONFIG_X86_PAE */
17945
17946 #if PAGETABLE_LEVELS > 3
17947 @@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17948 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17949 }
17950
17951 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17952 +{
17953 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17954 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17955 +}
17956 +
17957 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17958 {
17959 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17960 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17961 index 206a87f..1623b06 100644
17962 --- a/arch/x86/include/asm/pgtable-2level.h
17963 +++ b/arch/x86/include/asm/pgtable-2level.h
17964 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17965
17966 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17967 {
17968 + pax_open_kernel();
17969 *pmdp = pmd;
17970 + pax_close_kernel();
17971 }
17972
17973 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17974 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17975 index 81bb91b..9392125 100644
17976 --- a/arch/x86/include/asm/pgtable-3level.h
17977 +++ b/arch/x86/include/asm/pgtable-3level.h
17978 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17979
17980 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17981 {
17982 + pax_open_kernel();
17983 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17984 + pax_close_kernel();
17985 }
17986
17987 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17988 {
17989 + pax_open_kernel();
17990 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17991 + pax_close_kernel();
17992 }
17993
17994 /*
17995 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17996 index aa97a07..5c53c32 100644
17997 --- a/arch/x86/include/asm/pgtable.h
17998 +++ b/arch/x86/include/asm/pgtable.h
17999 @@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18000
18001 #ifndef __PAGETABLE_PUD_FOLDED
18002 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18003 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18004 #define pgd_clear(pgd) native_pgd_clear(pgd)
18005 #endif
18006
18007 @@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18008
18009 #define arch_end_context_switch(prev) do {} while(0)
18010
18011 +#define pax_open_kernel() native_pax_open_kernel()
18012 +#define pax_close_kernel() native_pax_close_kernel()
18013 #endif /* CONFIG_PARAVIRT */
18014
18015 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
18016 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18017 +
18018 +#ifdef CONFIG_PAX_KERNEXEC
18019 +static inline unsigned long native_pax_open_kernel(void)
18020 +{
18021 + unsigned long cr0;
18022 +
18023 + preempt_disable();
18024 + barrier();
18025 + cr0 = read_cr0() ^ X86_CR0_WP;
18026 + BUG_ON(cr0 & X86_CR0_WP);
18027 + write_cr0(cr0);
18028 + barrier();
18029 + return cr0 ^ X86_CR0_WP;
18030 +}
18031 +
18032 +static inline unsigned long native_pax_close_kernel(void)
18033 +{
18034 + unsigned long cr0;
18035 +
18036 + barrier();
18037 + cr0 = read_cr0() ^ X86_CR0_WP;
18038 + BUG_ON(!(cr0 & X86_CR0_WP));
18039 + write_cr0(cr0);
18040 + barrier();
18041 + preempt_enable_no_resched();
18042 + return cr0 ^ X86_CR0_WP;
18043 +}
18044 +#else
18045 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
18046 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
18047 +#endif
18048 +
18049 /*
18050 * The following only work if pte_present() is true.
18051 * Undefined behaviour if not..
18052 */
18053 +static inline int pte_user(pte_t pte)
18054 +{
18055 + return pte_val(pte) & _PAGE_USER;
18056 +}
18057 +
18058 static inline int pte_dirty(pte_t pte)
18059 {
18060 return pte_flags(pte) & _PAGE_DIRTY;
18061 @@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18062 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18063 }
18064
18065 +static inline unsigned long pgd_pfn(pgd_t pgd)
18066 +{
18067 + return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18068 +}
18069 +
18070 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18071
18072 static inline int pmd_large(pmd_t pte)
18073 @@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18074 return pte_clear_flags(pte, _PAGE_RW);
18075 }
18076
18077 +static inline pte_t pte_mkread(pte_t pte)
18078 +{
18079 + return __pte(pte_val(pte) | _PAGE_USER);
18080 +}
18081 +
18082 static inline pte_t pte_mkexec(pte_t pte)
18083 {
18084 - return pte_clear_flags(pte, _PAGE_NX);
18085 +#ifdef CONFIG_X86_PAE
18086 + if (__supported_pte_mask & _PAGE_NX)
18087 + return pte_clear_flags(pte, _PAGE_NX);
18088 + else
18089 +#endif
18090 + return pte_set_flags(pte, _PAGE_USER);
18091 +}
18092 +
18093 +static inline pte_t pte_exprotect(pte_t pte)
18094 +{
18095 +#ifdef CONFIG_X86_PAE
18096 + if (__supported_pte_mask & _PAGE_NX)
18097 + return pte_set_flags(pte, _PAGE_NX);
18098 + else
18099 +#endif
18100 + return pte_clear_flags(pte, _PAGE_USER);
18101 }
18102
18103 static inline pte_t pte_mkdirty(pte_t pte)
18104 @@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18105 #endif
18106
18107 #ifndef __ASSEMBLY__
18108 +
18109 +#ifdef CONFIG_PAX_PER_CPU_PGD
18110 +extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18111 +enum cpu_pgd_type {kernel = 0, user = 1};
18112 +static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18113 +{
18114 + return cpu_pgd[cpu][type];
18115 +}
18116 +#endif
18117 +
18118 #include <linux/mm_types.h>
18119 #include <linux/mmdebug.h>
18120 #include <linux/log2.h>
18121 @@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18122 * Currently stuck as a macro due to indirect forward reference to
18123 * linux/mmzone.h's __section_mem_map_addr() definition:
18124 */
18125 -#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18126 +#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18127
18128 /* Find an entry in the second-level page table.. */
18129 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18130 @@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18131 * Currently stuck as a macro due to indirect forward reference to
18132 * linux/mmzone.h's __section_mem_map_addr() definition:
18133 */
18134 -#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18135 +#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18136
18137 /* to find an entry in a page-table-directory. */
18138 static inline unsigned long pud_index(unsigned long address)
18139 @@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18140
18141 static inline int pgd_bad(pgd_t pgd)
18142 {
18143 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18144 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18145 }
18146
18147 static inline int pgd_none(pgd_t pgd)
18148 @@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18149 * pgd_offset() returns a (pgd_t *)
18150 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18151 */
18152 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18153 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18154 +
18155 +#ifdef CONFIG_PAX_PER_CPU_PGD
18156 +#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18157 +#endif
18158 +
18159 /*
18160 * a shortcut which implies the use of the kernel's pgd, instead
18161 * of a process's
18162 @@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18163 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18164 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18165
18166 +#ifdef CONFIG_X86_32
18167 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18168 +#else
18169 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18170 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18171 +
18172 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18173 +#ifdef __ASSEMBLY__
18174 +#define pax_user_shadow_base pax_user_shadow_base(%rip)
18175 +#else
18176 +extern unsigned long pax_user_shadow_base;
18177 +extern pgdval_t clone_pgd_mask;
18178 +#endif
18179 +#endif
18180 +
18181 +#endif
18182 +
18183 #ifndef __ASSEMBLY__
18184
18185 extern int direct_gbpages;
18186 @@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18187 * dst and src can be on the same page, but the range must not overlap,
18188 * and must not cross a page boundary.
18189 */
18190 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18191 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18192 {
18193 - memcpy(dst, src, count * sizeof(pgd_t));
18194 + pax_open_kernel();
18195 + while (count--)
18196 + *dst++ = *src++;
18197 + pax_close_kernel();
18198 }
18199
18200 +#ifdef CONFIG_PAX_PER_CPU_PGD
18201 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18202 +#endif
18203 +
18204 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18205 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18206 +#else
18207 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18208 +#endif
18209 +
18210 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18211 static inline int page_level_shift(enum pg_level level)
18212 {
18213 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18214 index b6c0b40..3535d47 100644
18215 --- a/arch/x86/include/asm/pgtable_32.h
18216 +++ b/arch/x86/include/asm/pgtable_32.h
18217 @@ -25,9 +25,6 @@
18218 struct mm_struct;
18219 struct vm_area_struct;
18220
18221 -extern pgd_t swapper_pg_dir[1024];
18222 -extern pgd_t initial_page_table[1024];
18223 -
18224 static inline void pgtable_cache_init(void) { }
18225 static inline void check_pgt_cache(void) { }
18226 void paging_init(void);
18227 @@ -45,6 +42,12 @@ void paging_init(void);
18228 # include <asm/pgtable-2level.h>
18229 #endif
18230
18231 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18232 +extern pgd_t initial_page_table[PTRS_PER_PGD];
18233 +#ifdef CONFIG_X86_PAE
18234 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18235 +#endif
18236 +
18237 #if defined(CONFIG_HIGHPTE)
18238 #define pte_offset_map(dir, address) \
18239 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18240 @@ -59,12 +62,17 @@ void paging_init(void);
18241 /* Clear a kernel PTE and flush it from the TLB */
18242 #define kpte_clear_flush(ptep, vaddr) \
18243 do { \
18244 + pax_open_kernel(); \
18245 pte_clear(&init_mm, (vaddr), (ptep)); \
18246 + pax_close_kernel(); \
18247 __flush_tlb_one((vaddr)); \
18248 } while (0)
18249
18250 #endif /* !__ASSEMBLY__ */
18251
18252 +#define HAVE_ARCH_UNMAPPED_AREA
18253 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18254 +
18255 /*
18256 * kern_addr_valid() is (1) for FLATMEM and (0) for
18257 * SPARSEMEM and DISCONTIGMEM
18258 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18259 index ed5903b..c7fe163 100644
18260 --- a/arch/x86/include/asm/pgtable_32_types.h
18261 +++ b/arch/x86/include/asm/pgtable_32_types.h
18262 @@ -8,7 +8,7 @@
18263 */
18264 #ifdef CONFIG_X86_PAE
18265 # include <asm/pgtable-3level_types.h>
18266 -# define PMD_SIZE (1UL << PMD_SHIFT)
18267 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18268 # define PMD_MASK (~(PMD_SIZE - 1))
18269 #else
18270 # include <asm/pgtable-2level_types.h>
18271 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18272 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18273 #endif
18274
18275 +#ifdef CONFIG_PAX_KERNEXEC
18276 +#ifndef __ASSEMBLY__
18277 +extern unsigned char MODULES_EXEC_VADDR[];
18278 +extern unsigned char MODULES_EXEC_END[];
18279 +#endif
18280 +#include <asm/boot.h>
18281 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18282 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18283 +#else
18284 +#define ktla_ktva(addr) (addr)
18285 +#define ktva_ktla(addr) (addr)
18286 +#endif
18287 +
18288 #define MODULES_VADDR VMALLOC_START
18289 #define MODULES_END VMALLOC_END
18290 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18291 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18292 index 4572b2f..4430113 100644
18293 --- a/arch/x86/include/asm/pgtable_64.h
18294 +++ b/arch/x86/include/asm/pgtable_64.h
18295 @@ -16,11 +16,16 @@
18296
18297 extern pud_t level3_kernel_pgt[512];
18298 extern pud_t level3_ident_pgt[512];
18299 +extern pud_t level3_vmalloc_start_pgt[512];
18300 +extern pud_t level3_vmalloc_end_pgt[512];
18301 +extern pud_t level3_vmemmap_pgt[512];
18302 +extern pud_t level2_vmemmap_pgt[512];
18303 extern pmd_t level2_kernel_pgt[512];
18304 extern pmd_t level2_fixmap_pgt[512];
18305 -extern pmd_t level2_ident_pgt[512];
18306 +extern pmd_t level2_ident_pgt[512*2];
18307 extern pte_t level1_fixmap_pgt[512];
18308 -extern pgd_t init_level4_pgt[];
18309 +extern pte_t level1_vsyscall_pgt[512];
18310 +extern pgd_t init_level4_pgt[512];
18311
18312 #define swapper_pg_dir init_level4_pgt
18313
18314 @@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18315
18316 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18317 {
18318 + pax_open_kernel();
18319 *pmdp = pmd;
18320 + pax_close_kernel();
18321 }
18322
18323 static inline void native_pmd_clear(pmd_t *pmd)
18324 @@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18325
18326 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18327 {
18328 + pax_open_kernel();
18329 *pudp = pud;
18330 + pax_close_kernel();
18331 }
18332
18333 static inline void native_pud_clear(pud_t *pud)
18334 @@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18335
18336 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18337 {
18338 + pax_open_kernel();
18339 + *pgdp = pgd;
18340 + pax_close_kernel();
18341 +}
18342 +
18343 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18344 +{
18345 *pgdp = pgd;
18346 }
18347
18348 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18349 index 7166e25..baaa6fe 100644
18350 --- a/arch/x86/include/asm/pgtable_64_types.h
18351 +++ b/arch/x86/include/asm/pgtable_64_types.h
18352 @@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18353 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18354 #define MODULES_END _AC(0xffffffffff000000, UL)
18355 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18356 +#define MODULES_EXEC_VADDR MODULES_VADDR
18357 +#define MODULES_EXEC_END MODULES_END
18358 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18359 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18360
18361 +#define ktla_ktva(addr) (addr)
18362 +#define ktva_ktla(addr) (addr)
18363 +
18364 #define EARLY_DYNAMIC_PAGE_TABLES 64
18365
18366 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18367 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18368 index 0778964..0e94758 100644
18369 --- a/arch/x86/include/asm/pgtable_types.h
18370 +++ b/arch/x86/include/asm/pgtable_types.h
18371 @@ -110,8 +110,10 @@
18372
18373 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18374 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18375 -#else
18376 +#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18377 #define _PAGE_NX (_AT(pteval_t, 0))
18378 +#else
18379 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18380 #endif
18381
18382 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18383 @@ -150,6 +152,9 @@
18384 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18385 _PAGE_ACCESSED)
18386
18387 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
18388 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
18389 +
18390 #define __PAGE_KERNEL_EXEC \
18391 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18392 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18393 @@ -160,7 +165,7 @@
18394 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18395 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18396 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18397 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18398 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18399 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18400 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18401 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18402 @@ -217,7 +222,7 @@
18403 #ifdef CONFIG_X86_64
18404 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18405 #else
18406 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18407 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18408 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18409 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18410 #endif
18411 @@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18412 {
18413 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18414 }
18415 +#endif
18416
18417 +#if PAGETABLE_LEVELS == 3
18418 +#include <asm-generic/pgtable-nopud.h>
18419 +#endif
18420 +
18421 +#if PAGETABLE_LEVELS == 2
18422 +#include <asm-generic/pgtable-nopmd.h>
18423 +#endif
18424 +
18425 +#ifndef __ASSEMBLY__
18426 #if PAGETABLE_LEVELS > 3
18427 typedef struct { pudval_t pud; } pud_t;
18428
18429 @@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18430 return pud.pud;
18431 }
18432 #else
18433 -#include <asm-generic/pgtable-nopud.h>
18434 -
18435 static inline pudval_t native_pud_val(pud_t pud)
18436 {
18437 return native_pgd_val(pud.pgd);
18438 @@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18439 return pmd.pmd;
18440 }
18441 #else
18442 -#include <asm-generic/pgtable-nopmd.h>
18443 -
18444 static inline pmdval_t native_pmd_val(pmd_t pmd)
18445 {
18446 return native_pgd_val(pmd.pud.pgd);
18447 @@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18448
18449 extern pteval_t __supported_pte_mask;
18450 extern void set_nx(void);
18451 -extern int nx_enabled;
18452
18453 #define pgprot_writecombine pgprot_writecombine
18454 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18455 diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18456 index 4008734..48f0d81 100644
18457 --- a/arch/x86/include/asm/preempt.h
18458 +++ b/arch/x86/include/asm/preempt.h
18459 @@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18460 */
18461 static __always_inline bool __preempt_count_dec_and_test(void)
18462 {
18463 - GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18464 + GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18465 }
18466
18467 /*
18468 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18469 index eb71ec7..f06532a 100644
18470 --- a/arch/x86/include/asm/processor.h
18471 +++ b/arch/x86/include/asm/processor.h
18472 @@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18473 /* Index into per_cpu list: */
18474 u16 cpu_index;
18475 u32 microcode;
18476 -} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18477 +} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18478
18479 #define X86_VENDOR_INTEL 0
18480 #define X86_VENDOR_CYRIX 1
18481 @@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18482 : "memory");
18483 }
18484
18485 +/* invpcid (%rdx),%rax */
18486 +#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18487 +
18488 +#define INVPCID_SINGLE_ADDRESS 0UL
18489 +#define INVPCID_SINGLE_CONTEXT 1UL
18490 +#define INVPCID_ALL_GLOBAL 2UL
18491 +#define INVPCID_ALL_NONGLOBAL 3UL
18492 +
18493 +#define PCID_KERNEL 0UL
18494 +#define PCID_USER 1UL
18495 +#define PCID_NOFLUSH (1UL << 63)
18496 +
18497 static inline void load_cr3(pgd_t *pgdir)
18498 {
18499 - write_cr3(__pa(pgdir));
18500 + write_cr3(__pa(pgdir) | PCID_KERNEL);
18501 }
18502
18503 #ifdef CONFIG_X86_32
18504 @@ -282,7 +294,7 @@ struct tss_struct {
18505
18506 } ____cacheline_aligned;
18507
18508 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18509 +extern struct tss_struct init_tss[NR_CPUS];
18510
18511 /*
18512 * Save the original ist values for checking stack pointers during debugging
18513 @@ -478,6 +490,7 @@ struct thread_struct {
18514 unsigned short ds;
18515 unsigned short fsindex;
18516 unsigned short gsindex;
18517 + unsigned short ss;
18518 #endif
18519 #ifdef CONFIG_X86_32
18520 unsigned long ip;
18521 @@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18522 extern unsigned long mmu_cr4_features;
18523 extern u32 *trampoline_cr4_features;
18524
18525 -static inline void set_in_cr4(unsigned long mask)
18526 -{
18527 - unsigned long cr4;
18528 -
18529 - mmu_cr4_features |= mask;
18530 - if (trampoline_cr4_features)
18531 - *trampoline_cr4_features = mmu_cr4_features;
18532 - cr4 = read_cr4();
18533 - cr4 |= mask;
18534 - write_cr4(cr4);
18535 -}
18536 -
18537 -static inline void clear_in_cr4(unsigned long mask)
18538 -{
18539 - unsigned long cr4;
18540 -
18541 - mmu_cr4_features &= ~mask;
18542 - if (trampoline_cr4_features)
18543 - *trampoline_cr4_features = mmu_cr4_features;
18544 - cr4 = read_cr4();
18545 - cr4 &= ~mask;
18546 - write_cr4(cr4);
18547 -}
18548 +extern void set_in_cr4(unsigned long mask);
18549 +extern void clear_in_cr4(unsigned long mask);
18550
18551 typedef struct {
18552 unsigned long seg;
18553 @@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18554 */
18555 #define TASK_SIZE PAGE_OFFSET
18556 #define TASK_SIZE_MAX TASK_SIZE
18557 +
18558 +#ifdef CONFIG_PAX_SEGMEXEC
18559 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18560 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18561 +#else
18562 #define STACK_TOP TASK_SIZE
18563 -#define STACK_TOP_MAX STACK_TOP
18564 +#endif
18565 +
18566 +#define STACK_TOP_MAX TASK_SIZE
18567
18568 #define INIT_THREAD { \
18569 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18570 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18571 .vm86_info = NULL, \
18572 .sysenter_cs = __KERNEL_CS, \
18573 .io_bitmap_ptr = NULL, \
18574 @@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18575 */
18576 #define INIT_TSS { \
18577 .x86_tss = { \
18578 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
18579 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18580 .ss0 = __KERNEL_DS, \
18581 .ss1 = __KERNEL_CS, \
18582 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18583 @@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18584 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18585
18586 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18587 -#define KSTK_TOP(info) \
18588 -({ \
18589 - unsigned long *__ptr = (unsigned long *)(info); \
18590 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18591 -})
18592 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18593
18594 /*
18595 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18596 @@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18597 #define task_pt_regs(task) \
18598 ({ \
18599 struct pt_regs *__regs__; \
18600 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18601 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18602 __regs__ - 1; \
18603 })
18604
18605 @@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18606 /*
18607 * User space process size. 47bits minus one guard page.
18608 */
18609 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18610 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18611
18612 /* This decides where the kernel will search for a free chunk of vm
18613 * space during mmap's.
18614 */
18615 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18616 - 0xc0000000 : 0xFFFFe000)
18617 + 0xc0000000 : 0xFFFFf000)
18618
18619 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18620 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18621 @@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18622 #define STACK_TOP_MAX TASK_SIZE_MAX
18623
18624 #define INIT_THREAD { \
18625 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18626 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18627 }
18628
18629 #define INIT_TSS { \
18630 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18631 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18632 }
18633
18634 /*
18635 @@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18636 */
18637 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18638
18639 +#ifdef CONFIG_PAX_SEGMEXEC
18640 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18641 +#endif
18642 +
18643 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18644
18645 /* Get/set a process' ability to use the timestamp counter instruction */
18646 @@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18647 return 0;
18648 }
18649
18650 -extern unsigned long arch_align_stack(unsigned long sp);
18651 +#define arch_align_stack(x) ((x) & ~0xfUL)
18652 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18653
18654 void default_idle(void);
18655 @@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18656 #define xen_set_default_idle 0
18657 #endif
18658
18659 -void stop_this_cpu(void *dummy);
18660 +void stop_this_cpu(void *dummy) __noreturn;
18661 void df_debug(struct pt_regs *regs, long error_code);
18662 #endif /* _ASM_X86_PROCESSOR_H */
18663 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18664 index 86fc2bb..bd5049a 100644
18665 --- a/arch/x86/include/asm/ptrace.h
18666 +++ b/arch/x86/include/asm/ptrace.h
18667 @@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18668 }
18669
18670 /*
18671 - * user_mode_vm(regs) determines whether a register set came from user mode.
18672 + * user_mode(regs) determines whether a register set came from user mode.
18673 * This is true if V8086 mode was enabled OR if the register set was from
18674 * protected mode with RPL-3 CS value. This tricky test checks that with
18675 * one comparison. Many places in the kernel can bypass this full check
18676 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18677 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18678 + * be used.
18679 */
18680 -static inline int user_mode(struct pt_regs *regs)
18681 +static inline int user_mode_novm(struct pt_regs *regs)
18682 {
18683 #ifdef CONFIG_X86_32
18684 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18685 #else
18686 - return !!(regs->cs & 3);
18687 + return !!(regs->cs & SEGMENT_RPL_MASK);
18688 #endif
18689 }
18690
18691 -static inline int user_mode_vm(struct pt_regs *regs)
18692 +static inline int user_mode(struct pt_regs *regs)
18693 {
18694 #ifdef CONFIG_X86_32
18695 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18696 USER_RPL;
18697 #else
18698 - return user_mode(regs);
18699 + return user_mode_novm(regs);
18700 #endif
18701 }
18702
18703 @@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18704 #ifdef CONFIG_X86_64
18705 static inline bool user_64bit_mode(struct pt_regs *regs)
18706 {
18707 + unsigned long cs = regs->cs & 0xffff;
18708 #ifndef CONFIG_PARAVIRT
18709 /*
18710 * On non-paravirt systems, this is the only long mode CPL 3
18711 * selector. We do not allow long mode selectors in the LDT.
18712 */
18713 - return regs->cs == __USER_CS;
18714 + return cs == __USER_CS;
18715 #else
18716 /* Headers are too twisted for this to go in paravirt.h. */
18717 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18718 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18719 #endif
18720 }
18721
18722 @@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18723 * Traps from the kernel do not save sp and ss.
18724 * Use the helper function to retrieve sp.
18725 */
18726 - if (offset == offsetof(struct pt_regs, sp) &&
18727 - regs->cs == __KERNEL_CS)
18728 - return kernel_stack_pointer(regs);
18729 + if (offset == offsetof(struct pt_regs, sp)) {
18730 + unsigned long cs = regs->cs & 0xffff;
18731 + if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18732 + return kernel_stack_pointer(regs);
18733 + }
18734 #endif
18735 return *(unsigned long *)((unsigned long)regs + offset);
18736 }
18737 diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18738 index ae0e241..e80b10b 100644
18739 --- a/arch/x86/include/asm/qrwlock.h
18740 +++ b/arch/x86/include/asm/qrwlock.h
18741 @@ -7,8 +7,8 @@
18742 #define queue_write_unlock queue_write_unlock
18743 static inline void queue_write_unlock(struct qrwlock *lock)
18744 {
18745 - barrier();
18746 - ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18747 + barrier();
18748 + ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18749 }
18750 #endif
18751
18752 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18753 index 9c6b890..5305f53 100644
18754 --- a/arch/x86/include/asm/realmode.h
18755 +++ b/arch/x86/include/asm/realmode.h
18756 @@ -22,16 +22,14 @@ struct real_mode_header {
18757 #endif
18758 /* APM/BIOS reboot */
18759 u32 machine_real_restart_asm;
18760 -#ifdef CONFIG_X86_64
18761 u32 machine_real_restart_seg;
18762 -#endif
18763 };
18764
18765 /* This must match data at trampoline_32/64.S */
18766 struct trampoline_header {
18767 #ifdef CONFIG_X86_32
18768 u32 start;
18769 - u16 gdt_pad;
18770 + u16 boot_cs;
18771 u16 gdt_limit;
18772 u32 gdt_base;
18773 #else
18774 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18775 index a82c4f1..ac45053 100644
18776 --- a/arch/x86/include/asm/reboot.h
18777 +++ b/arch/x86/include/asm/reboot.h
18778 @@ -6,13 +6,13 @@
18779 struct pt_regs;
18780
18781 struct machine_ops {
18782 - void (*restart)(char *cmd);
18783 - void (*halt)(void);
18784 - void (*power_off)(void);
18785 + void (* __noreturn restart)(char *cmd);
18786 + void (* __noreturn halt)(void);
18787 + void (* __noreturn power_off)(void);
18788 void (*shutdown)(void);
18789 void (*crash_shutdown)(struct pt_regs *);
18790 - void (*emergency_restart)(void);
18791 -};
18792 + void (* __noreturn emergency_restart)(void);
18793 +} __no_const;
18794
18795 extern struct machine_ops machine_ops;
18796
18797 diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18798 index 8f7866a..e442f20 100644
18799 --- a/arch/x86/include/asm/rmwcc.h
18800 +++ b/arch/x86/include/asm/rmwcc.h
18801 @@ -3,7 +3,34 @@
18802
18803 #ifdef CC_HAVE_ASM_GOTO
18804
18805 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18806 +#ifdef CONFIG_PAX_REFCOUNT
18807 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18808 +do { \
18809 + asm_volatile_goto (fullop \
18810 + ";jno 0f\n" \
18811 + fullantiop \
18812 + ";int $4\n0:\n" \
18813 + _ASM_EXTABLE(0b, 0b) \
18814 + ";j" cc " %l[cc_label]" \
18815 + : : "m" (var), ## __VA_ARGS__ \
18816 + : "memory" : cc_label); \
18817 + return 0; \
18818 +cc_label: \
18819 + return 1; \
18820 +} while (0)
18821 +#else
18822 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18823 +do { \
18824 + asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18825 + : : "m" (var), ## __VA_ARGS__ \
18826 + : "memory" : cc_label); \
18827 + return 0; \
18828 +cc_label: \
18829 + return 1; \
18830 +} while (0)
18831 +#endif
18832 +
18833 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18834 do { \
18835 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18836 : : "m" (var), ## __VA_ARGS__ \
18837 @@ -13,15 +40,46 @@ cc_label: \
18838 return 1; \
18839 } while (0)
18840
18841 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18842 - __GEN_RMWcc(op " " arg0, var, cc)
18843 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18844 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18845
18846 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18847 - __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18848 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18849 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18850 +
18851 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18852 + __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18853 +
18854 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18855 + __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18856
18857 #else /* !CC_HAVE_ASM_GOTO */
18858
18859 -#define __GEN_RMWcc(fullop, var, cc, ...) \
18860 +#ifdef CONFIG_PAX_REFCOUNT
18861 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18862 +do { \
18863 + char c; \
18864 + asm volatile (fullop \
18865 + ";jno 0f\n" \
18866 + fullantiop \
18867 + ";int $4\n0:\n" \
18868 + _ASM_EXTABLE(0b, 0b) \
18869 + "; set" cc " %1" \
18870 + : "+m" (var), "=qm" (c) \
18871 + : __VA_ARGS__ : "memory"); \
18872 + return c != 0; \
18873 +} while (0)
18874 +#else
18875 +#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18876 +do { \
18877 + char c; \
18878 + asm volatile (fullop "; set" cc " %1" \
18879 + : "+m" (var), "=qm" (c) \
18880 + : __VA_ARGS__ : "memory"); \
18881 + return c != 0; \
18882 +} while (0)
18883 +#endif
18884 +
18885 +#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18886 do { \
18887 char c; \
18888 asm volatile (fullop "; set" cc " %1" \
18889 @@ -30,11 +88,17 @@ do { \
18890 return c != 0; \
18891 } while (0)
18892
18893 -#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18894 - __GEN_RMWcc(op " " arg0, var, cc)
18895 +#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18896 + __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18897 +
18898 +#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18899 + __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18900 +
18901 +#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18902 + __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18903
18904 -#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18905 - __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18906 +#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18907 + __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18908
18909 #endif /* CC_HAVE_ASM_GOTO */
18910
18911 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18912 index cad82c9..2e5c5c1 100644
18913 --- a/arch/x86/include/asm/rwsem.h
18914 +++ b/arch/x86/include/asm/rwsem.h
18915 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18916 {
18917 asm volatile("# beginning down_read\n\t"
18918 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18919 +
18920 +#ifdef CONFIG_PAX_REFCOUNT
18921 + "jno 0f\n"
18922 + LOCK_PREFIX _ASM_DEC "(%1)\n"
18923 + "int $4\n0:\n"
18924 + _ASM_EXTABLE(0b, 0b)
18925 +#endif
18926 +
18927 /* adds 0x00000001 */
18928 " jns 1f\n"
18929 " call call_rwsem_down_read_failed\n"
18930 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18931 "1:\n\t"
18932 " mov %1,%2\n\t"
18933 " add %3,%2\n\t"
18934 +
18935 +#ifdef CONFIG_PAX_REFCOUNT
18936 + "jno 0f\n"
18937 + "sub %3,%2\n"
18938 + "int $4\n0:\n"
18939 + _ASM_EXTABLE(0b, 0b)
18940 +#endif
18941 +
18942 " jle 2f\n\t"
18943 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18944 " jnz 1b\n\t"
18945 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18946 long tmp;
18947 asm volatile("# beginning down_write\n\t"
18948 LOCK_PREFIX " xadd %1,(%2)\n\t"
18949 +
18950 +#ifdef CONFIG_PAX_REFCOUNT
18951 + "jno 0f\n"
18952 + "mov %1,(%2)\n"
18953 + "int $4\n0:\n"
18954 + _ASM_EXTABLE(0b, 0b)
18955 +#endif
18956 +
18957 /* adds 0xffff0001, returns the old value */
18958 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18959 /* was the active mask 0 before? */
18960 @@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18961 long tmp;
18962 asm volatile("# beginning __up_read\n\t"
18963 LOCK_PREFIX " xadd %1,(%2)\n\t"
18964 +
18965 +#ifdef CONFIG_PAX_REFCOUNT
18966 + "jno 0f\n"
18967 + "mov %1,(%2)\n"
18968 + "int $4\n0:\n"
18969 + _ASM_EXTABLE(0b, 0b)
18970 +#endif
18971 +
18972 /* subtracts 1, returns the old value */
18973 " jns 1f\n\t"
18974 " call call_rwsem_wake\n" /* expects old value in %edx */
18975 @@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18976 long tmp;
18977 asm volatile("# beginning __up_write\n\t"
18978 LOCK_PREFIX " xadd %1,(%2)\n\t"
18979 +
18980 +#ifdef CONFIG_PAX_REFCOUNT
18981 + "jno 0f\n"
18982 + "mov %1,(%2)\n"
18983 + "int $4\n0:\n"
18984 + _ASM_EXTABLE(0b, 0b)
18985 +#endif
18986 +
18987 /* subtracts 0xffff0001, returns the old value */
18988 " jns 1f\n\t"
18989 " call call_rwsem_wake\n" /* expects old value in %edx */
18990 @@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18991 {
18992 asm volatile("# beginning __downgrade_write\n\t"
18993 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18994 +
18995 +#ifdef CONFIG_PAX_REFCOUNT
18996 + "jno 0f\n"
18997 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18998 + "int $4\n0:\n"
18999 + _ASM_EXTABLE(0b, 0b)
19000 +#endif
19001 +
19002 /*
19003 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
19004 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
19005 @@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19006 */
19007 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19008 {
19009 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
19010 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
19011 +
19012 +#ifdef CONFIG_PAX_REFCOUNT
19013 + "jno 0f\n"
19014 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
19015 + "int $4\n0:\n"
19016 + _ASM_EXTABLE(0b, 0b)
19017 +#endif
19018 +
19019 : "+m" (sem->count)
19020 : "er" (delta));
19021 }
19022 @@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19023 */
19024 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
19025 {
19026 - return delta + xadd(&sem->count, delta);
19027 + return delta + xadd_check_overflow(&sem->count, delta);
19028 }
19029
19030 #endif /* __KERNEL__ */
19031 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19032 index 6f1c3a8..7744f19 100644
19033 --- a/arch/x86/include/asm/segment.h
19034 +++ b/arch/x86/include/asm/segment.h
19035 @@ -64,10 +64,15 @@
19036 * 26 - ESPFIX small SS
19037 * 27 - per-cpu [ offset to per-cpu data area ]
19038 * 28 - stack_canary-20 [ for stack protector ]
19039 - * 29 - unused
19040 - * 30 - unused
19041 + * 29 - PCI BIOS CS
19042 + * 30 - PCI BIOS DS
19043 * 31 - TSS for double fault handler
19044 */
19045 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19046 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19047 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19048 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19049 +
19050 #define GDT_ENTRY_TLS_MIN 6
19051 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19052
19053 @@ -79,6 +84,8 @@
19054
19055 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19056
19057 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19058 +
19059 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19060
19061 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19062 @@ -104,6 +111,12 @@
19063 #define __KERNEL_STACK_CANARY 0
19064 #endif
19065
19066 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19067 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19068 +
19069 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19070 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19071 +
19072 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19073
19074 /*
19075 @@ -141,7 +154,7 @@
19076 */
19077
19078 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19079 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19080 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19081
19082
19083 #else
19084 @@ -165,6 +178,8 @@
19085 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19086 #define __USER32_DS __USER_DS
19087
19088 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19089 +
19090 #define GDT_ENTRY_TSS 8 /* needs two entries */
19091 #define GDT_ENTRY_LDT 10 /* needs two entries */
19092 #define GDT_ENTRY_TLS_MIN 12
19093 @@ -173,6 +188,8 @@
19094 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19095 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19096
19097 +#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19098 +
19099 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19100 #define FS_TLS 0
19101 #define GS_TLS 1
19102 @@ -180,12 +197,14 @@
19103 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19104 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19105
19106 -#define GDT_ENTRIES 16
19107 +#define GDT_ENTRIES 17
19108
19109 #endif
19110
19111 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19112 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19113 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19114 +#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19115 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19116 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19117 #ifndef CONFIG_PARAVIRT
19118 @@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19119 {
19120 unsigned long __limit;
19121 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19122 - return __limit + 1;
19123 + return __limit;
19124 }
19125
19126 #endif /* !__ASSEMBLY__ */
19127 diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19128 index 8d3120f..352b440 100644
19129 --- a/arch/x86/include/asm/smap.h
19130 +++ b/arch/x86/include/asm/smap.h
19131 @@ -25,11 +25,40 @@
19132
19133 #include <asm/alternative-asm.h>
19134
19135 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19136 +#define ASM_PAX_OPEN_USERLAND \
19137 + 661: jmp 663f; \
19138 + .pushsection .altinstr_replacement, "a" ; \
19139 + 662: pushq %rax; nop; \
19140 + .popsection ; \
19141 + .pushsection .altinstructions, "a" ; \
19142 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19143 + .popsection ; \
19144 + call __pax_open_userland; \
19145 + popq %rax; \
19146 + 663:
19147 +
19148 +#define ASM_PAX_CLOSE_USERLAND \
19149 + 661: jmp 663f; \
19150 + .pushsection .altinstr_replacement, "a" ; \
19151 + 662: pushq %rax; nop; \
19152 + .popsection; \
19153 + .pushsection .altinstructions, "a" ; \
19154 + altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19155 + .popsection; \
19156 + call __pax_close_userland; \
19157 + popq %rax; \
19158 + 663:
19159 +#else
19160 +#define ASM_PAX_OPEN_USERLAND
19161 +#define ASM_PAX_CLOSE_USERLAND
19162 +#endif
19163 +
19164 #ifdef CONFIG_X86_SMAP
19165
19166 #define ASM_CLAC \
19167 661: ASM_NOP3 ; \
19168 - .pushsection .altinstr_replacement, "ax" ; \
19169 + .pushsection .altinstr_replacement, "a" ; \
19170 662: __ASM_CLAC ; \
19171 .popsection ; \
19172 .pushsection .altinstructions, "a" ; \
19173 @@ -38,7 +67,7 @@
19174
19175 #define ASM_STAC \
19176 661: ASM_NOP3 ; \
19177 - .pushsection .altinstr_replacement, "ax" ; \
19178 + .pushsection .altinstr_replacement, "a" ; \
19179 662: __ASM_STAC ; \
19180 .popsection ; \
19181 .pushsection .altinstructions, "a" ; \
19182 @@ -56,6 +85,37 @@
19183
19184 #include <asm/alternative.h>
19185
19186 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
19187 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19188 +
19189 +extern void __pax_open_userland(void);
19190 +static __always_inline unsigned long pax_open_userland(void)
19191 +{
19192 +
19193 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19194 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19195 + :
19196 + : [open] "i" (__pax_open_userland)
19197 + : "memory", "rax");
19198 +#endif
19199 +
19200 + return 0;
19201 +}
19202 +
19203 +extern void __pax_close_userland(void);
19204 +static __always_inline unsigned long pax_close_userland(void)
19205 +{
19206 +
19207 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19208 + asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19209 + :
19210 + : [close] "i" (__pax_close_userland)
19211 + : "memory", "rax");
19212 +#endif
19213 +
19214 + return 0;
19215 +}
19216 +
19217 #ifdef CONFIG_X86_SMAP
19218
19219 static __always_inline void clac(void)
19220 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19221 index 8cd1cc3..827e09e 100644
19222 --- a/arch/x86/include/asm/smp.h
19223 +++ b/arch/x86/include/asm/smp.h
19224 @@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19225 /* cpus sharing the last level cache: */
19226 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19227 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19228 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19229 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19230
19231 static inline struct cpumask *cpu_sibling_mask(int cpu)
19232 {
19233 @@ -78,7 +78,7 @@ struct smp_ops {
19234
19235 void (*send_call_func_ipi)(const struct cpumask *mask);
19236 void (*send_call_func_single_ipi)(int cpu);
19237 -};
19238 +} __no_const;
19239
19240 /* Globals due to paravirt */
19241 extern void set_cpu_sibling_map(int cpu);
19242 @@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19243 extern int safe_smp_processor_id(void);
19244
19245 #elif defined(CONFIG_X86_64_SMP)
19246 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19247 -
19248 -#define stack_smp_processor_id() \
19249 -({ \
19250 - struct thread_info *ti; \
19251 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19252 - ti->cpu; \
19253 -})
19254 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19255 +#define stack_smp_processor_id() raw_smp_processor_id()
19256 #define safe_smp_processor_id() smp_processor_id()
19257
19258 #endif
19259 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19260 index 6a99859..03cb807 100644
19261 --- a/arch/x86/include/asm/stackprotector.h
19262 +++ b/arch/x86/include/asm/stackprotector.h
19263 @@ -47,7 +47,7 @@
19264 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19265 */
19266 #define GDT_STACK_CANARY_INIT \
19267 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19268 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19269
19270 /*
19271 * Initialize the stackprotector canary value.
19272 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19273
19274 static inline void load_stack_canary_segment(void)
19275 {
19276 -#ifdef CONFIG_X86_32
19277 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19278 asm volatile ("mov %0, %%gs" : : "r" (0));
19279 #endif
19280 }
19281 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19282 index 70bbe39..4ae2bd4 100644
19283 --- a/arch/x86/include/asm/stacktrace.h
19284 +++ b/arch/x86/include/asm/stacktrace.h
19285 @@ -11,28 +11,20 @@
19286
19287 extern int kstack_depth_to_print;
19288
19289 -struct thread_info;
19290 +struct task_struct;
19291 struct stacktrace_ops;
19292
19293 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19294 - unsigned long *stack,
19295 - unsigned long bp,
19296 - const struct stacktrace_ops *ops,
19297 - void *data,
19298 - unsigned long *end,
19299 - int *graph);
19300 +typedef unsigned long walk_stack_t(struct task_struct *task,
19301 + void *stack_start,
19302 + unsigned long *stack,
19303 + unsigned long bp,
19304 + const struct stacktrace_ops *ops,
19305 + void *data,
19306 + unsigned long *end,
19307 + int *graph);
19308
19309 -extern unsigned long
19310 -print_context_stack(struct thread_info *tinfo,
19311 - unsigned long *stack, unsigned long bp,
19312 - const struct stacktrace_ops *ops, void *data,
19313 - unsigned long *end, int *graph);
19314 -
19315 -extern unsigned long
19316 -print_context_stack_bp(struct thread_info *tinfo,
19317 - unsigned long *stack, unsigned long bp,
19318 - const struct stacktrace_ops *ops, void *data,
19319 - unsigned long *end, int *graph);
19320 +extern walk_stack_t print_context_stack;
19321 +extern walk_stack_t print_context_stack_bp;
19322
19323 /* Generic stack tracer with callbacks */
19324
19325 @@ -40,7 +32,7 @@ struct stacktrace_ops {
19326 void (*address)(void *data, unsigned long address, int reliable);
19327 /* On negative return stop dumping */
19328 int (*stack)(void *data, char *name);
19329 - walk_stack_t walk_stack;
19330 + walk_stack_t *walk_stack;
19331 };
19332
19333 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19334 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19335 index d7f3b3b..3cc39f1 100644
19336 --- a/arch/x86/include/asm/switch_to.h
19337 +++ b/arch/x86/include/asm/switch_to.h
19338 @@ -108,7 +108,7 @@ do { \
19339 "call __switch_to\n\t" \
19340 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19341 __switch_canary \
19342 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
19343 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19344 "movq %%rax,%%rdi\n\t" \
19345 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19346 "jnz ret_from_fork\n\t" \
19347 @@ -119,7 +119,7 @@ do { \
19348 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19349 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19350 [_tif_fork] "i" (_TIF_FORK), \
19351 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
19352 + [thread_info] "m" (current_tinfo), \
19353 [current_task] "m" (current_task) \
19354 __switch_canary_iparam \
19355 : "memory", "cc" __EXTRA_CLOBBER)
19356 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19357 index 547e344..6be1175 100644
19358 --- a/arch/x86/include/asm/thread_info.h
19359 +++ b/arch/x86/include/asm/thread_info.h
19360 @@ -24,7 +24,6 @@ struct exec_domain;
19361 #include <linux/atomic.h>
19362
19363 struct thread_info {
19364 - struct task_struct *task; /* main task structure */
19365 struct exec_domain *exec_domain; /* execution domain */
19366 __u32 flags; /* low level flags */
19367 __u32 status; /* thread synchronous flags */
19368 @@ -33,13 +32,13 @@ struct thread_info {
19369 mm_segment_t addr_limit;
19370 struct restart_block restart_block;
19371 void __user *sysenter_return;
19372 + unsigned long lowest_stack;
19373 unsigned int sig_on_uaccess_error:1;
19374 unsigned int uaccess_err:1; /* uaccess failed */
19375 };
19376
19377 -#define INIT_THREAD_INFO(tsk) \
19378 +#define INIT_THREAD_INFO \
19379 { \
19380 - .task = &tsk, \
19381 .exec_domain = &default_exec_domain, \
19382 .flags = 0, \
19383 .cpu = 0, \
19384 @@ -50,7 +49,7 @@ struct thread_info {
19385 }, \
19386 }
19387
19388 -#define init_thread_info (init_thread_union.thread_info)
19389 +#define init_thread_info (init_thread_union.stack)
19390 #define init_stack (init_thread_union.stack)
19391
19392 #else /* !__ASSEMBLY__ */
19393 @@ -91,6 +90,7 @@ struct thread_info {
19394 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19395 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19396 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19397 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19398
19399 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19400 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19401 @@ -115,17 +115,18 @@ struct thread_info {
19402 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19403 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19404 #define _TIF_X32 (1 << TIF_X32)
19405 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19406
19407 /* work to do in syscall_trace_enter() */
19408 #define _TIF_WORK_SYSCALL_ENTRY \
19409 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19410 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19411 - _TIF_NOHZ)
19412 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19413
19414 /* work to do in syscall_trace_leave() */
19415 #define _TIF_WORK_SYSCALL_EXIT \
19416 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19417 - _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19418 + _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19419
19420 /* work to do on interrupt/exception return */
19421 #define _TIF_WORK_MASK \
19422 @@ -136,7 +137,7 @@ struct thread_info {
19423 /* work to do on any return to user space */
19424 #define _TIF_ALLWORK_MASK \
19425 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19426 - _TIF_NOHZ)
19427 + _TIF_NOHZ | _TIF_GRSEC_SETXID)
19428
19429 /* Only used for 64 bit */
19430 #define _TIF_DO_NOTIFY_MASK \
19431 @@ -151,7 +152,6 @@ struct thread_info {
19432 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19433
19434 #define STACK_WARN (THREAD_SIZE/8)
19435 -#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19436
19437 /*
19438 * macros/functions for gaining access to the thread information structure
19439 @@ -162,26 +162,18 @@ struct thread_info {
19440
19441 DECLARE_PER_CPU(unsigned long, kernel_stack);
19442
19443 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19444 +
19445 static inline struct thread_info *current_thread_info(void)
19446 {
19447 - struct thread_info *ti;
19448 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
19449 - KERNEL_STACK_OFFSET - THREAD_SIZE);
19450 - return ti;
19451 + return this_cpu_read_stable(current_tinfo);
19452 }
19453
19454 #else /* !__ASSEMBLY__ */
19455
19456 /* how to get the thread information struct from ASM */
19457 #define GET_THREAD_INFO(reg) \
19458 - _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19459 - _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19460 -
19461 -/*
19462 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19463 - * a certain register (to be used in assembler memory operands).
19464 - */
19465 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19466 + _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19467
19468 #endif
19469
19470 @@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19471 extern void arch_task_cache_init(void);
19472 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19473 extern void arch_release_task_struct(struct task_struct *tsk);
19474 +
19475 +#define __HAVE_THREAD_FUNCTIONS
19476 +#define task_thread_info(task) (&(task)->tinfo)
19477 +#define task_stack_page(task) ((task)->stack)
19478 +#define setup_thread_stack(p, org) do {} while (0)
19479 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19480 +
19481 #endif
19482 #endif /* _ASM_X86_THREAD_INFO_H */
19483 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19484 index 04905bf..1178cdf 100644
19485 --- a/arch/x86/include/asm/tlbflush.h
19486 +++ b/arch/x86/include/asm/tlbflush.h
19487 @@ -17,18 +17,44 @@
19488
19489 static inline void __native_flush_tlb(void)
19490 {
19491 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19492 + u64 descriptor[2];
19493 +
19494 + descriptor[0] = PCID_KERNEL;
19495 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19496 + return;
19497 + }
19498 +
19499 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19500 + if (static_cpu_has(X86_FEATURE_PCID)) {
19501 + unsigned int cpu = raw_get_cpu();
19502 +
19503 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19504 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19505 + raw_put_cpu_no_resched();
19506 + return;
19507 + }
19508 +#endif
19509 +
19510 native_write_cr3(native_read_cr3());
19511 }
19512
19513 static inline void __native_flush_tlb_global_irq_disabled(void)
19514 {
19515 - unsigned long cr4;
19516 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19517 + u64 descriptor[2];
19518
19519 - cr4 = native_read_cr4();
19520 - /* clear PGE */
19521 - native_write_cr4(cr4 & ~X86_CR4_PGE);
19522 - /* write old PGE again and flush TLBs */
19523 - native_write_cr4(cr4);
19524 + descriptor[0] = PCID_KERNEL;
19525 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19526 + } else {
19527 + unsigned long cr4;
19528 +
19529 + cr4 = native_read_cr4();
19530 + /* clear PGE */
19531 + native_write_cr4(cr4 & ~X86_CR4_PGE);
19532 + /* write old PGE again and flush TLBs */
19533 + native_write_cr4(cr4);
19534 + }
19535 }
19536
19537 static inline void __native_flush_tlb_global(void)
19538 @@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19539
19540 static inline void __native_flush_tlb_single(unsigned long addr)
19541 {
19542 + if (static_cpu_has(X86_FEATURE_INVPCID)) {
19543 + u64 descriptor[2];
19544 +
19545 + descriptor[0] = PCID_KERNEL;
19546 + descriptor[1] = addr;
19547 +
19548 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19549 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19550 + if (addr < TASK_SIZE_MAX)
19551 + descriptor[1] += pax_user_shadow_base;
19552 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19553 + }
19554 +
19555 + descriptor[0] = PCID_USER;
19556 + descriptor[1] = addr;
19557 +#endif
19558 +
19559 + asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19560 + return;
19561 + }
19562 +
19563 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19564 + if (static_cpu_has(X86_FEATURE_PCID)) {
19565 + unsigned int cpu = raw_get_cpu();
19566 +
19567 + native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19568 + asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19569 + native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19570 + raw_put_cpu_no_resched();
19571 +
19572 + if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19573 + addr += pax_user_shadow_base;
19574 + }
19575 +#endif
19576 +
19577 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19578 }
19579
19580 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19581 index 0d592e0..526f797 100644
19582 --- a/arch/x86/include/asm/uaccess.h
19583 +++ b/arch/x86/include/asm/uaccess.h
19584 @@ -7,6 +7,7 @@
19585 #include <linux/compiler.h>
19586 #include <linux/thread_info.h>
19587 #include <linux/string.h>
19588 +#include <linux/spinlock.h>
19589 #include <asm/asm.h>
19590 #include <asm/page.h>
19591 #include <asm/smap.h>
19592 @@ -29,7 +30,12 @@
19593
19594 #define get_ds() (KERNEL_DS)
19595 #define get_fs() (current_thread_info()->addr_limit)
19596 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19597 +void __set_fs(mm_segment_t x);
19598 +void set_fs(mm_segment_t x);
19599 +#else
19600 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19601 +#endif
19602
19603 #define segment_eq(a, b) ((a).seg == (b).seg)
19604
19605 @@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19606 * checks that the pointer is in the user space range - after calling
19607 * this function, memory access functions may still return -EFAULT.
19608 */
19609 -#define access_ok(type, addr, size) \
19610 - likely(!__range_not_ok(addr, size, user_addr_max()))
19611 +extern int _cond_resched(void);
19612 +#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19613 +#define access_ok(type, addr, size) \
19614 +({ \
19615 + unsigned long __size = size; \
19616 + unsigned long __addr = (unsigned long)addr; \
19617 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19618 + if (__ret_ao && __size) { \
19619 + unsigned long __addr_ao = __addr & PAGE_MASK; \
19620 + unsigned long __end_ao = __addr + __size - 1; \
19621 + if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19622 + while (__addr_ao <= __end_ao) { \
19623 + char __c_ao; \
19624 + __addr_ao += PAGE_SIZE; \
19625 + if (__size > PAGE_SIZE) \
19626 + _cond_resched(); \
19627 + if (__get_user(__c_ao, (char __user *)__addr)) \
19628 + break; \
19629 + if (type != VERIFY_WRITE) { \
19630 + __addr = __addr_ao; \
19631 + continue; \
19632 + } \
19633 + if (__put_user(__c_ao, (char __user *)__addr)) \
19634 + break; \
19635 + __addr = __addr_ao; \
19636 + } \
19637 + } \
19638 + } \
19639 + __ret_ao; \
19640 +})
19641
19642 /*
19643 * The exception table consists of pairs of addresses relative to the
19644 @@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19645 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19646 __chk_user_ptr(ptr); \
19647 might_fault(); \
19648 + pax_open_userland(); \
19649 asm volatile("call __get_user_%P3" \
19650 : "=a" (__ret_gu), "=r" (__val_gu) \
19651 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19652 (x) = (__typeof__(*(ptr))) __val_gu; \
19653 + pax_close_userland(); \
19654 __ret_gu; \
19655 })
19656
19657 @@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19658 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19659 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19660
19661 -
19662 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19663 +#define __copyuser_seg "gs;"
19664 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19665 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19666 +#else
19667 +#define __copyuser_seg
19668 +#define __COPYUSER_SET_ES
19669 +#define __COPYUSER_RESTORE_ES
19670 +#endif
19671
19672 #ifdef CONFIG_X86_32
19673 #define __put_user_asm_u64(x, addr, err, errret) \
19674 asm volatile(ASM_STAC "\n" \
19675 - "1: movl %%eax,0(%2)\n" \
19676 - "2: movl %%edx,4(%2)\n" \
19677 + "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19678 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19679 "3: " ASM_CLAC "\n" \
19680 ".section .fixup,\"ax\"\n" \
19681 "4: movl %3,%0\n" \
19682 @@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19683
19684 #define __put_user_asm_ex_u64(x, addr) \
19685 asm volatile(ASM_STAC "\n" \
19686 - "1: movl %%eax,0(%1)\n" \
19687 - "2: movl %%edx,4(%1)\n" \
19688 + "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19689 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19690 "3: " ASM_CLAC "\n" \
19691 _ASM_EXTABLE_EX(1b, 2b) \
19692 _ASM_EXTABLE_EX(2b, 3b) \
19693 @@ -257,7 +301,8 @@ extern void __put_user_8(void);
19694 __typeof__(*(ptr)) __pu_val; \
19695 __chk_user_ptr(ptr); \
19696 might_fault(); \
19697 - __pu_val = x; \
19698 + __pu_val = (x); \
19699 + pax_open_userland(); \
19700 switch (sizeof(*(ptr))) { \
19701 case 1: \
19702 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19703 @@ -275,6 +320,7 @@ extern void __put_user_8(void);
19704 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19705 break; \
19706 } \
19707 + pax_close_userland(); \
19708 __ret_pu; \
19709 })
19710
19711 @@ -355,8 +401,10 @@ do { \
19712 } while (0)
19713
19714 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19715 +do { \
19716 + pax_open_userland(); \
19717 asm volatile(ASM_STAC "\n" \
19718 - "1: mov"itype" %2,%"rtype"1\n" \
19719 + "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19720 "2: " ASM_CLAC "\n" \
19721 ".section .fixup,\"ax\"\n" \
19722 "3: mov %3,%0\n" \
19723 @@ -364,8 +412,10 @@ do { \
19724 " jmp 2b\n" \
19725 ".previous\n" \
19726 _ASM_EXTABLE(1b, 3b) \
19727 - : "=r" (err), ltype(x) \
19728 - : "m" (__m(addr)), "i" (errret), "0" (err))
19729 + : "=r" (err), ltype (x) \
19730 + : "m" (__m(addr)), "i" (errret), "0" (err)); \
19731 + pax_close_userland(); \
19732 +} while (0)
19733
19734 #define __get_user_size_ex(x, ptr, size) \
19735 do { \
19736 @@ -389,7 +439,7 @@ do { \
19737 } while (0)
19738
19739 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19740 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19741 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19742 "2:\n" \
19743 _ASM_EXTABLE_EX(1b, 2b) \
19744 : ltype(x) : "m" (__m(addr)))
19745 @@ -406,13 +456,24 @@ do { \
19746 int __gu_err; \
19747 unsigned long __gu_val; \
19748 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19749 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
19750 + (x) = (__typeof__(*(ptr)))__gu_val; \
19751 __gu_err; \
19752 })
19753
19754 /* FIXME: this hack is definitely wrong -AK */
19755 struct __large_struct { unsigned long buf[100]; };
19756 -#define __m(x) (*(struct __large_struct __user *)(x))
19757 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758 +#define ____m(x) \
19759 +({ \
19760 + unsigned long ____x = (unsigned long)(x); \
19761 + if (____x < pax_user_shadow_base) \
19762 + ____x += pax_user_shadow_base; \
19763 + (typeof(x))____x; \
19764 +})
19765 +#else
19766 +#define ____m(x) (x)
19767 +#endif
19768 +#define __m(x) (*(struct __large_struct __user *)____m(x))
19769
19770 /*
19771 * Tell gcc we read from memory instead of writing: this is because
19772 @@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19773 * aliasing issues.
19774 */
19775 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19776 +do { \
19777 + pax_open_userland(); \
19778 asm volatile(ASM_STAC "\n" \
19779 - "1: mov"itype" %"rtype"1,%2\n" \
19780 + "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19781 "2: " ASM_CLAC "\n" \
19782 ".section .fixup,\"ax\"\n" \
19783 "3: mov %3,%0\n" \
19784 @@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19785 ".previous\n" \
19786 _ASM_EXTABLE(1b, 3b) \
19787 : "=r"(err) \
19788 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19789 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19790 + pax_close_userland(); \
19791 +} while (0)
19792
19793 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19794 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19795 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19796 "2:\n" \
19797 _ASM_EXTABLE_EX(1b, 2b) \
19798 : : ltype(x), "m" (__m(addr)))
19799 @@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19800 */
19801 #define uaccess_try do { \
19802 current_thread_info()->uaccess_err = 0; \
19803 + pax_open_userland(); \
19804 stac(); \
19805 barrier();
19806
19807 #define uaccess_catch(err) \
19808 clac(); \
19809 + pax_close_userland(); \
19810 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19811 } while (0)
19812
19813 @@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19814 * On error, the variable @x is set to zero.
19815 */
19816
19817 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19818 +#define __get_user(x, ptr) get_user((x), (ptr))
19819 +#else
19820 #define __get_user(x, ptr) \
19821 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19822 +#endif
19823
19824 /**
19825 * __put_user: - Write a simple value into user space, with less checking.
19826 @@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19827 * Returns zero on success, or -EFAULT on error.
19828 */
19829
19830 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19831 +#define __put_user(x, ptr) put_user((x), (ptr))
19832 +#else
19833 #define __put_user(x, ptr) \
19834 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19835 +#endif
19836
19837 #define __get_user_unaligned __get_user
19838 #define __put_user_unaligned __put_user
19839 @@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19840 #define get_user_ex(x, ptr) do { \
19841 unsigned long __gue_val; \
19842 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19843 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
19844 + (x) = (__typeof__(*(ptr)))__gue_val; \
19845 } while (0)
19846
19847 #define put_user_try uaccess_try
19848 @@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19849 __typeof__(ptr) __uval = (uval); \
19850 __typeof__(*(ptr)) __old = (old); \
19851 __typeof__(*(ptr)) __new = (new); \
19852 + pax_open_userland(); \
19853 switch (size) { \
19854 case 1: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857 - "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19858 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870 @@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 2: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874 - "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19875 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887 @@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19888 case 4: \
19889 { \
19890 asm volatile("\t" ASM_STAC "\n" \
19891 - "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19892 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904 @@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19905 __cmpxchg_wrong_size(); \
19906 \
19907 asm volatile("\t" ASM_STAC "\n" \
19908 - "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19909 + "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19910 "2:\t" ASM_CLAC "\n" \
19911 "\t.section .fixup, \"ax\"\n" \
19912 "3:\tmov %3, %0\n" \
19913 "\tjmp 2b\n" \
19914 "\t.previous\n" \
19915 _ASM_EXTABLE(1b, 3b) \
19916 - : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19917 + : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19918 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19919 : "memory" \
19920 ); \
19921 @@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19922 default: \
19923 __cmpxchg_wrong_size(); \
19924 } \
19925 + pax_close_userland(); \
19926 *__uval = __old; \
19927 __ret; \
19928 })
19929 @@ -636,17 +713,6 @@ extern struct movsl_mask {
19930
19931 #define ARCH_HAS_NOCACHE_UACCESS 1
19932
19933 -#ifdef CONFIG_X86_32
19934 -# include <asm/uaccess_32.h>
19935 -#else
19936 -# include <asm/uaccess_64.h>
19937 -#endif
19938 -
19939 -unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19940 - unsigned n);
19941 -unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19942 - unsigned n);
19943 -
19944 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19945 # define copy_user_diag __compiletime_error
19946 #else
19947 @@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19948 extern void copy_user_diag("copy_from_user() buffer size is too small")
19949 copy_from_user_overflow(void);
19950 extern void copy_user_diag("copy_to_user() buffer size is too small")
19951 -copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19952 +copy_to_user_overflow(void);
19953
19954 #undef copy_user_diag
19955
19956 @@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19957
19958 extern void
19959 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19960 -__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19961 +__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19962 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19963
19964 #else
19965 @@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19966
19967 #endif
19968
19969 +#ifdef CONFIG_X86_32
19970 +# include <asm/uaccess_32.h>
19971 +#else
19972 +# include <asm/uaccess_64.h>
19973 +#endif
19974 +
19975 static inline unsigned long __must_check
19976 copy_from_user(void *to, const void __user *from, unsigned long n)
19977 {
19978 - int sz = __compiletime_object_size(to);
19979 + size_t sz = __compiletime_object_size(to);
19980
19981 might_fault();
19982
19983 @@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19984 * case, and do only runtime checking for non-constant sizes.
19985 */
19986
19987 - if (likely(sz < 0 || sz >= n))
19988 - n = _copy_from_user(to, from, n);
19989 - else if(__builtin_constant_p(n))
19990 - copy_from_user_overflow();
19991 - else
19992 - __copy_from_user_overflow(sz, n);
19993 + if (likely(sz != (size_t)-1 && sz < n)) {
19994 + if(__builtin_constant_p(n))
19995 + copy_from_user_overflow();
19996 + else
19997 + __copy_from_user_overflow(sz, n);
19998 + } else if (access_ok(VERIFY_READ, from, n))
19999 + n = __copy_from_user(to, from, n);
20000 + else if ((long)n > 0)
20001 + memset(to, 0, n);
20002
20003 return n;
20004 }
20005 @@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20006 static inline unsigned long __must_check
20007 copy_to_user(void __user *to, const void *from, unsigned long n)
20008 {
20009 - int sz = __compiletime_object_size(from);
20010 + size_t sz = __compiletime_object_size(from);
20011
20012 might_fault();
20013
20014 /* See the comment in copy_from_user() above. */
20015 - if (likely(sz < 0 || sz >= n))
20016 - n = _copy_to_user(to, from, n);
20017 - else if(__builtin_constant_p(n))
20018 - copy_to_user_overflow();
20019 - else
20020 - __copy_to_user_overflow(sz, n);
20021 + if (likely(sz != (size_t)-1 && sz < n)) {
20022 + if(__builtin_constant_p(n))
20023 + copy_to_user_overflow();
20024 + else
20025 + __copy_to_user_overflow(sz, n);
20026 + } else if (access_ok(VERIFY_WRITE, to, n))
20027 + n = __copy_to_user(to, from, n);
20028
20029 return n;
20030 }
20031 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20032 index 3c03a5d..1071638 100644
20033 --- a/arch/x86/include/asm/uaccess_32.h
20034 +++ b/arch/x86/include/asm/uaccess_32.h
20035 @@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20036 static __always_inline unsigned long __must_check
20037 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20038 {
20039 + if ((long)n < 0)
20040 + return n;
20041 +
20042 + check_object_size(from, n, true);
20043 +
20044 if (__builtin_constant_p(n)) {
20045 unsigned long ret;
20046
20047 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20048 __copy_to_user(void __user *to, const void *from, unsigned long n)
20049 {
20050 might_fault();
20051 +
20052 return __copy_to_user_inatomic(to, from, n);
20053 }
20054
20055 static __always_inline unsigned long
20056 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20057 {
20058 + if ((long)n < 0)
20059 + return n;
20060 +
20061 /* Avoid zeroing the tail if the copy fails..
20062 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20063 * but as the zeroing behaviour is only significant when n is not
20064 @@ -137,6 +146,12 @@ static __always_inline unsigned long
20065 __copy_from_user(void *to, const void __user *from, unsigned long n)
20066 {
20067 might_fault();
20068 +
20069 + if ((long)n < 0)
20070 + return n;
20071 +
20072 + check_object_size(to, n, false);
20073 +
20074 if (__builtin_constant_p(n)) {
20075 unsigned long ret;
20076
20077 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20078 const void __user *from, unsigned long n)
20079 {
20080 might_fault();
20081 +
20082 + if ((long)n < 0)
20083 + return n;
20084 +
20085 if (__builtin_constant_p(n)) {
20086 unsigned long ret;
20087
20088 @@ -181,7 +200,10 @@ static __always_inline unsigned long
20089 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20090 unsigned long n)
20091 {
20092 - return __copy_from_user_ll_nocache_nozero(to, from, n);
20093 + if ((long)n < 0)
20094 + return n;
20095 +
20096 + return __copy_from_user_ll_nocache_nozero(to, from, n);
20097 }
20098
20099 #endif /* _ASM_X86_UACCESS_32_H */
20100 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20101 index 12a26b9..206c200 100644
20102 --- a/arch/x86/include/asm/uaccess_64.h
20103 +++ b/arch/x86/include/asm/uaccess_64.h
20104 @@ -10,6 +10,9 @@
20105 #include <asm/alternative.h>
20106 #include <asm/cpufeature.h>
20107 #include <asm/page.h>
20108 +#include <asm/pgtable.h>
20109 +
20110 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
20111
20112 /*
20113 * Copy To/From Userspace
20114 @@ -17,14 +20,14 @@
20115
20116 /* Handles exceptions in both to and from, but doesn't do access_ok */
20117 __must_check unsigned long
20118 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20119 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20120 __must_check unsigned long
20121 -copy_user_generic_string(void *to, const void *from, unsigned len);
20122 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20123 __must_check unsigned long
20124 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20125 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20126
20127 static __always_inline __must_check unsigned long
20128 -copy_user_generic(void *to, const void *from, unsigned len)
20129 +copy_user_generic(void *to, const void *from, unsigned long len)
20130 {
20131 unsigned ret;
20132
20133 @@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20134 }
20135
20136 __must_check unsigned long
20137 -copy_in_user(void __user *to, const void __user *from, unsigned len);
20138 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
20139
20140 static __always_inline __must_check
20141 -int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20142 +unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20143 {
20144 - int ret = 0;
20145 + size_t sz = __compiletime_object_size(dst);
20146 + unsigned ret = 0;
20147 +
20148 + if (size > INT_MAX)
20149 + return size;
20150 +
20151 + check_object_size(dst, size, false);
20152 +
20153 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20154 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20155 + return size;
20156 +#endif
20157 +
20158 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20159 + if(__builtin_constant_p(size))
20160 + copy_from_user_overflow();
20161 + else
20162 + __copy_from_user_overflow(sz, size);
20163 + return size;
20164 + }
20165
20166 if (!__builtin_constant_p(size))
20167 - return copy_user_generic(dst, (__force void *)src, size);
20168 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20169 switch (size) {
20170 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20171 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20172 ret, "b", "b", "=q", 1);
20173 return ret;
20174 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20175 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20176 ret, "w", "w", "=r", 2);
20177 return ret;
20178 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20179 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20180 ret, "l", "k", "=r", 4);
20181 return ret;
20182 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20183 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20184 ret, "q", "", "=r", 8);
20185 return ret;
20186 case 10:
20187 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20188 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20189 ret, "q", "", "=r", 10);
20190 if (unlikely(ret))
20191 return ret;
20192 __get_user_asm(*(u16 *)(8 + (char *)dst),
20193 - (u16 __user *)(8 + (char __user *)src),
20194 + (const u16 __user *)(8 + (const char __user *)src),
20195 ret, "w", "w", "=r", 2);
20196 return ret;
20197 case 16:
20198 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20199 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20200 ret, "q", "", "=r", 16);
20201 if (unlikely(ret))
20202 return ret;
20203 __get_user_asm(*(u64 *)(8 + (char *)dst),
20204 - (u64 __user *)(8 + (char __user *)src),
20205 + (const u64 __user *)(8 + (const char __user *)src),
20206 ret, "q", "", "=r", 8);
20207 return ret;
20208 default:
20209 - return copy_user_generic(dst, (__force void *)src, size);
20210 + return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20211 }
20212 }
20213
20214 static __always_inline __must_check
20215 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
20216 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20217 {
20218 might_fault();
20219 return __copy_from_user_nocheck(dst, src, size);
20220 }
20221
20222 static __always_inline __must_check
20223 -int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20224 +unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20225 {
20226 - int ret = 0;
20227 + size_t sz = __compiletime_object_size(src);
20228 + unsigned ret = 0;
20229 +
20230 + if (size > INT_MAX)
20231 + return size;
20232 +
20233 + check_object_size(src, size, true);
20234 +
20235 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20236 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20237 + return size;
20238 +#endif
20239 +
20240 + if (unlikely(sz != (size_t)-1 && sz < size)) {
20241 + if(__builtin_constant_p(size))
20242 + copy_to_user_overflow();
20243 + else
20244 + __copy_to_user_overflow(sz, size);
20245 + return size;
20246 + }
20247
20248 if (!__builtin_constant_p(size))
20249 - return copy_user_generic((__force void *)dst, src, size);
20250 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20251 switch (size) {
20252 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20253 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20254 ret, "b", "b", "iq", 1);
20255 return ret;
20256 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20257 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20258 ret, "w", "w", "ir", 2);
20259 return ret;
20260 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20261 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20262 ret, "l", "k", "ir", 4);
20263 return ret;
20264 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20265 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20266 ret, "q", "", "er", 8);
20267 return ret;
20268 case 10:
20269 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20270 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20271 ret, "q", "", "er", 10);
20272 if (unlikely(ret))
20273 return ret;
20274 asm("":::"memory");
20275 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20276 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20277 ret, "w", "w", "ir", 2);
20278 return ret;
20279 case 16:
20280 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20281 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20282 ret, "q", "", "er", 16);
20283 if (unlikely(ret))
20284 return ret;
20285 asm("":::"memory");
20286 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20287 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20288 ret, "q", "", "er", 8);
20289 return ret;
20290 default:
20291 - return copy_user_generic((__force void *)dst, src, size);
20292 + return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20293 }
20294 }
20295
20296 static __always_inline __must_check
20297 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
20298 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20299 {
20300 might_fault();
20301 return __copy_to_user_nocheck(dst, src, size);
20302 }
20303
20304 static __always_inline __must_check
20305 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20306 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20307 {
20308 - int ret = 0;
20309 + unsigned ret = 0;
20310
20311 might_fault();
20312 +
20313 + if (size > INT_MAX)
20314 + return size;
20315 +
20316 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20317 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20318 + return size;
20319 + if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20320 + return size;
20321 +#endif
20322 +
20323 if (!__builtin_constant_p(size))
20324 - return copy_user_generic((__force void *)dst,
20325 - (__force void *)src, size);
20326 + return copy_user_generic((__force_kernel void *)____m(dst),
20327 + (__force_kernel const void *)____m(src), size);
20328 switch (size) {
20329 case 1: {
20330 u8 tmp;
20331 - __get_user_asm(tmp, (u8 __user *)src,
20332 + __get_user_asm(tmp, (const u8 __user *)src,
20333 ret, "b", "b", "=q", 1);
20334 if (likely(!ret))
20335 __put_user_asm(tmp, (u8 __user *)dst,
20336 @@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20337 }
20338 case 2: {
20339 u16 tmp;
20340 - __get_user_asm(tmp, (u16 __user *)src,
20341 + __get_user_asm(tmp, (const u16 __user *)src,
20342 ret, "w", "w", "=r", 2);
20343 if (likely(!ret))
20344 __put_user_asm(tmp, (u16 __user *)dst,
20345 @@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20346
20347 case 4: {
20348 u32 tmp;
20349 - __get_user_asm(tmp, (u32 __user *)src,
20350 + __get_user_asm(tmp, (const u32 __user *)src,
20351 ret, "l", "k", "=r", 4);
20352 if (likely(!ret))
20353 __put_user_asm(tmp, (u32 __user *)dst,
20354 @@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20355 }
20356 case 8: {
20357 u64 tmp;
20358 - __get_user_asm(tmp, (u64 __user *)src,
20359 + __get_user_asm(tmp, (const u64 __user *)src,
20360 ret, "q", "", "=r", 8);
20361 if (likely(!ret))
20362 __put_user_asm(tmp, (u64 __user *)dst,
20363 @@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20364 return ret;
20365 }
20366 default:
20367 - return copy_user_generic((__force void *)dst,
20368 - (__force void *)src, size);
20369 + return copy_user_generic((__force_kernel void *)____m(dst),
20370 + (__force_kernel const void *)____m(src), size);
20371 }
20372 }
20373
20374 -static __must_check __always_inline int
20375 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20376 +static __must_check __always_inline unsigned long
20377 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20378 {
20379 return __copy_from_user_nocheck(dst, src, size);
20380 }
20381
20382 -static __must_check __always_inline int
20383 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20384 +static __must_check __always_inline unsigned long
20385 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20386 {
20387 return __copy_to_user_nocheck(dst, src, size);
20388 }
20389
20390 -extern long __copy_user_nocache(void *dst, const void __user *src,
20391 - unsigned size, int zerorest);
20392 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20393 + unsigned long size, int zerorest);
20394
20395 -static inline int
20396 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20397 +static inline unsigned long
20398 +__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20399 {
20400 might_fault();
20401 +
20402 + if (size > INT_MAX)
20403 + return size;
20404 +
20405 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20406 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20407 + return size;
20408 +#endif
20409 +
20410 return __copy_user_nocache(dst, src, size, 1);
20411 }
20412
20413 -static inline int
20414 +static inline unsigned long
20415 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20416 - unsigned size)
20417 + unsigned long size)
20418 {
20419 + if (size > INT_MAX)
20420 + return size;
20421 +
20422 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20423 + if (!access_ok_noprefault(VERIFY_READ, src, size))
20424 + return size;
20425 +#endif
20426 +
20427 return __copy_user_nocache(dst, src, size, 0);
20428 }
20429
20430 unsigned long
20431 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20432 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20433
20434 #endif /* _ASM_X86_UACCESS_64_H */
20435 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20436 index 5b238981..77fdd78 100644
20437 --- a/arch/x86/include/asm/word-at-a-time.h
20438 +++ b/arch/x86/include/asm/word-at-a-time.h
20439 @@ -11,7 +11,7 @@
20440 * and shift, for example.
20441 */
20442 struct word_at_a_time {
20443 - const unsigned long one_bits, high_bits;
20444 + unsigned long one_bits, high_bits;
20445 };
20446
20447 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20448 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20449 index e45e4da..44e8572 100644
20450 --- a/arch/x86/include/asm/x86_init.h
20451 +++ b/arch/x86/include/asm/x86_init.h
20452 @@ -129,7 +129,7 @@ struct x86_init_ops {
20453 struct x86_init_timers timers;
20454 struct x86_init_iommu iommu;
20455 struct x86_init_pci pci;
20456 -};
20457 +} __no_const;
20458
20459 /**
20460 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20461 @@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20462 void (*setup_percpu_clockev)(void);
20463 void (*early_percpu_clock_init)(void);
20464 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20465 -};
20466 +} __no_const;
20467
20468 struct timespec;
20469
20470 @@ -168,7 +168,7 @@ struct x86_platform_ops {
20471 void (*save_sched_clock_state)(void);
20472 void (*restore_sched_clock_state)(void);
20473 void (*apic_post_init)(void);
20474 -};
20475 +} __no_const;
20476
20477 struct pci_dev;
20478 struct msi_msg;
20479 @@ -185,7 +185,7 @@ struct x86_msi_ops {
20480 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20481 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20482 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20483 -};
20484 +} __no_const;
20485
20486 struct IO_APIC_route_entry;
20487 struct io_apic_irq_attr;
20488 @@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20489 unsigned int destination, int vector,
20490 struct io_apic_irq_attr *attr);
20491 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20492 -};
20493 +} __no_const;
20494
20495 extern struct x86_init_ops x86_init;
20496 extern struct x86_cpuinit_ops x86_cpuinit;
20497 diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20498 index c949923..c22bfa4 100644
20499 --- a/arch/x86/include/asm/xen/page.h
20500 +++ b/arch/x86/include/asm/xen/page.h
20501 @@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20502 extern struct page *m2p_find_override(unsigned long mfn);
20503 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20504
20505 -static inline unsigned long pfn_to_mfn(unsigned long pfn)
20506 +static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20507 {
20508 unsigned long mfn;
20509
20510 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20511 index 7e7a79a..0824666 100644
20512 --- a/arch/x86/include/asm/xsave.h
20513 +++ b/arch/x86/include/asm/xsave.h
20514 @@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20515 if (unlikely(err))
20516 return -EFAULT;
20517
20518 + pax_open_userland();
20519 __asm__ __volatile__(ASM_STAC "\n"
20520 - "1:"XSAVE"\n"
20521 + "1:"
20522 + __copyuser_seg
20523 + XSAVE"\n"
20524 "2: " ASM_CLAC "\n"
20525 xstate_fault
20526 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20527 : "memory");
20528 + pax_close_userland();
20529 return err;
20530 }
20531
20532 @@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20533 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20534 {
20535 int err = 0;
20536 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20537 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20538 u32 lmask = mask;
20539 u32 hmask = mask >> 32;
20540
20541 + pax_open_userland();
20542 __asm__ __volatile__(ASM_STAC "\n"
20543 - "1:"XRSTOR"\n"
20544 + "1:"
20545 + __copyuser_seg
20546 + XRSTOR"\n"
20547 "2: " ASM_CLAC "\n"
20548 xstate_fault
20549 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20550 : "memory"); /* memory required? */
20551 + pax_close_userland();
20552 return err;
20553 }
20554
20555 diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20556 index d993e33..8db1b18 100644
20557 --- a/arch/x86/include/uapi/asm/e820.h
20558 +++ b/arch/x86/include/uapi/asm/e820.h
20559 @@ -58,7 +58,7 @@ struct e820map {
20560 #define ISA_START_ADDRESS 0xa0000
20561 #define ISA_END_ADDRESS 0x100000
20562
20563 -#define BIOS_BEGIN 0x000a0000
20564 +#define BIOS_BEGIN 0x000c0000
20565 #define BIOS_END 0x00100000
20566
20567 #define BIOS_ROM_BASE 0xffe00000
20568 diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20569 index 7b0a55a..ad115bf 100644
20570 --- a/arch/x86/include/uapi/asm/ptrace-abi.h
20571 +++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20572 @@ -49,7 +49,6 @@
20573 #define EFLAGS 144
20574 #define RSP 152
20575 #define SS 160
20576 -#define ARGOFFSET R11
20577 #endif /* __ASSEMBLY__ */
20578
20579 /* top of stack page */
20580 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20581 index 8f1e774..9b4c381 100644
20582 --- a/arch/x86/kernel/Makefile
20583 +++ b/arch/x86/kernel/Makefile
20584 @@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20585 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20586 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20587 obj-y += probe_roms.o
20588 -obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20589 +obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20590 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20591 obj-$(CONFIG_X86_64) += mcount_64.o
20592 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20593 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20594 index a142e77..6222cdd 100644
20595 --- a/arch/x86/kernel/acpi/boot.c
20596 +++ b/arch/x86/kernel/acpi/boot.c
20597 @@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20598 * If your system is blacklisted here, but you find that acpi=force
20599 * works for you, please contact linux-acpi@vger.kernel.org
20600 */
20601 -static struct dmi_system_id __initdata acpi_dmi_table[] = {
20602 +static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20603 /*
20604 * Boxes that need ACPI disabled
20605 */
20606 @@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20607 };
20608
20609 /* second table for DMI checks that should run after early-quirks */
20610 -static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20611 +static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20612 /*
20613 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20614 * which includes some code which overrides all temperature
20615 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20616 index 3136820..e2c6577 100644
20617 --- a/arch/x86/kernel/acpi/sleep.c
20618 +++ b/arch/x86/kernel/acpi/sleep.c
20619 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20620 #else /* CONFIG_64BIT */
20621 #ifdef CONFIG_SMP
20622 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20623 +
20624 + pax_open_kernel();
20625 early_gdt_descr.address =
20626 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20627 + pax_close_kernel();
20628 +
20629 initial_gs = per_cpu_offset(smp_processor_id());
20630 #endif
20631 initial_code = (unsigned long)wakeup_long64;
20632 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20633 index 665c6b7..eae4d56 100644
20634 --- a/arch/x86/kernel/acpi/wakeup_32.S
20635 +++ b/arch/x86/kernel/acpi/wakeup_32.S
20636 @@ -29,13 +29,11 @@ wakeup_pmode_return:
20637 # and restore the stack ... but you need gdt for this to work
20638 movl saved_context_esp, %esp
20639
20640 - movl %cs:saved_magic, %eax
20641 - cmpl $0x12345678, %eax
20642 + cmpl $0x12345678, saved_magic
20643 jne bogus_magic
20644
20645 # jump to place where we left off
20646 - movl saved_eip, %eax
20647 - jmp *%eax
20648 + jmp *(saved_eip)
20649
20650 bogus_magic:
20651 jmp bogus_magic
20652 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20653 index 703130f..27a155d 100644
20654 --- a/arch/x86/kernel/alternative.c
20655 +++ b/arch/x86/kernel/alternative.c
20656 @@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20657 */
20658 for (a = start; a < end; a++) {
20659 instr = (u8 *)&a->instr_offset + a->instr_offset;
20660 +
20661 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20662 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20664 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20665 +#endif
20666 +
20667 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20668 BUG_ON(a->replacementlen > a->instrlen);
20669 BUG_ON(a->instrlen > sizeof(insnbuf));
20670 @@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20671 add_nops(insnbuf + a->replacementlen,
20672 a->instrlen - a->replacementlen);
20673
20674 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20675 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20676 + instr = ktva_ktla(instr);
20677 +#endif
20678 +
20679 text_poke_early(instr, insnbuf, a->instrlen);
20680 }
20681 }
20682 @@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20683 for (poff = start; poff < end; poff++) {
20684 u8 *ptr = (u8 *)poff + *poff;
20685
20686 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20687 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20689 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690 +#endif
20691 +
20692 if (!*poff || ptr < text || ptr >= text_end)
20693 continue;
20694 /* turn DS segment override prefix into lock prefix */
20695 - if (*ptr == 0x3e)
20696 + if (*ktla_ktva(ptr) == 0x3e)
20697 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20698 }
20699 mutex_unlock(&text_mutex);
20700 @@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20701 for (poff = start; poff < end; poff++) {
20702 u8 *ptr = (u8 *)poff + *poff;
20703
20704 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20705 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20706 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20707 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20708 +#endif
20709 +
20710 if (!*poff || ptr < text || ptr >= text_end)
20711 continue;
20712 /* turn lock prefix into DS segment override prefix */
20713 - if (*ptr == 0xf0)
20714 + if (*ktla_ktva(ptr) == 0xf0)
20715 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20716 }
20717 mutex_unlock(&text_mutex);
20718 @@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20719
20720 BUG_ON(p->len > MAX_PATCH_LEN);
20721 /* prep the buffer with the original instructions */
20722 - memcpy(insnbuf, p->instr, p->len);
20723 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20724 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20725 (unsigned long)p->instr, p->len);
20726
20727 @@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20728 if (!uniproc_patched || num_possible_cpus() == 1)
20729 free_init_pages("SMP alternatives",
20730 (unsigned long)__smp_locks,
20731 - (unsigned long)__smp_locks_end);
20732 + PAGE_ALIGN((unsigned long)__smp_locks_end));
20733 #endif
20734
20735 apply_paravirt(__parainstructions, __parainstructions_end);
20736 @@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20737 * instructions. And on the local CPU you need to be protected again NMI or MCE
20738 * handlers seeing an inconsistent instruction while you patch.
20739 */
20740 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
20741 +void *__kprobes text_poke_early(void *addr, const void *opcode,
20742 size_t len)
20743 {
20744 unsigned long flags;
20745 local_irq_save(flags);
20746 - memcpy(addr, opcode, len);
20747 +
20748 + pax_open_kernel();
20749 + memcpy(ktla_ktva(addr), opcode, len);
20750 sync_core();
20751 + pax_close_kernel();
20752 +
20753 local_irq_restore(flags);
20754 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20755 that causes hangs on some VIA CPUs. */
20756 @@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20757 */
20758 void *text_poke(void *addr, const void *opcode, size_t len)
20759 {
20760 - unsigned long flags;
20761 - char *vaddr;
20762 + unsigned char *vaddr = ktla_ktva(addr);
20763 struct page *pages[2];
20764 - int i;
20765 + size_t i;
20766
20767 if (!core_kernel_text((unsigned long)addr)) {
20768 - pages[0] = vmalloc_to_page(addr);
20769 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20770 + pages[0] = vmalloc_to_page(vaddr);
20771 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20772 } else {
20773 - pages[0] = virt_to_page(addr);
20774 + pages[0] = virt_to_page(vaddr);
20775 WARN_ON(!PageReserved(pages[0]));
20776 - pages[1] = virt_to_page(addr + PAGE_SIZE);
20777 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20778 }
20779 BUG_ON(!pages[0]);
20780 - local_irq_save(flags);
20781 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20782 - if (pages[1])
20783 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20784 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20785 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20786 - clear_fixmap(FIX_TEXT_POKE0);
20787 - if (pages[1])
20788 - clear_fixmap(FIX_TEXT_POKE1);
20789 - local_flush_tlb();
20790 - sync_core();
20791 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
20792 - that causes hangs on some VIA CPUs. */
20793 + text_poke_early(addr, opcode, len);
20794 for (i = 0; i < len; i++)
20795 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20796 - local_irq_restore(flags);
20797 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20798 return addr;
20799 }
20800
20801 @@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20802 if (likely(!bp_patching_in_progress))
20803 return 0;
20804
20805 - if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20806 + if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20807 return 0;
20808
20809 /* set up the specified breakpoint handler */
20810 @@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20811 */
20812 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20813 {
20814 - unsigned char int3 = 0xcc;
20815 + const unsigned char int3 = 0xcc;
20816
20817 bp_int3_handler = handler;
20818 bp_int3_addr = (u8 *)addr + sizeof(int3);
20819 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20820 index ba6cc04..06fd971 100644
20821 --- a/arch/x86/kernel/apic/apic.c
20822 +++ b/arch/x86/kernel/apic/apic.c
20823 @@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20824 /*
20825 * Debug level, exported for io_apic.c
20826 */
20827 -unsigned int apic_verbosity;
20828 +int apic_verbosity;
20829
20830 int pic_mode;
20831
20832 @@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20833 apic_write(APIC_ESR, 0);
20834 v = apic_read(APIC_ESR);
20835 ack_APIC_irq();
20836 - atomic_inc(&irq_err_count);
20837 + atomic_inc_unchecked(&irq_err_count);
20838
20839 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20840 smp_processor_id(), v);
20841 diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20842 index de918c4..32eed23 100644
20843 --- a/arch/x86/kernel/apic/apic_flat_64.c
20844 +++ b/arch/x86/kernel/apic/apic_flat_64.c
20845 @@ -154,7 +154,7 @@ static int flat_probe(void)
20846 return 1;
20847 }
20848
20849 -static struct apic apic_flat = {
20850 +static struct apic apic_flat __read_only = {
20851 .name = "flat",
20852 .probe = flat_probe,
20853 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20854 @@ -260,7 +260,7 @@ static int physflat_probe(void)
20855 return 0;
20856 }
20857
20858 -static struct apic apic_physflat = {
20859 +static struct apic apic_physflat __read_only = {
20860
20861 .name = "physical flat",
20862 .probe = physflat_probe,
20863 diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20864 index b205cdb..d8503ff 100644
20865 --- a/arch/x86/kernel/apic/apic_noop.c
20866 +++ b/arch/x86/kernel/apic/apic_noop.c
20867 @@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20868 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20869 }
20870
20871 -struct apic apic_noop = {
20872 +struct apic apic_noop __read_only = {
20873 .name = "noop",
20874 .probe = noop_probe,
20875 .acpi_madt_oem_check = NULL,
20876 diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20877 index c4a8d63..fe893ac 100644
20878 --- a/arch/x86/kernel/apic/bigsmp_32.c
20879 +++ b/arch/x86/kernel/apic/bigsmp_32.c
20880 @@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20881 return dmi_bigsmp;
20882 }
20883
20884 -static struct apic apic_bigsmp = {
20885 +static struct apic apic_bigsmp __read_only = {
20886
20887 .name = "bigsmp",
20888 .probe = probe_bigsmp,
20889 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20890 index 1183d54..6158e47 100644
20891 --- a/arch/x86/kernel/apic/io_apic.c
20892 +++ b/arch/x86/kernel/apic/io_apic.c
20893 @@ -1230,7 +1230,7 @@ out:
20894 }
20895 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20896
20897 -void lock_vector_lock(void)
20898 +void lock_vector_lock(void) __acquires(vector_lock)
20899 {
20900 /* Used to the online set of cpus does not change
20901 * during assign_irq_vector.
20902 @@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20903 raw_spin_lock(&vector_lock);
20904 }
20905
20906 -void unlock_vector_lock(void)
20907 +void unlock_vector_lock(void) __releases(vector_lock)
20908 {
20909 raw_spin_unlock(&vector_lock);
20910 }
20911 @@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20912 ack_APIC_irq();
20913 }
20914
20915 -atomic_t irq_mis_count;
20916 +atomic_unchecked_t irq_mis_count;
20917
20918 #ifdef CONFIG_GENERIC_PENDING_IRQ
20919 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20920 @@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20921 * at the cpu.
20922 */
20923 if (!(v & (1 << (i & 0x1f)))) {
20924 - atomic_inc(&irq_mis_count);
20925 + atomic_inc_unchecked(&irq_mis_count);
20926
20927 eoi_ioapic_irq(irq, cfg);
20928 }
20929 diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20930 index bda4886..f9c7195 100644
20931 --- a/arch/x86/kernel/apic/probe_32.c
20932 +++ b/arch/x86/kernel/apic/probe_32.c
20933 @@ -72,7 +72,7 @@ static int probe_default(void)
20934 return 1;
20935 }
20936
20937 -static struct apic apic_default = {
20938 +static struct apic apic_default __read_only = {
20939
20940 .name = "default",
20941 .probe = probe_default,
20942 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20943 index e658f21..b695a1a 100644
20944 --- a/arch/x86/kernel/apic/x2apic_cluster.c
20945 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
20946 @@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20947 return notifier_from_errno(err);
20948 }
20949
20950 -static struct notifier_block __refdata x2apic_cpu_notifier = {
20951 +static struct notifier_block x2apic_cpu_notifier = {
20952 .notifier_call = update_clusterinfo,
20953 };
20954
20955 @@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20956 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20957 }
20958
20959 -static struct apic apic_x2apic_cluster = {
20960 +static struct apic apic_x2apic_cluster __read_only = {
20961
20962 .name = "cluster x2apic",
20963 .probe = x2apic_cluster_probe,
20964 diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20965 index 6fae733..5ca17af 100644
20966 --- a/arch/x86/kernel/apic/x2apic_phys.c
20967 +++ b/arch/x86/kernel/apic/x2apic_phys.c
20968 @@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20969 return apic == &apic_x2apic_phys;
20970 }
20971
20972 -static struct apic apic_x2apic_phys = {
20973 +static struct apic apic_x2apic_phys __read_only = {
20974
20975 .name = "physical x2apic",
20976 .probe = x2apic_phys_probe,
20977 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20978 index 8e9dcfd..c61b3e4 100644
20979 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
20980 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20981 @@ -348,7 +348,7 @@ static int uv_probe(void)
20982 return apic == &apic_x2apic_uv_x;
20983 }
20984
20985 -static struct apic __refdata apic_x2apic_uv_x = {
20986 +static struct apic apic_x2apic_uv_x __read_only = {
20987
20988 .name = "UV large system",
20989 .probe = uv_probe,
20990 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20991 index 5848744..56cb598 100644
20992 --- a/arch/x86/kernel/apm_32.c
20993 +++ b/arch/x86/kernel/apm_32.c
20994 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20995 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20996 * even though they are called in protected mode.
20997 */
20998 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20999 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21000 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21001
21002 static const char driver_version[] = "1.16ac"; /* no spaces */
21003 @@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
21004 BUG_ON(cpu != 0);
21005 gdt = get_cpu_gdt_table(cpu);
21006 save_desc_40 = gdt[0x40 / 8];
21007 +
21008 + pax_open_kernel();
21009 gdt[0x40 / 8] = bad_bios_desc;
21010 + pax_close_kernel();
21011
21012 apm_irq_save(flags);
21013 APM_DO_SAVE_SEGS;
21014 @@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
21015 &call->esi);
21016 APM_DO_RESTORE_SEGS;
21017 apm_irq_restore(flags);
21018 +
21019 + pax_open_kernel();
21020 gdt[0x40 / 8] = save_desc_40;
21021 + pax_close_kernel();
21022 +
21023 put_cpu();
21024
21025 return call->eax & 0xff;
21026 @@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21027 BUG_ON(cpu != 0);
21028 gdt = get_cpu_gdt_table(cpu);
21029 save_desc_40 = gdt[0x40 / 8];
21030 +
21031 + pax_open_kernel();
21032 gdt[0x40 / 8] = bad_bios_desc;
21033 + pax_close_kernel();
21034
21035 apm_irq_save(flags);
21036 APM_DO_SAVE_SEGS;
21037 @@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21038 &call->eax);
21039 APM_DO_RESTORE_SEGS;
21040 apm_irq_restore(flags);
21041 +
21042 + pax_open_kernel();
21043 gdt[0x40 / 8] = save_desc_40;
21044 + pax_close_kernel();
21045 +
21046 put_cpu();
21047 return error;
21048 }
21049 @@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21050 * code to that CPU.
21051 */
21052 gdt = get_cpu_gdt_table(0);
21053 +
21054 + pax_open_kernel();
21055 set_desc_base(&gdt[APM_CS >> 3],
21056 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21057 set_desc_base(&gdt[APM_CS_16 >> 3],
21058 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21059 set_desc_base(&gdt[APM_DS >> 3],
21060 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21061 + pax_close_kernel();
21062
21063 proc_create("apm", 0, NULL, &apm_file_ops);
21064
21065 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21066 index 9f6b934..cf5ffb3 100644
21067 --- a/arch/x86/kernel/asm-offsets.c
21068 +++ b/arch/x86/kernel/asm-offsets.c
21069 @@ -32,6 +32,8 @@ void common(void) {
21070 OFFSET(TI_flags, thread_info, flags);
21071 OFFSET(TI_status, thread_info, status);
21072 OFFSET(TI_addr_limit, thread_info, addr_limit);
21073 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21074 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21075
21076 BLANK();
21077 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21078 @@ -52,8 +54,26 @@ void common(void) {
21079 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21080 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21081 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21082 +
21083 +#ifdef CONFIG_PAX_KERNEXEC
21084 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21085 #endif
21086
21087 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21088 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21089 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21090 +#ifdef CONFIG_X86_64
21091 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21092 +#endif
21093 +#endif
21094 +
21095 +#endif
21096 +
21097 + BLANK();
21098 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21099 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21100 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21101 +
21102 #ifdef CONFIG_XEN
21103 BLANK();
21104 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21105 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21106 index e7c798b..2b2019b 100644
21107 --- a/arch/x86/kernel/asm-offsets_64.c
21108 +++ b/arch/x86/kernel/asm-offsets_64.c
21109 @@ -77,6 +77,7 @@ int main(void)
21110 BLANK();
21111 #undef ENTRY
21112
21113 + DEFINE(TSS_size, sizeof(struct tss_struct));
21114 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21115 BLANK();
21116
21117 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21118 index e27b49d..85b106c 100644
21119 --- a/arch/x86/kernel/cpu/Makefile
21120 +++ b/arch/x86/kernel/cpu/Makefile
21121 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21122 CFLAGS_REMOVE_perf_event.o = -pg
21123 endif
21124
21125 -# Make sure load_percpu_segment has no stackprotector
21126 -nostackp := $(call cc-option, -fno-stack-protector)
21127 -CFLAGS_common.o := $(nostackp)
21128 -
21129 obj-y := intel_cacheinfo.o scattered.o topology.o
21130 obj-y += common.o
21131 obj-y += rdrand.o
21132 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21133 index 813d29d..6e542d4 100644
21134 --- a/arch/x86/kernel/cpu/amd.c
21135 +++ b/arch/x86/kernel/cpu/amd.c
21136 @@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21137 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21138 {
21139 /* AMD errata T13 (order #21922) */
21140 - if ((c->x86 == 6)) {
21141 + if (c->x86 == 6) {
21142 /* Duron Rev A0 */
21143 if (c->x86_model == 3 && c->x86_mask == 0)
21144 size = 64;
21145 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21146 index cfa9b5b..19b5084 100644
21147 --- a/arch/x86/kernel/cpu/common.c
21148 +++ b/arch/x86/kernel/cpu/common.c
21149 @@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21150
21151 static const struct cpu_dev *this_cpu = &default_cpu;
21152
21153 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21154 -#ifdef CONFIG_X86_64
21155 - /*
21156 - * We need valid kernel segments for data and code in long mode too
21157 - * IRET will check the segment types kkeil 2000/10/28
21158 - * Also sysret mandates a special GDT layout
21159 - *
21160 - * TLS descriptors are currently at a different place compared to i386.
21161 - * Hopefully nobody expects them at a fixed place (Wine?)
21162 - */
21163 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21164 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21165 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21166 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21167 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21168 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21169 -#else
21170 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21171 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21172 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21173 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21174 - /*
21175 - * Segments used for calling PnP BIOS have byte granularity.
21176 - * They code segments and data segments have fixed 64k limits,
21177 - * the transfer segment sizes are set at run time.
21178 - */
21179 - /* 32-bit code */
21180 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181 - /* 16-bit code */
21182 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183 - /* 16-bit data */
21184 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21185 - /* 16-bit data */
21186 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21187 - /* 16-bit data */
21188 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21189 - /*
21190 - * The APM segments have byte granularity and their bases
21191 - * are set at run time. All have 64k limits.
21192 - */
21193 - /* 32-bit code */
21194 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21195 - /* 16-bit code */
21196 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21197 - /* data */
21198 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21199 -
21200 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21201 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21202 - GDT_STACK_CANARY_INIT
21203 -#endif
21204 -} };
21205 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21206 -
21207 static int __init x86_xsave_setup(char *s)
21208 {
21209 if (strlen(s))
21210 @@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21211 }
21212 }
21213
21214 +#ifdef CONFIG_X86_64
21215 +static __init int setup_disable_pcid(char *arg)
21216 +{
21217 + setup_clear_cpu_cap(X86_FEATURE_PCID);
21218 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21219 +
21220 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21221 + if (clone_pgd_mask != ~(pgdval_t)0UL)
21222 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21223 +#endif
21224 +
21225 + return 1;
21226 +}
21227 +__setup("nopcid", setup_disable_pcid);
21228 +
21229 +static void setup_pcid(struct cpuinfo_x86 *c)
21230 +{
21231 + if (!cpu_has(c, X86_FEATURE_PCID)) {
21232 + clear_cpu_cap(c, X86_FEATURE_INVPCID);
21233 +
21234 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21235 + if (clone_pgd_mask != ~(pgdval_t)0UL) {
21236 + pax_open_kernel();
21237 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21238 + pax_close_kernel();
21239 + printk("PAX: slow and weak UDEREF enabled\n");
21240 + } else
21241 + printk("PAX: UDEREF disabled\n");
21242 +#endif
21243 +
21244 + return;
21245 + }
21246 +
21247 + printk("PAX: PCID detected\n");
21248 + set_in_cr4(X86_CR4_PCIDE);
21249 +
21250 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21251 + pax_open_kernel();
21252 + clone_pgd_mask = ~(pgdval_t)0UL;
21253 + pax_close_kernel();
21254 + if (pax_user_shadow_base)
21255 + printk("PAX: weak UDEREF enabled\n");
21256 + else {
21257 + set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21258 + printk("PAX: strong UDEREF enabled\n");
21259 + }
21260 +#endif
21261 +
21262 + if (cpu_has(c, X86_FEATURE_INVPCID))
21263 + printk("PAX: INVPCID detected\n");
21264 +}
21265 +#endif
21266 +
21267 /*
21268 * Some CPU features depend on higher CPUID levels, which may not always
21269 * be available due to CPUID level capping or broken virtualization
21270 @@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21271 {
21272 struct desc_ptr gdt_descr;
21273
21274 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21275 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21276 gdt_descr.size = GDT_SIZE - 1;
21277 load_gdt(&gdt_descr);
21278 /* Reload the per-cpu base */
21279 @@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21280 setup_smep(c);
21281 setup_smap(c);
21282
21283 +#ifdef CONFIG_X86_64
21284 + setup_pcid(c);
21285 +#endif
21286 +
21287 /*
21288 * The vendor-specific functions might have changed features.
21289 * Now we do "generic changes."
21290 @@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 /* Filter out anything that depends on CPUID levels we don't have */
21292 filter_cpuid_features(c, true);
21293
21294 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21295 + setup_clear_cpu_cap(X86_FEATURE_SEP);
21296 +#endif
21297 +
21298 /* If the model name is still unset, do table lookup. */
21299 if (!c->x86_model_id[0]) {
21300 const char *p;
21301 @@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21302 void enable_sep_cpu(void)
21303 {
21304 int cpu = get_cpu();
21305 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
21306 + struct tss_struct *tss = init_tss + cpu;
21307
21308 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21309 put_cpu();
21310 @@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21311 }
21312 __setup("clearcpuid=", setup_disablecpuid);
21313
21314 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21315 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
21316 +
21317 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21318 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21319 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21320 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21321
21322 #ifdef CONFIG_X86_64
21323 -struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21324 -struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21325 - (unsigned long) debug_idt_table };
21326 +struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21327 +const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21328
21329 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21330 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21331 @@ -1309,7 +1318,7 @@ void cpu_init(void)
21332 */
21333 load_ucode_ap();
21334
21335 - t = &per_cpu(init_tss, cpu);
21336 + t = init_tss + cpu;
21337 oist = &per_cpu(orig_ist, cpu);
21338
21339 #ifdef CONFIG_NUMA
21340 @@ -1341,7 +1350,6 @@ void cpu_init(void)
21341 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21342 barrier();
21343
21344 - x86_configure_nx();
21345 enable_x2apic();
21346
21347 /*
21348 @@ -1393,7 +1401,7 @@ void cpu_init(void)
21349 {
21350 int cpu = smp_processor_id();
21351 struct task_struct *curr = current;
21352 - struct tss_struct *t = &per_cpu(init_tss, cpu);
21353 + struct tss_struct *t = init_tss + cpu;
21354 struct thread_struct *thread = &curr->thread;
21355
21356 wait_for_master_cpu(cpu);
21357 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21358 index c703507..28535e3 100644
21359 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21360 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21361 @@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21362 };
21363
21364 #ifdef CONFIG_AMD_NB
21365 +static struct attribute *default_attrs_amd_nb[] = {
21366 + &type.attr,
21367 + &level.attr,
21368 + &coherency_line_size.attr,
21369 + &physical_line_partition.attr,
21370 + &ways_of_associativity.attr,
21371 + &number_of_sets.attr,
21372 + &size.attr,
21373 + &shared_cpu_map.attr,
21374 + &shared_cpu_list.attr,
21375 + NULL,
21376 + NULL,
21377 + NULL,
21378 + NULL
21379 +};
21380 +
21381 static struct attribute **amd_l3_attrs(void)
21382 {
21383 static struct attribute **attrs;
21384 @@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21385
21386 n = ARRAY_SIZE(default_attrs);
21387
21388 - if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21389 - n += 2;
21390 -
21391 - if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21392 - n += 1;
21393 -
21394 - attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21395 - if (attrs == NULL)
21396 - return attrs = default_attrs;
21397 -
21398 - for (n = 0; default_attrs[n]; n++)
21399 - attrs[n] = default_attrs[n];
21400 + attrs = default_attrs_amd_nb;
21401
21402 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21403 attrs[n++] = &cache_disable_0.attr;
21404 @@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21405 .default_attrs = default_attrs,
21406 };
21407
21408 +#ifdef CONFIG_AMD_NB
21409 +static struct kobj_type ktype_cache_amd_nb = {
21410 + .sysfs_ops = &sysfs_ops,
21411 + .default_attrs = default_attrs_amd_nb,
21412 +};
21413 +#endif
21414 +
21415 static struct kobj_type ktype_percpu_entry = {
21416 .sysfs_ops = &sysfs_ops,
21417 };
21418 @@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21419 return retval;
21420 }
21421
21422 +#ifdef CONFIG_AMD_NB
21423 + amd_l3_attrs();
21424 +#endif
21425 +
21426 for (i = 0; i < num_cache_leaves; i++) {
21427 + struct kobj_type *ktype;
21428 +
21429 this_object = INDEX_KOBJECT_PTR(cpu, i);
21430 this_object->cpu = cpu;
21431 this_object->index = i;
21432
21433 this_leaf = CPUID4_INFO_IDX(cpu, i);
21434
21435 - ktype_cache.default_attrs = default_attrs;
21436 + ktype = &ktype_cache;
21437 #ifdef CONFIG_AMD_NB
21438 if (this_leaf->base.nb)
21439 - ktype_cache.default_attrs = amd_l3_attrs();
21440 + ktype = &ktype_cache_amd_nb;
21441 #endif
21442 retval = kobject_init_and_add(&(this_object->kobj),
21443 - &ktype_cache,
21444 + ktype,
21445 per_cpu(ici_cache_kobject, cpu),
21446 "index%1lu", i);
21447 if (unlikely(retval)) {
21448 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21449 index 61a9668ce..b446a37 100644
21450 --- a/arch/x86/kernel/cpu/mcheck/mce.c
21451 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
21452 @@ -45,6 +45,7 @@
21453 #include <asm/processor.h>
21454 #include <asm/mce.h>
21455 #include <asm/msr.h>
21456 +#include <asm/local.h>
21457
21458 #include "mce-internal.h"
21459
21460 @@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21461 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21462 m->cs, m->ip);
21463
21464 - if (m->cs == __KERNEL_CS)
21465 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21466 print_symbol("{%s}", m->ip);
21467 pr_cont("\n");
21468 }
21469 @@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21470
21471 #define PANIC_TIMEOUT 5 /* 5 seconds */
21472
21473 -static atomic_t mce_paniced;
21474 +static atomic_unchecked_t mce_paniced;
21475
21476 static int fake_panic;
21477 -static atomic_t mce_fake_paniced;
21478 +static atomic_unchecked_t mce_fake_paniced;
21479
21480 /* Panic in progress. Enable interrupts and wait for final IPI */
21481 static void wait_for_panic(void)
21482 @@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21483 /*
21484 * Make sure only one CPU runs in machine check panic
21485 */
21486 - if (atomic_inc_return(&mce_paniced) > 1)
21487 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21488 wait_for_panic();
21489 barrier();
21490
21491 @@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21492 console_verbose();
21493 } else {
21494 /* Don't log too much for fake panic */
21495 - if (atomic_inc_return(&mce_fake_paniced) > 1)
21496 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21497 return;
21498 }
21499 /* First print corrected ones that are still unlogged */
21500 @@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21501 if (!fake_panic) {
21502 if (panic_timeout == 0)
21503 panic_timeout = mca_cfg.panic_timeout;
21504 - panic(msg);
21505 + panic("%s", msg);
21506 } else
21507 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21508 }
21509 @@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21510 * might have been modified by someone else.
21511 */
21512 rmb();
21513 - if (atomic_read(&mce_paniced))
21514 + if (atomic_read_unchecked(&mce_paniced))
21515 wait_for_panic();
21516 if (!mca_cfg.monarch_timeout)
21517 goto out;
21518 @@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21519 }
21520
21521 /* Call the installed machine check handler for this CPU setup. */
21522 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
21523 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21524 unexpected_machine_check;
21525
21526 /*
21527 @@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21528 return;
21529 }
21530
21531 + pax_open_kernel();
21532 machine_check_vector = do_machine_check;
21533 + pax_close_kernel();
21534
21535 __mcheck_cpu_init_generic();
21536 __mcheck_cpu_init_vendor(c);
21537 @@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 */
21539
21540 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21541 -static int mce_chrdev_open_count; /* #times opened */
21542 +static local_t mce_chrdev_open_count; /* #times opened */
21543 static int mce_chrdev_open_exclu; /* already open exclusive? */
21544
21545 static int mce_chrdev_open(struct inode *inode, struct file *file)
21546 @@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21547 spin_lock(&mce_chrdev_state_lock);
21548
21549 if (mce_chrdev_open_exclu ||
21550 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21551 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21552 spin_unlock(&mce_chrdev_state_lock);
21553
21554 return -EBUSY;
21555 @@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21556
21557 if (file->f_flags & O_EXCL)
21558 mce_chrdev_open_exclu = 1;
21559 - mce_chrdev_open_count++;
21560 + local_inc(&mce_chrdev_open_count);
21561
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564 @@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21565 {
21566 spin_lock(&mce_chrdev_state_lock);
21567
21568 - mce_chrdev_open_count--;
21569 + local_dec(&mce_chrdev_open_count);
21570 mce_chrdev_open_exclu = 0;
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573 @@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21574
21575 for (i = 0; i < mca_cfg.banks; i++) {
21576 struct mce_bank *b = &mce_banks[i];
21577 - struct device_attribute *a = &b->attr;
21578 + device_attribute_no_const *a = &b->attr;
21579
21580 sysfs_attr_init(&a->attr);
21581 a->attr.name = b->attrname;
21582 @@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21583 static void mce_reset(void)
21584 {
21585 cpu_missing = 0;
21586 - atomic_set(&mce_fake_paniced, 0);
21587 + atomic_set_unchecked(&mce_fake_paniced, 0);
21588 atomic_set(&mce_executing, 0);
21589 atomic_set(&mce_callin, 0);
21590 atomic_set(&global_nwo, 0);
21591 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21592 index a304298..49b6d06 100644
21593 --- a/arch/x86/kernel/cpu/mcheck/p5.c
21594 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
21595 @@ -10,6 +10,7 @@
21596 #include <asm/processor.h>
21597 #include <asm/mce.h>
21598 #include <asm/msr.h>
21599 +#include <asm/pgtable.h>
21600
21601 /* By default disabled */
21602 int mce_p5_enabled __read_mostly;
21603 @@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21604 if (!cpu_has(c, X86_FEATURE_MCE))
21605 return;
21606
21607 + pax_open_kernel();
21608 machine_check_vector = pentium_machine_check;
21609 + pax_close_kernel();
21610 /* Make sure the vector pointer is visible before we enable MCEs: */
21611 wmb();
21612
21613 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21614 index 7dc5564..1273569 100644
21615 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
21616 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21617 @@ -9,6 +9,7 @@
21618 #include <asm/processor.h>
21619 #include <asm/mce.h>
21620 #include <asm/msr.h>
21621 +#include <asm/pgtable.h>
21622
21623 /* Machine check handler for WinChip C6: */
21624 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21625 @@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21626 {
21627 u32 lo, hi;
21628
21629 + pax_open_kernel();
21630 machine_check_vector = winchip_machine_check;
21631 + pax_close_kernel();
21632 /* Make sure the vector pointer is visible before we enable MCEs: */
21633 wmb();
21634
21635 diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21636 index 15c2909..2cef20c 100644
21637 --- a/arch/x86/kernel/cpu/microcode/core.c
21638 +++ b/arch/x86/kernel/cpu/microcode/core.c
21639 @@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21640 return NOTIFY_OK;
21641 }
21642
21643 -static struct notifier_block __refdata mc_cpu_notifier = {
21644 +static struct notifier_block mc_cpu_notifier = {
21645 .notifier_call = mc_cpu_callback,
21646 };
21647
21648 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21649 index c6826d1..ad18e14a 100644
21650 --- a/arch/x86/kernel/cpu/microcode/intel.c
21651 +++ b/arch/x86/kernel/cpu/microcode/intel.c
21652 @@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21653
21654 static int get_ucode_user(void *to, const void *from, size_t n)
21655 {
21656 - return copy_from_user(to, from, n);
21657 + return copy_from_user(to, (const void __force_user *)from, n);
21658 }
21659
21660 static enum ucode_state
21661 request_microcode_user(int cpu, const void __user *buf, size_t size)
21662 {
21663 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21664 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21665 }
21666
21667 static void microcode_fini_cpu(int cpu)
21668 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21669 index ea5f363..cb0e905 100644
21670 --- a/arch/x86/kernel/cpu/mtrr/main.c
21671 +++ b/arch/x86/kernel/cpu/mtrr/main.c
21672 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21673 u64 size_or_mask, size_and_mask;
21674 static bool mtrr_aps_delayed_init;
21675
21676 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21677 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21678
21679 const struct mtrr_ops *mtrr_if;
21680
21681 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21682 index df5e41f..816c719 100644
21683 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21684 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21685 @@ -25,7 +25,7 @@ struct mtrr_ops {
21686 int (*validate_add_page)(unsigned long base, unsigned long size,
21687 unsigned int type);
21688 int (*have_wrcomb)(void);
21689 -};
21690 +} __do_const;
21691
21692 extern int generic_get_free_region(unsigned long base, unsigned long size,
21693 int replace_reg);
21694 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21695 index 143e5f5..5825081 100644
21696 --- a/arch/x86/kernel/cpu/perf_event.c
21697 +++ b/arch/x86/kernel/cpu/perf_event.c
21698 @@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21699
21700 }
21701
21702 -static struct attribute_group x86_pmu_format_group = {
21703 +static attribute_group_no_const x86_pmu_format_group = {
21704 .name = "format",
21705 .attrs = NULL,
21706 };
21707 @@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21708 NULL,
21709 };
21710
21711 -static struct attribute_group x86_pmu_events_group = {
21712 +static attribute_group_no_const x86_pmu_events_group = {
21713 .name = "events",
21714 .attrs = events_attr,
21715 };
21716 @@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21717 if (idx > GDT_ENTRIES)
21718 return 0;
21719
21720 - desc = raw_cpu_ptr(gdt_page.gdt);
21721 + desc = get_cpu_gdt_table(smp_processor_id());
21722 }
21723
21724 return get_desc_base(desc + idx);
21725 @@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21726 break;
21727
21728 perf_callchain_store(entry, frame.return_address);
21729 - fp = frame.next_frame;
21730 + fp = (const void __force_user *)frame.next_frame;
21731 }
21732 }
21733
21734 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21735 index 639d128..e92d7e5 100644
21736 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21737 +++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21738 @@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21739 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21740 {
21741 struct attribute **attrs;
21742 - struct attribute_group *attr_group;
21743 + attribute_group_no_const *attr_group;
21744 int i = 0, j;
21745
21746 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21747 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21748 index 944bf01..4a4392f 100644
21749 --- a/arch/x86/kernel/cpu/perf_event_intel.c
21750 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
21751 @@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21752 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21753
21754 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21755 - u64 capabilities;
21756 + u64 capabilities = x86_pmu.intel_cap.capabilities;
21757
21758 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21759 - x86_pmu.intel_cap.capabilities = capabilities;
21760 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21761 + x86_pmu.intel_cap.capabilities = capabilities;
21762 }
21763
21764 intel_ds_init();
21765 diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21766 index d64f275..26522ff 100644
21767 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21768 +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21769 @@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21770 NULL,
21771 };
21772
21773 -static struct attribute_group rapl_pmu_events_group = {
21774 +static attribute_group_no_const rapl_pmu_events_group __read_only = {
21775 .name = "events",
21776 .attrs = NULL, /* patched at runtime */
21777 };
21778 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21779 index e98f68c..1992b15 100644
21780 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21781 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21782 @@ -737,7 +737,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21783 static int __init uncore_type_init(struct intel_uncore_type *type)
21784 {
21785 struct intel_uncore_pmu *pmus;
21786 - struct attribute_group *attr_group;
21787 + attribute_group_no_const *attr_group;
21788 struct attribute **attrs;
21789 int i, j;
21790
21791 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21792 index 863d9b0..6289b63 100644
21793 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21794 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21795 @@ -114,7 +114,7 @@ struct intel_uncore_box {
21796 struct uncore_event_desc {
21797 struct kobj_attribute attr;
21798 const char *config;
21799 -};
21800 +} __do_const;
21801
21802 ssize_t uncore_event_show(struct kobject *kobj,
21803 struct kobj_attribute *attr, char *buf);
21804 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21805 index 3225ae6c..ee3c6db 100644
21806 --- a/arch/x86/kernel/cpuid.c
21807 +++ b/arch/x86/kernel/cpuid.c
21808 @@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21809 return notifier_from_errno(err);
21810 }
21811
21812 -static struct notifier_block __refdata cpuid_class_cpu_notifier =
21813 +static struct notifier_block cpuid_class_cpu_notifier =
21814 {
21815 .notifier_call = cpuid_class_cpu_callback,
21816 };
21817 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21818 index f5ab56d..d3b201a 100644
21819 --- a/arch/x86/kernel/crash.c
21820 +++ b/arch/x86/kernel/crash.c
21821 @@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21822 #ifdef CONFIG_X86_32
21823 struct pt_regs fixed_regs;
21824
21825 - if (!user_mode_vm(regs)) {
21826 + if (!user_mode(regs)) {
21827 crash_fixup_ss_esp(&fixed_regs, regs);
21828 regs = &fixed_regs;
21829 }
21830 diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21831 index afa64ad..dce67dd 100644
21832 --- a/arch/x86/kernel/crash_dump_64.c
21833 +++ b/arch/x86/kernel/crash_dump_64.c
21834 @@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21835 return -ENOMEM;
21836
21837 if (userbuf) {
21838 - if (copy_to_user(buf, vaddr + offset, csize)) {
21839 + if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21840 iounmap(vaddr);
21841 return -EFAULT;
21842 }
21843 diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21844 index f6dfd93..892ade4 100644
21845 --- a/arch/x86/kernel/doublefault.c
21846 +++ b/arch/x86/kernel/doublefault.c
21847 @@ -12,7 +12,7 @@
21848
21849 #define DOUBLEFAULT_STACKSIZE (1024)
21850 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21851 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21852 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21853
21854 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21855
21856 @@ -22,7 +22,7 @@ static void doublefault_fn(void)
21857 unsigned long gdt, tss;
21858
21859 native_store_gdt(&gdt_desc);
21860 - gdt = gdt_desc.address;
21861 + gdt = (unsigned long)gdt_desc.address;
21862
21863 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21864
21865 @@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21866 /* 0x2 bit is always set */
21867 .flags = X86_EFLAGS_SF | 0x2,
21868 .sp = STACK_START,
21869 - .es = __USER_DS,
21870 + .es = __KERNEL_DS,
21871 .cs = __KERNEL_CS,
21872 .ss = __KERNEL_DS,
21873 - .ds = __USER_DS,
21874 + .ds = __KERNEL_DS,
21875 .fs = __KERNEL_PERCPU,
21876
21877 .__cr3 = __pa_nodebug(swapper_pg_dir),
21878 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21879 index b74ebc7..2c95874 100644
21880 --- a/arch/x86/kernel/dumpstack.c
21881 +++ b/arch/x86/kernel/dumpstack.c
21882 @@ -2,6 +2,9 @@
21883 * Copyright (C) 1991, 1992 Linus Torvalds
21884 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21885 */
21886 +#ifdef CONFIG_GRKERNSEC_HIDESYM
21887 +#define __INCLUDED_BY_HIDESYM 1
21888 +#endif
21889 #include <linux/kallsyms.h>
21890 #include <linux/kprobes.h>
21891 #include <linux/uaccess.h>
21892 @@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21893
21894 void printk_address(unsigned long address)
21895 {
21896 - pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21897 + pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21898 }
21899
21900 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21901 static void
21902 print_ftrace_graph_addr(unsigned long addr, void *data,
21903 const struct stacktrace_ops *ops,
21904 - struct thread_info *tinfo, int *graph)
21905 + struct task_struct *task, int *graph)
21906 {
21907 - struct task_struct *task;
21908 unsigned long ret_addr;
21909 int index;
21910
21911 if (addr != (unsigned long)return_to_handler)
21912 return;
21913
21914 - task = tinfo->task;
21915 index = task->curr_ret_stack;
21916
21917 if (!task->ret_stack || index < *graph)
21918 @@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21919 static inline void
21920 print_ftrace_graph_addr(unsigned long addr, void *data,
21921 const struct stacktrace_ops *ops,
21922 - struct thread_info *tinfo, int *graph)
21923 + struct task_struct *task, int *graph)
21924 { }
21925 #endif
21926
21927 @@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21928 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21929 */
21930
21931 -static inline int valid_stack_ptr(struct thread_info *tinfo,
21932 - void *p, unsigned int size, void *end)
21933 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21934 {
21935 - void *t = tinfo;
21936 if (end) {
21937 if (p < end && p >= (end-THREAD_SIZE))
21938 return 1;
21939 @@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21940 }
21941
21942 unsigned long
21943 -print_context_stack(struct thread_info *tinfo,
21944 +print_context_stack(struct task_struct *task, void *stack_start,
21945 unsigned long *stack, unsigned long bp,
21946 const struct stacktrace_ops *ops, void *data,
21947 unsigned long *end, int *graph)
21948 {
21949 struct stack_frame *frame = (struct stack_frame *)bp;
21950
21951 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21952 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21953 unsigned long addr;
21954
21955 addr = *stack;
21956 @@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21957 } else {
21958 ops->address(data, addr, 0);
21959 }
21960 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21961 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21962 }
21963 stack++;
21964 }
21965 @@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21966 EXPORT_SYMBOL_GPL(print_context_stack);
21967
21968 unsigned long
21969 -print_context_stack_bp(struct thread_info *tinfo,
21970 +print_context_stack_bp(struct task_struct *task, void *stack_start,
21971 unsigned long *stack, unsigned long bp,
21972 const struct stacktrace_ops *ops, void *data,
21973 unsigned long *end, int *graph)
21974 @@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21975 struct stack_frame *frame = (struct stack_frame *)bp;
21976 unsigned long *ret_addr = &frame->return_address;
21977
21978 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21979 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21980 unsigned long addr = *ret_addr;
21981
21982 if (!__kernel_text_address(addr))
21983 @@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21984 ops->address(data, addr, 1);
21985 frame = frame->next_frame;
21986 ret_addr = &frame->return_address;
21987 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21988 + print_ftrace_graph_addr(addr, data, ops, task, graph);
21989 }
21990
21991 return (unsigned long)frame;
21992 @@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21993 static void print_trace_address(void *data, unsigned long addr, int reliable)
21994 {
21995 touch_nmi_watchdog();
21996 - printk(data);
21997 + printk("%s", (char *)data);
21998 printk_stack_address(addr, reliable);
21999 }
22000
22001 @@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22002 EXPORT_SYMBOL_GPL(oops_begin);
22003 NOKPROBE_SYMBOL(oops_begin);
22004
22005 +extern void gr_handle_kernel_exploit(void);
22006 +
22007 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22008 {
22009 if (regs && kexec_should_crash(current))
22010 @@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22011 panic("Fatal exception in interrupt");
22012 if (panic_on_oops)
22013 panic("Fatal exception");
22014 - do_exit(signr);
22015 +
22016 + gr_handle_kernel_exploit();
22017 +
22018 + do_group_exit(signr);
22019 }
22020 NOKPROBE_SYMBOL(oops_end);
22021
22022 @@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22023 print_modules();
22024 show_regs(regs);
22025 #ifdef CONFIG_X86_32
22026 - if (user_mode_vm(regs)) {
22027 + if (user_mode(regs)) {
22028 sp = regs->sp;
22029 ss = regs->ss & 0xffff;
22030 } else {
22031 @@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22032 unsigned long flags = oops_begin();
22033 int sig = SIGSEGV;
22034
22035 - if (!user_mode_vm(regs))
22036 + if (!user_mode(regs))
22037 report_bug(regs->ip, regs);
22038
22039 if (__die(str, regs, err))
22040 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22041 index 5abd4cd..c65733b 100644
22042 --- a/arch/x86/kernel/dumpstack_32.c
22043 +++ b/arch/x86/kernel/dumpstack_32.c
22044 @@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22045 bp = stack_frame(task, regs);
22046
22047 for (;;) {
22048 - struct thread_info *context;
22049 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22050 void *end_stack;
22051
22052 end_stack = is_hardirq_stack(stack, cpu);
22053 if (!end_stack)
22054 end_stack = is_softirq_stack(stack, cpu);
22055
22056 - context = task_thread_info(task);
22057 - bp = ops->walk_stack(context, stack, bp, ops, data,
22058 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22059 end_stack, &graph);
22060
22061 /* Stop if not on irq stack */
22062 @@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22063 int i;
22064
22065 show_regs_print_info(KERN_EMERG);
22066 - __show_regs(regs, !user_mode_vm(regs));
22067 + __show_regs(regs, !user_mode(regs));
22068
22069 /*
22070 * When in-kernel, we also print out the stack and code at the
22071 * time of the fault..
22072 */
22073 - if (!user_mode_vm(regs)) {
22074 + if (!user_mode(regs)) {
22075 unsigned int code_prologue = code_bytes * 43 / 64;
22076 unsigned int code_len = code_bytes;
22077 unsigned char c;
22078 u8 *ip;
22079 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22080
22081 pr_emerg("Stack:\n");
22082 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22083
22084 pr_emerg("Code:");
22085
22086 - ip = (u8 *)regs->ip - code_prologue;
22087 + ip = (u8 *)regs->ip - code_prologue + cs_base;
22088 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22089 /* try starting at IP */
22090 - ip = (u8 *)regs->ip;
22091 + ip = (u8 *)regs->ip + cs_base;
22092 code_len = code_len - code_prologue + 1;
22093 }
22094 for (i = 0; i < code_len; i++, ip++) {
22095 @@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22096 pr_cont(" Bad EIP value.");
22097 break;
22098 }
22099 - if (ip == (u8 *)regs->ip)
22100 + if (ip == (u8 *)regs->ip + cs_base)
22101 pr_cont(" <%02x>", c);
22102 else
22103 pr_cont(" %02x", c);
22104 @@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22105 {
22106 unsigned short ud2;
22107
22108 + ip = ktla_ktva(ip);
22109 if (ip < PAGE_OFFSET)
22110 return 0;
22111 if (probe_kernel_address((unsigned short *)ip, ud2))
22112 @@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22113
22114 return ud2 == 0x0b0f;
22115 }
22116 +
22117 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22118 +void pax_check_alloca(unsigned long size)
22119 +{
22120 + unsigned long sp = (unsigned long)&sp, stack_left;
22121 +
22122 + /* all kernel stacks are of the same size */
22123 + stack_left = sp & (THREAD_SIZE - 1);
22124 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22125 +}
22126 +EXPORT_SYMBOL(pax_check_alloca);
22127 +#endif
22128 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22129 index ff86f19..a20c62c 100644
22130 --- a/arch/x86/kernel/dumpstack_64.c
22131 +++ b/arch/x86/kernel/dumpstack_64.c
22132 @@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22133 const struct stacktrace_ops *ops, void *data)
22134 {
22135 const unsigned cpu = get_cpu();
22136 - struct thread_info *tinfo;
22137 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22138 unsigned long dummy;
22139 unsigned used = 0;
22140 int graph = 0;
22141 int done = 0;
22142 + void *stack_start;
22143
22144 if (!task)
22145 task = current;
22146 @@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22147 * current stack address. If the stacks consist of nested
22148 * exceptions
22149 */
22150 - tinfo = task_thread_info(task);
22151 while (!done) {
22152 unsigned long *stack_end;
22153 enum stack_type stype;
22154 @@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22155 if (ops->stack(data, id) < 0)
22156 break;
22157
22158 - bp = ops->walk_stack(tinfo, stack, bp, ops,
22159 + bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22160 data, stack_end, &graph);
22161 ops->stack(data, "<EOE>");
22162 /*
22163 @@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22164 * second-to-last pointer (index -2 to end) in the
22165 * exception stack:
22166 */
22167 + if ((u16)stack_end[-1] != __KERNEL_DS)
22168 + goto out;
22169 stack = (unsigned long *) stack_end[-2];
22170 done = 0;
22171 break;
22172 @@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22173
22174 if (ops->stack(data, "IRQ") < 0)
22175 break;
22176 - bp = ops->walk_stack(tinfo, stack, bp,
22177 + bp = ops->walk_stack(task, irq_stack, stack, bp,
22178 ops, data, stack_end, &graph);
22179 /*
22180 * We link to the next stack (which would be
22181 @@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22182 /*
22183 * This handles the process stack:
22184 */
22185 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22186 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22187 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22188 +out:
22189 put_cpu();
22190 }
22191 EXPORT_SYMBOL(dump_trace);
22192 @@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22193
22194 return ud2 == 0x0b0f;
22195 }
22196 +
22197 +#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22198 +void pax_check_alloca(unsigned long size)
22199 +{
22200 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22201 + unsigned cpu, used;
22202 + char *id;
22203 +
22204 + /* check the process stack first */
22205 + stack_start = (unsigned long)task_stack_page(current);
22206 + stack_end = stack_start + THREAD_SIZE;
22207 + if (likely(stack_start <= sp && sp < stack_end)) {
22208 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
22209 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22210 + return;
22211 + }
22212 +
22213 + cpu = get_cpu();
22214 +
22215 + /* check the irq stacks */
22216 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22217 + stack_start = stack_end - IRQ_STACK_SIZE;
22218 + if (stack_start <= sp && sp < stack_end) {
22219 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22220 + put_cpu();
22221 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22222 + return;
22223 + }
22224 +
22225 + /* check the exception stacks */
22226 + used = 0;
22227 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22228 + stack_start = stack_end - EXCEPTION_STKSZ;
22229 + if (stack_end && stack_start <= sp && sp < stack_end) {
22230 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22231 + put_cpu();
22232 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
22233 + return;
22234 + }
22235 +
22236 + put_cpu();
22237 +
22238 + /* unknown stack */
22239 + BUG();
22240 +}
22241 +EXPORT_SYMBOL(pax_check_alloca);
22242 +#endif
22243 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22244 index 49f8864..1cc6d07 100644
22245 --- a/arch/x86/kernel/e820.c
22246 +++ b/arch/x86/kernel/e820.c
22247 @@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22248
22249 static void early_panic(char *msg)
22250 {
22251 - early_printk(msg);
22252 - panic(msg);
22253 + early_printk("%s", msg);
22254 + panic("%s", msg);
22255 }
22256
22257 static int userdef __initdata;
22258 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22259 index 01d1c18..8073693 100644
22260 --- a/arch/x86/kernel/early_printk.c
22261 +++ b/arch/x86/kernel/early_printk.c
22262 @@ -7,6 +7,7 @@
22263 #include <linux/pci_regs.h>
22264 #include <linux/pci_ids.h>
22265 #include <linux/errno.h>
22266 +#include <linux/sched.h>
22267 #include <asm/io.h>
22268 #include <asm/processor.h>
22269 #include <asm/fcntl.h>
22270 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22271 index 344b63f..55adf14 100644
22272 --- a/arch/x86/kernel/entry_32.S
22273 +++ b/arch/x86/kernel/entry_32.S
22274 @@ -177,13 +177,154 @@
22275 /*CFI_REL_OFFSET gs, PT_GS*/
22276 .endm
22277 .macro SET_KERNEL_GS reg
22278 +
22279 +#ifdef CONFIG_CC_STACKPROTECTOR
22280 movl $(__KERNEL_STACK_CANARY), \reg
22281 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22282 + movl $(__USER_DS), \reg
22283 +#else
22284 + xorl \reg, \reg
22285 +#endif
22286 +
22287 movl \reg, %gs
22288 .endm
22289
22290 #endif /* CONFIG_X86_32_LAZY_GS */
22291
22292 -.macro SAVE_ALL
22293 +.macro pax_enter_kernel
22294 +#ifdef CONFIG_PAX_KERNEXEC
22295 + call pax_enter_kernel
22296 +#endif
22297 +.endm
22298 +
22299 +.macro pax_exit_kernel
22300 +#ifdef CONFIG_PAX_KERNEXEC
22301 + call pax_exit_kernel
22302 +#endif
22303 +.endm
22304 +
22305 +#ifdef CONFIG_PAX_KERNEXEC
22306 +ENTRY(pax_enter_kernel)
22307 +#ifdef CONFIG_PARAVIRT
22308 + pushl %eax
22309 + pushl %ecx
22310 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22311 + mov %eax, %esi
22312 +#else
22313 + mov %cr0, %esi
22314 +#endif
22315 + bts $16, %esi
22316 + jnc 1f
22317 + mov %cs, %esi
22318 + cmp $__KERNEL_CS, %esi
22319 + jz 3f
22320 + ljmp $__KERNEL_CS, $3f
22321 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22322 +2:
22323 +#ifdef CONFIG_PARAVIRT
22324 + mov %esi, %eax
22325 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22326 +#else
22327 + mov %esi, %cr0
22328 +#endif
22329 +3:
22330 +#ifdef CONFIG_PARAVIRT
22331 + popl %ecx
22332 + popl %eax
22333 +#endif
22334 + ret
22335 +ENDPROC(pax_enter_kernel)
22336 +
22337 +ENTRY(pax_exit_kernel)
22338 +#ifdef CONFIG_PARAVIRT
22339 + pushl %eax
22340 + pushl %ecx
22341 +#endif
22342 + mov %cs, %esi
22343 + cmp $__KERNEXEC_KERNEL_CS, %esi
22344 + jnz 2f
22345 +#ifdef CONFIG_PARAVIRT
22346 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22347 + mov %eax, %esi
22348 +#else
22349 + mov %cr0, %esi
22350 +#endif
22351 + btr $16, %esi
22352 + ljmp $__KERNEL_CS, $1f
22353 +1:
22354 +#ifdef CONFIG_PARAVIRT
22355 + mov %esi, %eax
22356 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22357 +#else
22358 + mov %esi, %cr0
22359 +#endif
22360 +2:
22361 +#ifdef CONFIG_PARAVIRT
22362 + popl %ecx
22363 + popl %eax
22364 +#endif
22365 + ret
22366 +ENDPROC(pax_exit_kernel)
22367 +#endif
22368 +
22369 + .macro pax_erase_kstack
22370 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22371 + call pax_erase_kstack
22372 +#endif
22373 + .endm
22374 +
22375 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22376 +/*
22377 + * ebp: thread_info
22378 + */
22379 +ENTRY(pax_erase_kstack)
22380 + pushl %edi
22381 + pushl %ecx
22382 + pushl %eax
22383 +
22384 + mov TI_lowest_stack(%ebp), %edi
22385 + mov $-0xBEEF, %eax
22386 + std
22387 +
22388 +1: mov %edi, %ecx
22389 + and $THREAD_SIZE_asm - 1, %ecx
22390 + shr $2, %ecx
22391 + repne scasl
22392 + jecxz 2f
22393 +
22394 + cmp $2*16, %ecx
22395 + jc 2f
22396 +
22397 + mov $2*16, %ecx
22398 + repe scasl
22399 + jecxz 2f
22400 + jne 1b
22401 +
22402 +2: cld
22403 + or $2*4, %edi
22404 + mov %esp, %ecx
22405 + sub %edi, %ecx
22406 +
22407 + cmp $THREAD_SIZE_asm, %ecx
22408 + jb 3f
22409 + ud2
22410 +3:
22411 +
22412 + shr $2, %ecx
22413 + rep stosl
22414 +
22415 + mov TI_task_thread_sp0(%ebp), %edi
22416 + sub $128, %edi
22417 + mov %edi, TI_lowest_stack(%ebp)
22418 +
22419 + popl %eax
22420 + popl %ecx
22421 + popl %edi
22422 + ret
22423 +ENDPROC(pax_erase_kstack)
22424 +#endif
22425 +
22426 +.macro __SAVE_ALL _DS
22427 cld
22428 PUSH_GS
22429 pushl_cfi %fs
22430 @@ -206,7 +347,7 @@
22431 CFI_REL_OFFSET ecx, 0
22432 pushl_cfi %ebx
22433 CFI_REL_OFFSET ebx, 0
22434 - movl $(__USER_DS), %edx
22435 + movl $\_DS, %edx
22436 movl %edx, %ds
22437 movl %edx, %es
22438 movl $(__KERNEL_PERCPU), %edx
22439 @@ -214,6 +355,15 @@
22440 SET_KERNEL_GS %edx
22441 .endm
22442
22443 +.macro SAVE_ALL
22444 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22445 + __SAVE_ALL __KERNEL_DS
22446 + pax_enter_kernel
22447 +#else
22448 + __SAVE_ALL __USER_DS
22449 +#endif
22450 +.endm
22451 +
22452 .macro RESTORE_INT_REGS
22453 popl_cfi %ebx
22454 CFI_RESTORE ebx
22455 @@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22456 popfl_cfi
22457 jmp syscall_exit
22458 CFI_ENDPROC
22459 -END(ret_from_fork)
22460 +ENDPROC(ret_from_fork)
22461
22462 ENTRY(ret_from_kernel_thread)
22463 CFI_STARTPROC
22464 @@ -340,7 +490,15 @@ ret_from_intr:
22465 andl $SEGMENT_RPL_MASK, %eax
22466 #endif
22467 cmpl $USER_RPL, %eax
22468 +
22469 +#ifdef CONFIG_PAX_KERNEXEC
22470 + jae resume_userspace
22471 +
22472 + pax_exit_kernel
22473 + jmp resume_kernel
22474 +#else
22475 jb resume_kernel # not returning to v8086 or userspace
22476 +#endif
22477
22478 ENTRY(resume_userspace)
22479 LOCKDEP_SYS_EXIT
22480 @@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22481 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22482 # int/exception return?
22483 jne work_pending
22484 - jmp restore_all
22485 -END(ret_from_exception)
22486 + jmp restore_all_pax
22487 +ENDPROC(ret_from_exception)
22488
22489 #ifdef CONFIG_PREEMPT
22490 ENTRY(resume_kernel)
22491 @@ -365,7 +523,7 @@ need_resched:
22492 jz restore_all
22493 call preempt_schedule_irq
22494 jmp need_resched
22495 -END(resume_kernel)
22496 +ENDPROC(resume_kernel)
22497 #endif
22498 CFI_ENDPROC
22499
22500 @@ -395,30 +553,45 @@ sysenter_past_esp:
22501 /*CFI_REL_OFFSET cs, 0*/
22502 /*
22503 * Push current_thread_info()->sysenter_return to the stack.
22504 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22505 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
22506 */
22507 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22508 + pushl_cfi $0
22509 CFI_REL_OFFSET eip, 0
22510
22511 pushl_cfi %eax
22512 SAVE_ALL
22513 + GET_THREAD_INFO(%ebp)
22514 + movl TI_sysenter_return(%ebp),%ebp
22515 + movl %ebp,PT_EIP(%esp)
22516 ENABLE_INTERRUPTS(CLBR_NONE)
22517
22518 /*
22519 * Load the potential sixth argument from user stack.
22520 * Careful about security.
22521 */
22522 + movl PT_OLDESP(%esp),%ebp
22523 +
22524 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22525 + mov PT_OLDSS(%esp),%ds
22526 +1: movl %ds:(%ebp),%ebp
22527 + push %ss
22528 + pop %ds
22529 +#else
22530 cmpl $__PAGE_OFFSET-3,%ebp
22531 jae syscall_fault
22532 ASM_STAC
22533 1: movl (%ebp),%ebp
22534 ASM_CLAC
22535 +#endif
22536 +
22537 movl %ebp,PT_EBP(%esp)
22538 _ASM_EXTABLE(1b,syscall_fault)
22539
22540 GET_THREAD_INFO(%ebp)
22541
22542 +#ifdef CONFIG_PAX_RANDKSTACK
22543 + pax_erase_kstack
22544 +#endif
22545 +
22546 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22547 jnz sysenter_audit
22548 sysenter_do_call:
22549 @@ -434,12 +607,24 @@ sysenter_after_call:
22550 testl $_TIF_ALLWORK_MASK, %ecx
22551 jne sysexit_audit
22552 sysenter_exit:
22553 +
22554 +#ifdef CONFIG_PAX_RANDKSTACK
22555 + pushl_cfi %eax
22556 + movl %esp, %eax
22557 + call pax_randomize_kstack
22558 + popl_cfi %eax
22559 +#endif
22560 +
22561 + pax_erase_kstack
22562 +
22563 /* if something modifies registers it must also disable sysexit */
22564 movl PT_EIP(%esp), %edx
22565 movl PT_OLDESP(%esp), %ecx
22566 xorl %ebp,%ebp
22567 TRACE_IRQS_ON
22568 1: mov PT_FS(%esp), %fs
22569 +2: mov PT_DS(%esp), %ds
22570 +3: mov PT_ES(%esp), %es
22571 PTGS_TO_GS
22572 ENABLE_INTERRUPTS_SYSEXIT
22573
22574 @@ -453,6 +638,9 @@ sysenter_audit:
22575 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22576 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22577 call __audit_syscall_entry
22578 +
22579 + pax_erase_kstack
22580 +
22581 popl_cfi %ecx /* get that remapped edx off the stack */
22582 popl_cfi %ecx /* get that remapped esi off the stack */
22583 movl PT_EAX(%esp),%eax /* reload syscall number */
22584 @@ -479,10 +667,16 @@ sysexit_audit:
22585
22586 CFI_ENDPROC
22587 .pushsection .fixup,"ax"
22588 -2: movl $0,PT_FS(%esp)
22589 +4: movl $0,PT_FS(%esp)
22590 + jmp 1b
22591 +5: movl $0,PT_DS(%esp)
22592 + jmp 1b
22593 +6: movl $0,PT_ES(%esp)
22594 jmp 1b
22595 .popsection
22596 - _ASM_EXTABLE(1b,2b)
22597 + _ASM_EXTABLE(1b,4b)
22598 + _ASM_EXTABLE(2b,5b)
22599 + _ASM_EXTABLE(3b,6b)
22600 PTGS_TO_GS_EX
22601 ENDPROC(ia32_sysenter_target)
22602
22603 @@ -493,6 +687,11 @@ ENTRY(system_call)
22604 pushl_cfi %eax # save orig_eax
22605 SAVE_ALL
22606 GET_THREAD_INFO(%ebp)
22607 +
22608 +#ifdef CONFIG_PAX_RANDKSTACK
22609 + pax_erase_kstack
22610 +#endif
22611 +
22612 # system call tracing in operation / emulation
22613 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22614 jnz syscall_trace_entry
22615 @@ -512,6 +711,15 @@ syscall_exit:
22616 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22617 jne syscall_exit_work
22618
22619 +restore_all_pax:
22620 +
22621 +#ifdef CONFIG_PAX_RANDKSTACK
22622 + movl %esp, %eax
22623 + call pax_randomize_kstack
22624 +#endif
22625 +
22626 + pax_erase_kstack
22627 +
22628 restore_all:
22629 TRACE_IRQS_IRET
22630 restore_all_notrace:
22631 @@ -566,14 +774,34 @@ ldt_ss:
22632 * compensating for the offset by changing to the ESPFIX segment with
22633 * a base address that matches for the difference.
22634 */
22635 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22636 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22637 mov %esp, %edx /* load kernel esp */
22638 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22639 mov %dx, %ax /* eax: new kernel esp */
22640 sub %eax, %edx /* offset (low word is 0) */
22641 +#ifdef CONFIG_SMP
22642 + movl PER_CPU_VAR(cpu_number), %ebx
22643 + shll $PAGE_SHIFT_asm, %ebx
22644 + addl $cpu_gdt_table, %ebx
22645 +#else
22646 + movl $cpu_gdt_table, %ebx
22647 +#endif
22648 shr $16, %edx
22649 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22650 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22651 +
22652 +#ifdef CONFIG_PAX_KERNEXEC
22653 + mov %cr0, %esi
22654 + btr $16, %esi
22655 + mov %esi, %cr0
22656 +#endif
22657 +
22658 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22659 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22660 +
22661 +#ifdef CONFIG_PAX_KERNEXEC
22662 + bts $16, %esi
22663 + mov %esi, %cr0
22664 +#endif
22665 +
22666 pushl_cfi $__ESPFIX_SS
22667 pushl_cfi %eax /* new kernel esp */
22668 /* Disable interrupts, but do not irqtrace this section: we
22669 @@ -603,20 +831,18 @@ work_resched:
22670 movl TI_flags(%ebp), %ecx
22671 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22672 # than syscall tracing?
22673 - jz restore_all
22674 + jz restore_all_pax
22675 testb $_TIF_NEED_RESCHED, %cl
22676 jnz work_resched
22677
22678 work_notifysig: # deal with pending signals and
22679 # notify-resume requests
22680 + movl %esp, %eax
22681 #ifdef CONFIG_VM86
22682 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22683 - movl %esp, %eax
22684 jne work_notifysig_v86 # returning to kernel-space or
22685 # vm86-space
22686 1:
22687 -#else
22688 - movl %esp, %eax
22689 #endif
22690 TRACE_IRQS_ON
22691 ENABLE_INTERRUPTS(CLBR_NONE)
22692 @@ -637,7 +863,7 @@ work_notifysig_v86:
22693 movl %eax, %esp
22694 jmp 1b
22695 #endif
22696 -END(work_pending)
22697 +ENDPROC(work_pending)
22698
22699 # perform syscall exit tracing
22700 ALIGN
22701 @@ -645,11 +871,14 @@ syscall_trace_entry:
22702 movl $-ENOSYS,PT_EAX(%esp)
22703 movl %esp, %eax
22704 call syscall_trace_enter
22705 +
22706 + pax_erase_kstack
22707 +
22708 /* What it returned is what we'll actually use. */
22709 cmpl $(NR_syscalls), %eax
22710 jnae syscall_call
22711 jmp syscall_exit
22712 -END(syscall_trace_entry)
22713 +ENDPROC(syscall_trace_entry)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717 @@ -662,26 +891,30 @@ syscall_exit_work:
22718 movl %esp, %eax
22719 call syscall_trace_leave
22720 jmp resume_userspace
22721 -END(syscall_exit_work)
22722 +ENDPROC(syscall_exit_work)
22723 CFI_ENDPROC
22724
22725 RING0_INT_FRAME # can't unwind into user space anyway
22726 syscall_fault:
22727 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22728 + push %ss
22729 + pop %ds
22730 +#endif
22731 ASM_CLAC
22732 GET_THREAD_INFO(%ebp)
22733 movl $-EFAULT,PT_EAX(%esp)
22734 jmp resume_userspace
22735 -END(syscall_fault)
22736 +ENDPROC(syscall_fault)
22737
22738 syscall_badsys:
22739 movl $-ENOSYS,%eax
22740 jmp syscall_after_call
22741 -END(syscall_badsys)
22742 +ENDPROC(syscall_badsys)
22743
22744 sysenter_badsys:
22745 movl $-ENOSYS,%eax
22746 jmp sysenter_after_call
22747 -END(sysenter_badsys)
22748 +ENDPROC(sysenter_badsys)
22749 CFI_ENDPROC
22750
22751 .macro FIXUP_ESPFIX_STACK
22752 @@ -694,8 +927,15 @@ END(sysenter_badsys)
22753 */
22754 #ifdef CONFIG_X86_ESPFIX32
22755 /* fixup the stack */
22756 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22757 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22758 +#ifdef CONFIG_SMP
22759 + movl PER_CPU_VAR(cpu_number), %ebx
22760 + shll $PAGE_SHIFT_asm, %ebx
22761 + addl $cpu_gdt_table, %ebx
22762 +#else
22763 + movl $cpu_gdt_table, %ebx
22764 +#endif
22765 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22766 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22767 shl $16, %eax
22768 addl %esp, %eax /* the adjusted stack pointer */
22769 pushl_cfi $__KERNEL_DS
22770 @@ -751,7 +991,7 @@ vector=vector+1
22771 .endr
22772 2: jmp common_interrupt
22773 .endr
22774 -END(irq_entries_start)
22775 +ENDPROC(irq_entries_start)
22776
22777 .previous
22778 END(interrupt)
22779 @@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22780 pushl_cfi $do_coprocessor_error
22781 jmp error_code
22782 CFI_ENDPROC
22783 -END(coprocessor_error)
22784 +ENDPROC(coprocessor_error)
22785
22786 ENTRY(simd_coprocessor_error)
22787 RING0_INT_FRAME
22788 @@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22789 .section .altinstructions,"a"
22790 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22791 .previous
22792 -.section .altinstr_replacement,"ax"
22793 +.section .altinstr_replacement,"a"
22794 663: pushl $do_simd_coprocessor_error
22795 664:
22796 .previous
22797 @@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22798 #endif
22799 jmp error_code
22800 CFI_ENDPROC
22801 -END(simd_coprocessor_error)
22802 +ENDPROC(simd_coprocessor_error)
22803
22804 ENTRY(device_not_available)
22805 RING0_INT_FRAME
22806 @@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22807 pushl_cfi $do_device_not_available
22808 jmp error_code
22809 CFI_ENDPROC
22810 -END(device_not_available)
22811 +ENDPROC(device_not_available)
22812
22813 #ifdef CONFIG_PARAVIRT
22814 ENTRY(native_iret)
22815 iret
22816 _ASM_EXTABLE(native_iret, iret_exc)
22817 -END(native_iret)
22818 +ENDPROC(native_iret)
22819
22820 ENTRY(native_irq_enable_sysexit)
22821 sti
22822 sysexit
22823 -END(native_irq_enable_sysexit)
22824 +ENDPROC(native_irq_enable_sysexit)
22825 #endif
22826
22827 ENTRY(overflow)
22828 @@ -860,7 +1100,7 @@ ENTRY(overflow)
22829 pushl_cfi $do_overflow
22830 jmp error_code
22831 CFI_ENDPROC
22832 -END(overflow)
22833 +ENDPROC(overflow)
22834
22835 ENTRY(bounds)
22836 RING0_INT_FRAME
22837 @@ -869,7 +1109,7 @@ ENTRY(bounds)
22838 pushl_cfi $do_bounds
22839 jmp error_code
22840 CFI_ENDPROC
22841 -END(bounds)
22842 +ENDPROC(bounds)
22843
22844 ENTRY(invalid_op)
22845 RING0_INT_FRAME
22846 @@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22847 pushl_cfi $do_invalid_op
22848 jmp error_code
22849 CFI_ENDPROC
22850 -END(invalid_op)
22851 +ENDPROC(invalid_op)
22852
22853 ENTRY(coprocessor_segment_overrun)
22854 RING0_INT_FRAME
22855 @@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22856 pushl_cfi $do_coprocessor_segment_overrun
22857 jmp error_code
22858 CFI_ENDPROC
22859 -END(coprocessor_segment_overrun)
22860 +ENDPROC(coprocessor_segment_overrun)
22861
22862 ENTRY(invalid_TSS)
22863 RING0_EC_FRAME
22864 @@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22865 pushl_cfi $do_invalid_TSS
22866 jmp error_code
22867 CFI_ENDPROC
22868 -END(invalid_TSS)
22869 +ENDPROC(invalid_TSS)
22870
22871 ENTRY(segment_not_present)
22872 RING0_EC_FRAME
22873 @@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22874 pushl_cfi $do_segment_not_present
22875 jmp error_code
22876 CFI_ENDPROC
22877 -END(segment_not_present)
22878 +ENDPROC(segment_not_present)
22879
22880 ENTRY(stack_segment)
22881 RING0_EC_FRAME
22882 @@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22883 pushl_cfi $do_stack_segment
22884 jmp error_code
22885 CFI_ENDPROC
22886 -END(stack_segment)
22887 +ENDPROC(stack_segment)
22888
22889 ENTRY(alignment_check)
22890 RING0_EC_FRAME
22891 @@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22892 pushl_cfi $do_alignment_check
22893 jmp error_code
22894 CFI_ENDPROC
22895 -END(alignment_check)
22896 +ENDPROC(alignment_check)
22897
22898 ENTRY(divide_error)
22899 RING0_INT_FRAME
22900 @@ -928,7 +1168,7 @@ ENTRY(divide_error)
22901 pushl_cfi $do_divide_error
22902 jmp error_code
22903 CFI_ENDPROC
22904 -END(divide_error)
22905 +ENDPROC(divide_error)
22906
22907 #ifdef CONFIG_X86_MCE
22908 ENTRY(machine_check)
22909 @@ -938,7 +1178,7 @@ ENTRY(machine_check)
22910 pushl_cfi machine_check_vector
22911 jmp error_code
22912 CFI_ENDPROC
22913 -END(machine_check)
22914 +ENDPROC(machine_check)
22915 #endif
22916
22917 ENTRY(spurious_interrupt_bug)
22918 @@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22919 pushl_cfi $do_spurious_interrupt_bug
22920 jmp error_code
22921 CFI_ENDPROC
22922 -END(spurious_interrupt_bug)
22923 +ENDPROC(spurious_interrupt_bug)
22924
22925 #ifdef CONFIG_XEN
22926 /* Xen doesn't set %esp to be precisely what the normal sysenter
22927 @@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22928
22929 ENTRY(mcount)
22930 ret
22931 -END(mcount)
22932 +ENDPROC(mcount)
22933
22934 ENTRY(ftrace_caller)
22935 pushl %eax
22936 @@ -1084,7 +1324,7 @@ ftrace_graph_call:
22937 .globl ftrace_stub
22938 ftrace_stub:
22939 ret
22940 -END(ftrace_caller)
22941 +ENDPROC(ftrace_caller)
22942
22943 ENTRY(ftrace_regs_caller)
22944 pushf /* push flags before compare (in cs location) */
22945 @@ -1182,7 +1422,7 @@ trace:
22946 popl %ecx
22947 popl %eax
22948 jmp ftrace_stub
22949 -END(mcount)
22950 +ENDPROC(mcount)
22951 #endif /* CONFIG_DYNAMIC_FTRACE */
22952 #endif /* CONFIG_FUNCTION_TRACER */
22953
22954 @@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
22955 popl %ecx
22956 popl %eax
22957 ret
22958 -END(ftrace_graph_caller)
22959 +ENDPROC(ftrace_graph_caller)
22960
22961 .globl return_to_handler
22962 return_to_handler:
22963 @@ -1261,15 +1501,18 @@ error_code:
22964 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22965 REG_TO_PTGS %ecx
22966 SET_KERNEL_GS %ecx
22967 - movl $(__USER_DS), %ecx
22968 + movl $(__KERNEL_DS), %ecx
22969 movl %ecx, %ds
22970 movl %ecx, %es
22971 +
22972 + pax_enter_kernel
22973 +
22974 TRACE_IRQS_OFF
22975 movl %esp,%eax # pt_regs pointer
22976 call *%edi
22977 jmp ret_from_exception
22978 CFI_ENDPROC
22979 -END(page_fault)
22980 +ENDPROC(page_fault)
22981
22982 /*
22983 * Debug traps and NMI can happen at the one SYSENTER instruction
22984 @@ -1312,7 +1555,7 @@ debug_stack_correct:
22985 call do_debug
22986 jmp ret_from_exception
22987 CFI_ENDPROC
22988 -END(debug)
22989 +ENDPROC(debug)
22990
22991 /*
22992 * NMI is doubly nasty. It can happen _while_ we're handling
22993 @@ -1352,6 +1595,9 @@ nmi_stack_correct:
22994 xorl %edx,%edx # zero error code
22995 movl %esp,%eax # pt_regs pointer
22996 call do_nmi
22997 +
22998 + pax_exit_kernel
22999 +
23000 jmp restore_all_notrace
23001 CFI_ENDPROC
23002
23003 @@ -1389,13 +1635,16 @@ nmi_espfix_stack:
23004 FIXUP_ESPFIX_STACK # %eax == %esp
23005 xorl %edx,%edx # zero error code
23006 call do_nmi
23007 +
23008 + pax_exit_kernel
23009 +
23010 RESTORE_REGS
23011 lss 12+4(%esp), %esp # back to espfix stack
23012 CFI_ADJUST_CFA_OFFSET -24
23013 jmp irq_return
23014 #endif
23015 CFI_ENDPROC
23016 -END(nmi)
23017 +ENDPROC(nmi)
23018
23019 ENTRY(int3)
23020 RING0_INT_FRAME
23021 @@ -1408,14 +1657,14 @@ ENTRY(int3)
23022 call do_int3
23023 jmp ret_from_exception
23024 CFI_ENDPROC
23025 -END(int3)
23026 +ENDPROC(int3)
23027
23028 ENTRY(general_protection)
23029 RING0_EC_FRAME
23030 pushl_cfi $do_general_protection
23031 jmp error_code
23032 CFI_ENDPROC
23033 -END(general_protection)
23034 +ENDPROC(general_protection)
23035
23036 #ifdef CONFIG_KVM_GUEST
23037 ENTRY(async_page_fault)
23038 @@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
23039 pushl_cfi $do_async_page_fault
23040 jmp error_code
23041 CFI_ENDPROC
23042 -END(async_page_fault)
23043 +ENDPROC(async_page_fault)
23044 #endif
23045
23046 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23047 index c0226ab..0d1dc48 100644
23048 --- a/arch/x86/kernel/entry_64.S
23049 +++ b/arch/x86/kernel/entry_64.S
23050 @@ -59,6 +59,8 @@
23051 #include <asm/smap.h>
23052 #include <asm/pgtable_types.h>
23053 #include <linux/err.h>
23054 +#include <asm/pgtable.h>
23055 +#include <asm/alternative-asm.h>
23056
23057 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23058 #include <linux/elf-em.h>
23059 @@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23060 ENDPROC(native_usergs_sysret64)
23061 #endif /* CONFIG_PARAVIRT */
23062
23063 + .macro ljmpq sel, off
23064 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23065 + .byte 0x48; ljmp *1234f(%rip)
23066 + .pushsection .rodata
23067 + .align 16
23068 + 1234: .quad \off; .word \sel
23069 + .popsection
23070 +#else
23071 + pushq $\sel
23072 + pushq $\off
23073 + lretq
23074 +#endif
23075 + .endm
23076 +
23077 + .macro pax_enter_kernel
23078 + pax_set_fptr_mask
23079 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23080 + call pax_enter_kernel
23081 +#endif
23082 + .endm
23083 +
23084 + .macro pax_exit_kernel
23085 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23086 + call pax_exit_kernel
23087 +#endif
23088 +
23089 + .endm
23090 +
23091 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23092 +ENTRY(pax_enter_kernel)
23093 + pushq %rdi
23094 +
23095 +#ifdef CONFIG_PARAVIRT
23096 + PV_SAVE_REGS(CLBR_RDI)
23097 +#endif
23098 +
23099 +#ifdef CONFIG_PAX_KERNEXEC
23100 + GET_CR0_INTO_RDI
23101 + bts $16,%rdi
23102 + jnc 3f
23103 + mov %cs,%edi
23104 + cmp $__KERNEL_CS,%edi
23105 + jnz 2f
23106 +1:
23107 +#endif
23108 +
23109 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23110 + 661: jmp 111f
23111 + .pushsection .altinstr_replacement, "a"
23112 + 662: ASM_NOP2
23113 + .popsection
23114 + .pushsection .altinstructions, "a"
23115 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23116 + .popsection
23117 + GET_CR3_INTO_RDI
23118 + cmp $0,%dil
23119 + jnz 112f
23120 + mov $__KERNEL_DS,%edi
23121 + mov %edi,%ss
23122 + jmp 111f
23123 +112: cmp $1,%dil
23124 + jz 113f
23125 + ud2
23126 +113: sub $4097,%rdi
23127 + bts $63,%rdi
23128 + SET_RDI_INTO_CR3
23129 + mov $__UDEREF_KERNEL_DS,%edi
23130 + mov %edi,%ss
23131 +111:
23132 +#endif
23133 +
23134 +#ifdef CONFIG_PARAVIRT
23135 + PV_RESTORE_REGS(CLBR_RDI)
23136 +#endif
23137 +
23138 + popq %rdi
23139 + pax_force_retaddr
23140 + retq
23141 +
23142 +#ifdef CONFIG_PAX_KERNEXEC
23143 +2: ljmpq __KERNEL_CS,1b
23144 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
23145 +4: SET_RDI_INTO_CR0
23146 + jmp 1b
23147 +#endif
23148 +ENDPROC(pax_enter_kernel)
23149 +
23150 +ENTRY(pax_exit_kernel)
23151 + pushq %rdi
23152 +
23153 +#ifdef CONFIG_PARAVIRT
23154 + PV_SAVE_REGS(CLBR_RDI)
23155 +#endif
23156 +
23157 +#ifdef CONFIG_PAX_KERNEXEC
23158 + mov %cs,%rdi
23159 + cmp $__KERNEXEC_KERNEL_CS,%edi
23160 + jz 2f
23161 + GET_CR0_INTO_RDI
23162 + bts $16,%rdi
23163 + jnc 4f
23164 +1:
23165 +#endif
23166 +
23167 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23168 + 661: jmp 111f
23169 + .pushsection .altinstr_replacement, "a"
23170 + 662: ASM_NOP2
23171 + .popsection
23172 + .pushsection .altinstructions, "a"
23173 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23174 + .popsection
23175 + mov %ss,%edi
23176 + cmp $__UDEREF_KERNEL_DS,%edi
23177 + jnz 111f
23178 + GET_CR3_INTO_RDI
23179 + cmp $0,%dil
23180 + jz 112f
23181 + ud2
23182 +112: add $4097,%rdi
23183 + bts $63,%rdi
23184 + SET_RDI_INTO_CR3
23185 + mov $__KERNEL_DS,%edi
23186 + mov %edi,%ss
23187 +111:
23188 +#endif
23189 +
23190 +#ifdef CONFIG_PARAVIRT
23191 + PV_RESTORE_REGS(CLBR_RDI);
23192 +#endif
23193 +
23194 + popq %rdi
23195 + pax_force_retaddr
23196 + retq
23197 +
23198 +#ifdef CONFIG_PAX_KERNEXEC
23199 +2: GET_CR0_INTO_RDI
23200 + btr $16,%rdi
23201 + jnc 4f
23202 + ljmpq __KERNEL_CS,3f
23203 +3: SET_RDI_INTO_CR0
23204 + jmp 1b
23205 +4: ud2
23206 + jmp 4b
23207 +#endif
23208 +ENDPROC(pax_exit_kernel)
23209 +#endif
23210 +
23211 + .macro pax_enter_kernel_user
23212 + pax_set_fptr_mask
23213 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23214 + call pax_enter_kernel_user
23215 +#endif
23216 + .endm
23217 +
23218 + .macro pax_exit_kernel_user
23219 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23220 + call pax_exit_kernel_user
23221 +#endif
23222 +#ifdef CONFIG_PAX_RANDKSTACK
23223 + pushq %rax
23224 + pushq %r11
23225 + call pax_randomize_kstack
23226 + popq %r11
23227 + popq %rax
23228 +#endif
23229 + .endm
23230 +
23231 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23232 +ENTRY(pax_enter_kernel_user)
23233 + pushq %rdi
23234 + pushq %rbx
23235 +
23236 +#ifdef CONFIG_PARAVIRT
23237 + PV_SAVE_REGS(CLBR_RDI)
23238 +#endif
23239 +
23240 + 661: jmp 111f
23241 + .pushsection .altinstr_replacement, "a"
23242 + 662: ASM_NOP2
23243 + .popsection
23244 + .pushsection .altinstructions, "a"
23245 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23246 + .popsection
23247 + GET_CR3_INTO_RDI
23248 + cmp $1,%dil
23249 + jnz 4f
23250 + sub $4097,%rdi
23251 + bts $63,%rdi
23252 + SET_RDI_INTO_CR3
23253 + jmp 3f
23254 +111:
23255 +
23256 + GET_CR3_INTO_RDI
23257 + mov %rdi,%rbx
23258 + add $__START_KERNEL_map,%rbx
23259 + sub phys_base(%rip),%rbx
23260 +
23261 +#ifdef CONFIG_PARAVIRT
23262 + cmpl $0, pv_info+PARAVIRT_enabled
23263 + jz 1f
23264 + pushq %rdi
23265 + i = 0
23266 + .rept USER_PGD_PTRS
23267 + mov i*8(%rbx),%rsi
23268 + mov $0,%sil
23269 + lea i*8(%rbx),%rdi
23270 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23271 + i = i + 1
23272 + .endr
23273 + popq %rdi
23274 + jmp 2f
23275 +1:
23276 +#endif
23277 +
23278 + i = 0
23279 + .rept USER_PGD_PTRS
23280 + movb $0,i*8(%rbx)
23281 + i = i + 1
23282 + .endr
23283 +
23284 +2: SET_RDI_INTO_CR3
23285 +
23286 +#ifdef CONFIG_PAX_KERNEXEC
23287 + GET_CR0_INTO_RDI
23288 + bts $16,%rdi
23289 + SET_RDI_INTO_CR0
23290 +#endif
23291 +
23292 +3:
23293 +
23294 +#ifdef CONFIG_PARAVIRT
23295 + PV_RESTORE_REGS(CLBR_RDI)
23296 +#endif
23297 +
23298 + popq %rbx
23299 + popq %rdi
23300 + pax_force_retaddr
23301 + retq
23302 +4: ud2
23303 +ENDPROC(pax_enter_kernel_user)
23304 +
23305 +ENTRY(pax_exit_kernel_user)
23306 + pushq %rdi
23307 + pushq %rbx
23308 +
23309 +#ifdef CONFIG_PARAVIRT
23310 + PV_SAVE_REGS(CLBR_RDI)
23311 +#endif
23312 +
23313 + GET_CR3_INTO_RDI
23314 + 661: jmp 1f
23315 + .pushsection .altinstr_replacement, "a"
23316 + 662: ASM_NOP2
23317 + .popsection
23318 + .pushsection .altinstructions, "a"
23319 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23320 + .popsection
23321 + cmp $0,%dil
23322 + jnz 3f
23323 + add $4097,%rdi
23324 + bts $63,%rdi
23325 + SET_RDI_INTO_CR3
23326 + jmp 2f
23327 +1:
23328 +
23329 + mov %rdi,%rbx
23330 +
23331 +#ifdef CONFIG_PAX_KERNEXEC
23332 + GET_CR0_INTO_RDI
23333 + btr $16,%rdi
23334 + jnc 3f
23335 + SET_RDI_INTO_CR0
23336 +#endif
23337 +
23338 + add $__START_KERNEL_map,%rbx
23339 + sub phys_base(%rip),%rbx
23340 +
23341 +#ifdef CONFIG_PARAVIRT
23342 + cmpl $0, pv_info+PARAVIRT_enabled
23343 + jz 1f
23344 + i = 0
23345 + .rept USER_PGD_PTRS
23346 + mov i*8(%rbx),%rsi
23347 + mov $0x67,%sil
23348 + lea i*8(%rbx),%rdi
23349 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23350 + i = i + 1
23351 + .endr
23352 + jmp 2f
23353 +1:
23354 +#endif
23355 +
23356 + i = 0
23357 + .rept USER_PGD_PTRS
23358 + movb $0x67,i*8(%rbx)
23359 + i = i + 1
23360 + .endr
23361 +2:
23362 +
23363 +#ifdef CONFIG_PARAVIRT
23364 + PV_RESTORE_REGS(CLBR_RDI)
23365 +#endif
23366 +
23367 + popq %rbx
23368 + popq %rdi
23369 + pax_force_retaddr
23370 + retq
23371 +3: ud2
23372 +ENDPROC(pax_exit_kernel_user)
23373 +#endif
23374 +
23375 + .macro pax_enter_kernel_nmi
23376 + pax_set_fptr_mask
23377 +
23378 +#ifdef CONFIG_PAX_KERNEXEC
23379 + GET_CR0_INTO_RDI
23380 + bts $16,%rdi
23381 + jc 110f
23382 + SET_RDI_INTO_CR0
23383 + or $2,%ebx
23384 +110:
23385 +#endif
23386 +
23387 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23388 + 661: jmp 111f
23389 + .pushsection .altinstr_replacement, "a"
23390 + 662: ASM_NOP2
23391 + .popsection
23392 + .pushsection .altinstructions, "a"
23393 + altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23394 + .popsection
23395 + GET_CR3_INTO_RDI
23396 + cmp $0,%dil
23397 + jz 111f
23398 + sub $4097,%rdi
23399 + or $4,%ebx
23400 + bts $63,%rdi
23401 + SET_RDI_INTO_CR3
23402 + mov $__UDEREF_KERNEL_DS,%edi
23403 + mov %edi,%ss
23404 +111:
23405 +#endif
23406 + .endm
23407 +
23408 + .macro pax_exit_kernel_nmi
23409 +#ifdef CONFIG_PAX_KERNEXEC
23410 + btr $1,%ebx
23411 + jnc 110f
23412 + GET_CR0_INTO_RDI
23413 + btr $16,%rdi
23414 + SET_RDI_INTO_CR0
23415 +110:
23416 +#endif
23417 +
23418 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23419 + btr $2,%ebx
23420 + jnc 111f
23421 + GET_CR3_INTO_RDI
23422 + add $4097,%rdi
23423 + bts $63,%rdi
23424 + SET_RDI_INTO_CR3
23425 + mov $__KERNEL_DS,%edi
23426 + mov %edi,%ss
23427 +111:
23428 +#endif
23429 + .endm
23430 +
23431 + .macro pax_erase_kstack
23432 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23433 + call pax_erase_kstack
23434 +#endif
23435 + .endm
23436 +
23437 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23438 +ENTRY(pax_erase_kstack)
23439 + pushq %rdi
23440 + pushq %rcx
23441 + pushq %rax
23442 + pushq %r11
23443 +
23444 + GET_THREAD_INFO(%r11)
23445 + mov TI_lowest_stack(%r11), %rdi
23446 + mov $-0xBEEF, %rax
23447 + std
23448 +
23449 +1: mov %edi, %ecx
23450 + and $THREAD_SIZE_asm - 1, %ecx
23451 + shr $3, %ecx
23452 + repne scasq
23453 + jecxz 2f
23454 +
23455 + cmp $2*8, %ecx
23456 + jc 2f
23457 +
23458 + mov $2*8, %ecx
23459 + repe scasq
23460 + jecxz 2f
23461 + jne 1b
23462 +
23463 +2: cld
23464 + or $2*8, %rdi
23465 + mov %esp, %ecx
23466 + sub %edi, %ecx
23467 +
23468 + cmp $THREAD_SIZE_asm, %rcx
23469 + jb 3f
23470 + ud2
23471 +3:
23472 +
23473 + shr $3, %ecx
23474 + rep stosq
23475 +
23476 + mov TI_task_thread_sp0(%r11), %rdi
23477 + sub $256, %rdi
23478 + mov %rdi, TI_lowest_stack(%r11)
23479 +
23480 + popq %r11
23481 + popq %rax
23482 + popq %rcx
23483 + popq %rdi
23484 + pax_force_retaddr
23485 + ret
23486 +ENDPROC(pax_erase_kstack)
23487 +#endif
23488
23489 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23490 #ifdef CONFIG_TRACE_IRQFLAGS
23491 @@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23492 .endm
23493
23494 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23495 - bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23496 + bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23497 jnc 1f
23498 TRACE_IRQS_ON_DEBUG
23499 1:
23500 @@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
23501 movq \tmp,R11+\offset(%rsp)
23502 .endm
23503
23504 - .macro FAKE_STACK_FRAME child_rip
23505 - /* push in order ss, rsp, eflags, cs, rip */
23506 - xorl %eax, %eax
23507 - pushq_cfi $__KERNEL_DS /* ss */
23508 - /*CFI_REL_OFFSET ss,0*/
23509 - pushq_cfi %rax /* rsp */
23510 - CFI_REL_OFFSET rsp,0
23511 - pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23512 - /*CFI_REL_OFFSET rflags,0*/
23513 - pushq_cfi $__KERNEL_CS /* cs */
23514 - /*CFI_REL_OFFSET cs,0*/
23515 - pushq_cfi \child_rip /* rip */
23516 - CFI_REL_OFFSET rip,0
23517 - pushq_cfi %rax /* orig rax */
23518 - .endm
23519 -
23520 - .macro UNFAKE_STACK_FRAME
23521 - addq $8*6, %rsp
23522 - CFI_ADJUST_CFA_OFFSET -(6*8)
23523 - .endm
23524 -
23525 /*
23526 * initial frame state for interrupts (and exceptions without error code)
23527 */
23528 @@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
23529 /* save partial stack frame */
23530 .macro SAVE_ARGS_IRQ
23531 cld
23532 - /* start from rbp in pt_regs and jump over */
23533 - movq_cfi rdi, (RDI-RBP)
23534 - movq_cfi rsi, (RSI-RBP)
23535 - movq_cfi rdx, (RDX-RBP)
23536 - movq_cfi rcx, (RCX-RBP)
23537 - movq_cfi rax, (RAX-RBP)
23538 - movq_cfi r8, (R8-RBP)
23539 - movq_cfi r9, (R9-RBP)
23540 - movq_cfi r10, (R10-RBP)
23541 - movq_cfi r11, (R11-RBP)
23542 + /* start from r15 in pt_regs and jump over */
23543 + movq_cfi rdi, RDI
23544 + movq_cfi rsi, RSI
23545 + movq_cfi rdx, RDX
23546 + movq_cfi rcx, RCX
23547 + movq_cfi rax, RAX
23548 + movq_cfi r8, R8
23549 + movq_cfi r9, R9
23550 + movq_cfi r10, R10
23551 + movq_cfi r11, R11
23552 + movq_cfi r12, R12
23553
23554 /* Save rbp so that we can unwind from get_irq_regs() */
23555 - movq_cfi rbp, 0
23556 + movq_cfi rbp, RBP
23557
23558 /* Save previous stack value */
23559 movq %rsp, %rsi
23560
23561 - leaq -RBP(%rsp),%rdi /* arg1 for handler */
23562 - testl $3, CS-RBP(%rsi)
23563 + movq %rsp,%rdi /* arg1 for handler */
23564 + testb $3, CS(%rsi)
23565 je 1f
23566 SWAPGS
23567 /*
23568 @@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
23569 0x06 /* DW_OP_deref */, \
23570 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23571 0x22 /* DW_OP_plus */
23572 +
23573 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23574 + testb $3, CS(%rdi)
23575 + jnz 1f
23576 + pax_enter_kernel
23577 + jmp 2f
23578 +1: pax_enter_kernel_user
23579 +2:
23580 +#else
23581 + pax_enter_kernel
23582 +#endif
23583 +
23584 /* We entered an interrupt context - irqs are off: */
23585 TRACE_IRQS_OFF
23586 .endm
23587 @@ -308,9 +727,52 @@ ENTRY(save_paranoid)
23588 js 1f /* negative -> in kernel */
23589 SWAPGS
23590 xorl %ebx,%ebx
23591 -1: ret
23592 +1:
23593 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23594 + testb $3, CS+8(%rsp)
23595 + jnz 1f
23596 + pax_enter_kernel
23597 + jmp 2f
23598 +1: pax_enter_kernel_user
23599 +2:
23600 +#else
23601 + pax_enter_kernel
23602 +#endif
23603 + pax_force_retaddr
23604 + ret
23605 CFI_ENDPROC
23606 -END(save_paranoid)
23607 +ENDPROC(save_paranoid)
23608 +
23609 +ENTRY(save_paranoid_nmi)
23610 + XCPT_FRAME 1 RDI+8
23611 + cld
23612 + movq_cfi rdi, RDI+8
23613 + movq_cfi rsi, RSI+8
23614 + movq_cfi rdx, RDX+8
23615 + movq_cfi rcx, RCX+8
23616 + movq_cfi rax, RAX+8
23617 + movq_cfi r8, R8+8
23618 + movq_cfi r9, R9+8
23619 + movq_cfi r10, R10+8
23620 + movq_cfi r11, R11+8
23621 + movq_cfi rbx, RBX+8
23622 + movq_cfi rbp, RBP+8
23623 + movq_cfi r12, R12+8
23624 + movq_cfi r13, R13+8
23625 + movq_cfi r14, R14+8
23626 + movq_cfi r15, R15+8
23627 + movl $1,%ebx
23628 + movl $MSR_GS_BASE,%ecx
23629 + rdmsr
23630 + testl %edx,%edx
23631 + js 1f /* negative -> in kernel */
23632 + SWAPGS
23633 + xorl %ebx,%ebx
23634 +1: pax_enter_kernel_nmi
23635 + pax_force_retaddr
23636 + ret
23637 + CFI_ENDPROC
23638 +ENDPROC(save_paranoid_nmi)
23639
23640 /*
23641 * A newly forked process directly context switches into this address.
23642 @@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
23643
23644 RESTORE_REST
23645
23646 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23647 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23648 jz 1f
23649
23650 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23651 @@ -341,15 +803,13 @@ ENTRY(ret_from_fork)
23652 jmp ret_from_sys_call # go to the SYSRET fastpath
23653
23654 1:
23655 - subq $REST_SKIP, %rsp # leave space for volatiles
23656 - CFI_ADJUST_CFA_OFFSET REST_SKIP
23657 movq %rbp, %rdi
23658 call *%rbx
23659 movl $0, RAX(%rsp)
23660 RESTORE_REST
23661 jmp int_ret_from_sys_call
23662 CFI_ENDPROC
23663 -END(ret_from_fork)
23664 +ENDPROC(ret_from_fork)
23665
23666 /*
23667 * System call entry. Up to 6 arguments in registers are supported.
23668 @@ -386,7 +846,7 @@ END(ret_from_fork)
23669 ENTRY(system_call)
23670 CFI_STARTPROC simple
23671 CFI_SIGNAL_FRAME
23672 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23673 + CFI_DEF_CFA rsp,0
23674 CFI_REGISTER rip,rcx
23675 /*CFI_REGISTER rflags,r11*/
23676 SWAPGS_UNSAFE_STACK
23677 @@ -399,16 +859,23 @@ GLOBAL(system_call_after_swapgs)
23678
23679 movq %rsp,PER_CPU_VAR(old_rsp)
23680 movq PER_CPU_VAR(kernel_stack),%rsp
23681 + SAVE_ARGS 8*6, 0, rax_enosys=1
23682 + pax_enter_kernel_user
23683 +
23684 +#ifdef CONFIG_PAX_RANDKSTACK
23685 + pax_erase_kstack
23686 +#endif
23687 +
23688 /*
23689 * No need to follow this irqs off/on section - it's straight
23690 * and short:
23691 */
23692 ENABLE_INTERRUPTS(CLBR_NONE)
23693 - SAVE_ARGS 8, 0, rax_enosys=1
23694 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23695 movq %rcx,RIP-ARGOFFSET(%rsp)
23696 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23697 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23698 + GET_THREAD_INFO(%rcx)
23699 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23700 jnz tracesys
23701 system_call_fastpath:
23702 #if __SYSCALL_MASK == ~0
23703 @@ -432,10 +899,13 @@ sysret_check:
23704 LOCKDEP_SYS_EXIT
23705 DISABLE_INTERRUPTS(CLBR_NONE)
23706 TRACE_IRQS_OFF
23707 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23708 + GET_THREAD_INFO(%rcx)
23709 + movl TI_flags(%rcx),%edx
23710 andl %edi,%edx
23711 jnz sysret_careful
23712 CFI_REMEMBER_STATE
23713 + pax_exit_kernel_user
23714 + pax_erase_kstack
23715 /*
23716 * sysretq will re-enable interrupts:
23717 */
23718 @@ -494,12 +964,15 @@ sysret_audit:
23719
23720 /* Do syscall tracing */
23721 tracesys:
23722 - leaq -REST_SKIP(%rsp), %rdi
23723 + movq %rsp, %rdi
23724 movq $AUDIT_ARCH_X86_64, %rsi
23725 call syscall_trace_enter_phase1
23726 test %rax, %rax
23727 jnz tracesys_phase2 /* if needed, run the slow path */
23728 - LOAD_ARGS 0 /* else restore clobbered regs */
23729 +
23730 + pax_erase_kstack
23731 +
23732 + LOAD_ARGS /* else restore clobbered regs */
23733 jmp system_call_fastpath /* and return to the fast path */
23734
23735 tracesys_phase2:
23736 @@ -510,12 +983,14 @@ tracesys_phase2:
23737 movq %rax,%rdx
23738 call syscall_trace_enter_phase2
23739
23740 + pax_erase_kstack
23741 +
23742 /*
23743 * Reload arg registers from stack in case ptrace changed them.
23744 * We don't reload %rax because syscall_trace_entry_phase2() returned
23745 * the value it wants us to use in the table lookup.
23746 */
23747 - LOAD_ARGS ARGOFFSET, 1
23748 + LOAD_ARGS 1
23749 RESTORE_REST
23750 #if __SYSCALL_MASK == ~0
23751 cmpq $__NR_syscall_max,%rax
23752 @@ -545,7 +1020,9 @@ GLOBAL(int_with_check)
23753 andl %edi,%edx
23754 jnz int_careful
23755 andl $~TS_COMPAT,TI_status(%rcx)
23756 - jmp retint_swapgs
23757 + pax_exit_kernel_user
23758 + pax_erase_kstack
23759 + jmp retint_swapgs_pax
23760
23761 /* Either reschedule or signal or syscall exit tracking needed. */
23762 /* First do a reschedule test. */
23763 @@ -591,7 +1068,7 @@ int_restore_rest:
23764 TRACE_IRQS_OFF
23765 jmp int_with_check
23766 CFI_ENDPROC
23767 -END(system_call)
23768 +ENDPROC(system_call)
23769
23770 .macro FORK_LIKE func
23771 ENTRY(stub_\func)
23772 @@ -604,9 +1081,10 @@ ENTRY(stub_\func)
23773 DEFAULT_FRAME 0 8 /* offset 8: return address */
23774 call sys_\func
23775 RESTORE_TOP_OF_STACK %r11, 8
23776 - ret $REST_SKIP /* pop extended registers */
23777 + pax_force_retaddr
23778 + ret
23779 CFI_ENDPROC
23780 -END(stub_\func)
23781 +ENDPROC(stub_\func)
23782 .endm
23783
23784 .macro FIXED_FRAME label,func
23785 @@ -616,9 +1094,10 @@ ENTRY(\label)
23786 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23787 call \func
23788 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23789 + pax_force_retaddr
23790 ret
23791 CFI_ENDPROC
23792 -END(\label)
23793 +ENDPROC(\label)
23794 .endm
23795
23796 FORK_LIKE clone
23797 @@ -626,19 +1105,6 @@ END(\label)
23798 FORK_LIKE vfork
23799 FIXED_FRAME stub_iopl, sys_iopl
23800
23801 -ENTRY(ptregscall_common)
23802 - DEFAULT_FRAME 1 8 /* offset 8: return address */
23803 - RESTORE_TOP_OF_STACK %r11, 8
23804 - movq_cfi_restore R15+8, r15
23805 - movq_cfi_restore R14+8, r14
23806 - movq_cfi_restore R13+8, r13
23807 - movq_cfi_restore R12+8, r12
23808 - movq_cfi_restore RBP+8, rbp
23809 - movq_cfi_restore RBX+8, rbx
23810 - ret $REST_SKIP /* pop extended registers */
23811 - CFI_ENDPROC
23812 -END(ptregscall_common)
23813 -
23814 ENTRY(stub_execve)
23815 CFI_STARTPROC
23816 addq $8, %rsp
23817 @@ -650,7 +1116,7 @@ ENTRY(stub_execve)
23818 RESTORE_REST
23819 jmp int_ret_from_sys_call
23820 CFI_ENDPROC
23821 -END(stub_execve)
23822 +ENDPROC(stub_execve)
23823
23824 /*
23825 * sigreturn is special because it needs to restore all registers on return.
23826 @@ -667,7 +1133,7 @@ ENTRY(stub_rt_sigreturn)
23827 RESTORE_REST
23828 jmp int_ret_from_sys_call
23829 CFI_ENDPROC
23830 -END(stub_rt_sigreturn)
23831 +ENDPROC(stub_rt_sigreturn)
23832
23833 #ifdef CONFIG_X86_X32_ABI
23834 ENTRY(stub_x32_rt_sigreturn)
23835 @@ -681,7 +1147,7 @@ ENTRY(stub_x32_rt_sigreturn)
23836 RESTORE_REST
23837 jmp int_ret_from_sys_call
23838 CFI_ENDPROC
23839 -END(stub_x32_rt_sigreturn)
23840 +ENDPROC(stub_x32_rt_sigreturn)
23841
23842 ENTRY(stub_x32_execve)
23843 CFI_STARTPROC
23844 @@ -695,7 +1161,7 @@ ENTRY(stub_x32_execve)
23845 RESTORE_REST
23846 jmp int_ret_from_sys_call
23847 CFI_ENDPROC
23848 -END(stub_x32_execve)
23849 +ENDPROC(stub_x32_execve)
23850
23851 #endif
23852
23853 @@ -732,7 +1198,7 @@ vector=vector+1
23854 2: jmp common_interrupt
23855 .endr
23856 CFI_ENDPROC
23857 -END(irq_entries_start)
23858 +ENDPROC(irq_entries_start)
23859
23860 .previous
23861 END(interrupt)
23862 @@ -749,8 +1215,8 @@ END(interrupt)
23863 /* 0(%rsp): ~(interrupt number) */
23864 .macro interrupt func
23865 /* reserve pt_regs for scratch regs and rbp */
23866 - subq $ORIG_RAX-RBP, %rsp
23867 - CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23868 + subq $ORIG_RAX, %rsp
23869 + CFI_ADJUST_CFA_OFFSET ORIG_RAX
23870 SAVE_ARGS_IRQ
23871 call \func
23872 .endm
23873 @@ -773,14 +1239,14 @@ ret_from_intr:
23874
23875 /* Restore saved previous stack */
23876 popq %rsi
23877 - CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23878 - leaq ARGOFFSET-RBP(%rsi), %rsp
23879 + CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23880 + movq %rsi, %rsp
23881 CFI_DEF_CFA_REGISTER rsp
23882 - CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23883 + CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23884
23885 exit_intr:
23886 GET_THREAD_INFO(%rcx)
23887 - testl $3,CS-ARGOFFSET(%rsp)
23888 + testb $3,CS-ARGOFFSET(%rsp)
23889 je retint_kernel
23890
23891 /* Interrupt came from user space */
23892 @@ -802,12 +1268,35 @@ retint_swapgs: /* return to user-space */
23893 * The iretq could re-enable interrupts:
23894 */
23895 DISABLE_INTERRUPTS(CLBR_ANY)
23896 + pax_exit_kernel_user
23897 +retint_swapgs_pax:
23898 TRACE_IRQS_IRETQ
23899 SWAPGS
23900 jmp restore_args
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904 + pax_exit_kernel
23905 +
23906 +#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907 + /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908 + * namely calling EFI runtime services with a phys mapping. We're
23909 + * starting off with NOPs and patch in the real instrumentation
23910 + * (BTS/OR) before starting any userland process; even before starting
23911 + * up the APs.
23912 + */
23913 + .pushsection .altinstr_replacement, "a"
23914 + 601: pax_force_retaddr (RIP-ARGOFFSET)
23915 + 602:
23916 + .popsection
23917 + 603: .fill 602b-601b, 1, 0x90
23918 + .pushsection .altinstructions, "a"
23919 + altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920 + .popsection
23921 +#else
23922 + pax_force_retaddr (RIP-ARGOFFSET)
23923 +#endif
23924 +
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928 @@ -845,15 +1334,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932 - movq (2*8)(%rsp),%rax /* RIP */
23933 + movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935 - movq (3*8)(%rsp),%rax /* CS */
23936 + movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938 - movq (4*8)(%rsp),%rax /* RFLAGS */
23939 + movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941 - movq (6*8)(%rsp),%rax /* SS */
23942 + movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944 - movq (5*8)(%rsp),%rax /* RSP */
23945 + movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949 @@ -907,7 +1396,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953 -END(common_interrupt)
23954 +ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958 @@ -921,7 +1410,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962 -END(\sym)
23963 +ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967 @@ -994,7 +1483,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976 @@ -1045,6 +1534,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980 +#ifdef CONFIG_SMP
23981 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982 + lea init_tss(%r13), %r13
23983 +#else
23984 + lea init_tss(%rip), %r13
23985 +#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989 @@ -1061,7 +1556,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993 -END(\sym)
23994 +ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998 @@ -1102,9 +1597,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002 + pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005 -END(native_load_gs_index)
24006 +ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010 @@ -1132,9 +1628,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014 + pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017 -END(do_softirq_own_stack)
24018 +ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022 @@ -1172,7 +1669,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 decl PER_CPU_VAR(irq_count)
24024 jmp error_exit
24025 CFI_ENDPROC
24026 -END(xen_do_hypervisor_callback)
24027 +ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031 @@ -1231,7 +1728,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035 -END(xen_failsafe_callback)
24036 +ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040 @@ -1278,18 +1775,33 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044 - testl %ebx,%ebx /* swapgs needed? */
24045 + testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047 - testl $3,CS(%rsp)
24048 + testb $3,CS(%rsp)
24049 jnz paranoid_userspace
24050 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24051 + pax_exit_kernel
24052 + TRACE_IRQS_IRETQ 0
24053 + SWAPGS_UNSAFE_STACK
24054 + RESTORE_ALL 8
24055 + pax_force_retaddr_bts
24056 + jmp irq_return
24057 +#endif
24058 paranoid_swapgs:
24059 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24060 + pax_exit_kernel_user
24061 +#else
24062 + pax_exit_kernel
24063 +#endif
24064 TRACE_IRQS_IRETQ 0
24065 SWAPGS_UNSAFE_STACK
24066 RESTORE_ALL 8
24067 jmp irq_return
24068 paranoid_restore:
24069 + pax_exit_kernel
24070 TRACE_IRQS_IRETQ_DEBUG 0
24071 RESTORE_ALL 8
24072 + pax_force_retaddr_bts
24073 jmp irq_return
24074 paranoid_userspace:
24075 GET_THREAD_INFO(%rcx)
24076 @@ -1318,7 +1830,7 @@ paranoid_schedule:
24077 TRACE_IRQS_OFF
24078 jmp paranoid_userspace
24079 CFI_ENDPROC
24080 -END(paranoid_exit)
24081 +ENDPROC(paranoid_exit)
24082
24083 /*
24084 * Exception entry point. This expects an error code/orig_rax on the stack.
24085 @@ -1345,12 +1857,23 @@ ENTRY(error_entry)
24086 movq %r14, R14+8(%rsp)
24087 movq %r15, R15+8(%rsp)
24088 xorl %ebx,%ebx
24089 - testl $3,CS+8(%rsp)
24090 + testb $3,CS+8(%rsp)
24091 je error_kernelspace
24092 error_swapgs:
24093 SWAPGS
24094 error_sti:
24095 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24096 + testb $3, CS+8(%rsp)
24097 + jnz 1f
24098 + pax_enter_kernel
24099 + jmp 2f
24100 +1: pax_enter_kernel_user
24101 +2:
24102 +#else
24103 + pax_enter_kernel
24104 +#endif
24105 TRACE_IRQS_OFF
24106 + pax_force_retaddr
24107 ret
24108
24109 /*
24110 @@ -1385,7 +1908,7 @@ error_bad_iret:
24111 decl %ebx /* Return to usergs */
24112 jmp error_sti
24113 CFI_ENDPROC
24114 -END(error_entry)
24115 +ENDPROC(error_entry)
24116
24117
24118 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24119 @@ -1396,7 +1919,7 @@ ENTRY(error_exit)
24120 DISABLE_INTERRUPTS(CLBR_NONE)
24121 TRACE_IRQS_OFF
24122 GET_THREAD_INFO(%rcx)
24123 - testl %eax,%eax
24124 + testl $1,%eax
24125 jne retint_kernel
24126 LOCKDEP_SYS_EXIT_IRQ
24127 movl TI_flags(%rcx),%edx
24128 @@ -1405,7 +1928,7 @@ ENTRY(error_exit)
24129 jnz retint_careful
24130 jmp retint_swapgs
24131 CFI_ENDPROC
24132 -END(error_exit)
24133 +ENDPROC(error_exit)
24134
24135 /*
24136 * Test if a given stack is an NMI stack or not.
24137 @@ -1463,9 +1986,11 @@ ENTRY(nmi)
24138 * If %cs was not the kernel segment, then the NMI triggered in user
24139 * space, which means it is definitely not nested.
24140 */
24141 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24142 + je 1f
24143 cmpl $__KERNEL_CS, 16(%rsp)
24144 jne first_nmi
24145 -
24146 +1:
24147 /*
24148 * Check the special variable on the stack to see if NMIs are
24149 * executing.
24150 @@ -1499,8 +2024,7 @@ nested_nmi:
24151
24152 1:
24153 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24154 - leaq -1*8(%rsp), %rdx
24155 - movq %rdx, %rsp
24156 + subq $8, %rsp
24157 CFI_ADJUST_CFA_OFFSET 1*8
24158 leaq -10*8(%rsp), %rdx
24159 pushq_cfi $__KERNEL_DS
24160 @@ -1518,6 +2042,7 @@ nested_nmi_out:
24161 CFI_RESTORE rdx
24162
24163 /* No need to check faults here */
24164 +# pax_force_retaddr_bts
24165 INTERRUPT_RETURN
24166
24167 CFI_RESTORE_STATE
24168 @@ -1614,13 +2139,13 @@ end_repeat_nmi:
24169 subq $ORIG_RAX-R15, %rsp
24170 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24171 /*
24172 - * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24173 + * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24174 * as we should not be calling schedule in NMI context.
24175 * Even with normal interrupts enabled. An NMI should not be
24176 * setting NEED_RESCHED or anything that normal interrupts and
24177 * exceptions might do.
24178 */
24179 - call save_paranoid
24180 + call save_paranoid_nmi
24181 DEFAULT_FRAME 0
24182
24183 /*
24184 @@ -1630,9 +2155,9 @@ end_repeat_nmi:
24185 * NMI itself takes a page fault, the page fault that was preempted
24186 * will read the information from the NMI page fault and not the
24187 * origin fault. Save it off and restore it if it changes.
24188 - * Use the r12 callee-saved register.
24189 + * Use the r13 callee-saved register.
24190 */
24191 - movq %cr2, %r12
24192 + movq %cr2, %r13
24193
24194 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24195 movq %rsp,%rdi
24196 @@ -1641,29 +2166,34 @@ end_repeat_nmi:
24197
24198 /* Did the NMI take a page fault? Restore cr2 if it did */
24199 movq %cr2, %rcx
24200 - cmpq %rcx, %r12
24201 + cmpq %rcx, %r13
24202 je 1f
24203 - movq %r12, %cr2
24204 + movq %r13, %cr2
24205 1:
24206
24207 - testl %ebx,%ebx /* swapgs needed? */
24208 + testl $1,%ebx /* swapgs needed? */
24209 jnz nmi_restore
24210 nmi_swapgs:
24211 SWAPGS_UNSAFE_STACK
24212 nmi_restore:
24213 + pax_exit_kernel_nmi
24214 /* Pop the extra iret frame at once */
24215 RESTORE_ALL 6*8
24216 + testb $3, 8(%rsp)
24217 + jnz 1f
24218 + pax_force_retaddr_bts
24219 +1:
24220
24221 /* Clear the NMI executing stack variable */
24222 movq $0, 5*8(%rsp)
24223 jmp irq_return
24224 CFI_ENDPROC
24225 -END(nmi)
24226 +ENDPROC(nmi)
24227
24228 ENTRY(ignore_sysret)
24229 CFI_STARTPROC
24230 mov $-ENOSYS,%eax
24231 sysret
24232 CFI_ENDPROC
24233 -END(ignore_sysret)
24234 +ENDPROC(ignore_sysret)
24235
24236 diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24237 index 94d857f..5bce89c 100644
24238 --- a/arch/x86/kernel/espfix_64.c
24239 +++ b/arch/x86/kernel/espfix_64.c
24240 @@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24241 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24242 static void *espfix_pages[ESPFIX_MAX_PAGES];
24243
24244 -static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24245 - __aligned(PAGE_SIZE);
24246 +static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24247
24248 static unsigned int page_random, slot_random;
24249
24250 @@ -122,14 +121,17 @@ static void init_espfix_random(void)
24251 void __init init_espfix_bsp(void)
24252 {
24253 pgd_t *pgd_p;
24254 - pteval_t ptemask;
24255 -
24256 - ptemask = __supported_pte_mask;
24257 + unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24258
24259 /* Install the espfix pud into the kernel page directory */
24260 - pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24261 + pgd_p = &init_level4_pgt[index];
24262 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24263
24264 +#ifdef CONFIG_PAX_PER_CPU_PGD
24265 + clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24266 + clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24267 +#endif
24268 +
24269 /* Randomize the locations */
24270 init_espfix_random();
24271
24272 @@ -197,7 +199,7 @@ void init_espfix_ap(void)
24273 set_pte(&pte_p[n*PTE_STRIDE], pte);
24274
24275 /* Job is done for this CPU and any CPU which shares this page */
24276 - ACCESS_ONCE(espfix_pages[page]) = stack_page;
24277 + ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24278
24279 unlock_done:
24280 mutex_unlock(&espfix_init_mutex);
24281 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24282 index 3386dc9..28bdf81 100644
24283 --- a/arch/x86/kernel/ftrace.c
24284 +++ b/arch/x86/kernel/ftrace.c
24285 @@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24286 * kernel identity mapping to modify code.
24287 */
24288 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24289 - ip = (unsigned long)__va(__pa_symbol(ip));
24290 + ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24291
24292 return ip;
24293 }
24294 @@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24295 {
24296 unsigned char replaced[MCOUNT_INSN_SIZE];
24297
24298 + ip = ktla_ktva(ip);
24299 +
24300 /*
24301 * Note: Due to modules and __init, code can
24302 * disappear and change, we need to protect against faulting
24303 @@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24304 unsigned char old[MCOUNT_INSN_SIZE];
24305 int ret;
24306
24307 - memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24308 + memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24309
24310 ftrace_update_func = ip;
24311 /* Make sure the breakpoints see the ftrace_update_func update */
24312 @@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24313 unsigned char replaced[MCOUNT_INSN_SIZE];
24314 unsigned char brk = BREAKPOINT_INSTRUCTION;
24315
24316 - if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24317 + if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24318 return -EFAULT;
24319
24320 /* Make sure it is what we expect it to be */
24321 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24322 index eda1a86..8f6df48 100644
24323 --- a/arch/x86/kernel/head64.c
24324 +++ b/arch/x86/kernel/head64.c
24325 @@ -67,12 +67,12 @@ again:
24326 pgd = *pgd_p;
24327
24328 /*
24329 - * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24330 - * critical -- __PAGE_OFFSET would point us back into the dynamic
24331 + * The use of __early_va rather than __va here is critical:
24332 + * __va would point us back into the dynamic
24333 * range and we might end up looping forever...
24334 */
24335 if (pgd)
24336 - pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24337 + pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24338 else {
24339 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24340 reset_early_page_tables();
24341 @@ -82,13 +82,13 @@ again:
24342 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24343 for (i = 0; i < PTRS_PER_PUD; i++)
24344 pud_p[i] = 0;
24345 - *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24346 + *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24347 }
24348 pud_p += pud_index(address);
24349 pud = *pud_p;
24350
24351 if (pud)
24352 - pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24353 + pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24354 else {
24355 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24356 reset_early_page_tables();
24357 @@ -98,7 +98,7 @@ again:
24358 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24359 for (i = 0; i < PTRS_PER_PMD; i++)
24360 pmd_p[i] = 0;
24361 - *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24362 + *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24363 }
24364 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24365 pmd_p[pmd_index(address)] = pmd;
24366 @@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24367 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24368 early_printk("Kernel alive\n");
24369
24370 - clear_page(init_level4_pgt);
24371 /* set init_level4_pgt kernel high mapping*/
24372 init_level4_pgt[511] = early_level4_pgt[511];
24373
24374 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24375 index f36bd42..0ab4474 100644
24376 --- a/arch/x86/kernel/head_32.S
24377 +++ b/arch/x86/kernel/head_32.S
24378 @@ -26,6 +26,12 @@
24379 /* Physical address */
24380 #define pa(X) ((X) - __PAGE_OFFSET)
24381
24382 +#ifdef CONFIG_PAX_KERNEXEC
24383 +#define ta(X) (X)
24384 +#else
24385 +#define ta(X) ((X) - __PAGE_OFFSET)
24386 +#endif
24387 +
24388 /*
24389 * References to members of the new_cpu_data structure.
24390 */
24391 @@ -55,11 +61,7 @@
24392 * and small than max_low_pfn, otherwise will waste some page table entries
24393 */
24394
24395 -#if PTRS_PER_PMD > 1
24396 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24397 -#else
24398 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24399 -#endif
24400 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24401
24402 /* Number of possible pages in the lowmem region */
24403 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24404 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24405 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24406
24407 /*
24408 + * Real beginning of normal "text" segment
24409 + */
24410 +ENTRY(stext)
24411 +ENTRY(_stext)
24412 +
24413 +/*
24414 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24415 * %esi points to the real-mode code as a 32-bit pointer.
24416 * CS and DS must be 4 GB flat segments, but we don't depend on
24417 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24418 * can.
24419 */
24420 __HEAD
24421 +
24422 +#ifdef CONFIG_PAX_KERNEXEC
24423 + jmp startup_32
24424 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24425 +.fill PAGE_SIZE-5,1,0xcc
24426 +#endif
24427 +
24428 ENTRY(startup_32)
24429 movl pa(stack_start),%ecx
24430
24431 @@ -106,6 +121,59 @@ ENTRY(startup_32)
24432 2:
24433 leal -__PAGE_OFFSET(%ecx),%esp
24434
24435 +#ifdef CONFIG_SMP
24436 + movl $pa(cpu_gdt_table),%edi
24437 + movl $__per_cpu_load,%eax
24438 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24439 + rorl $16,%eax
24440 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24441 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24442 + movl $__per_cpu_end - 1,%eax
24443 + subl $__per_cpu_start,%eax
24444 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24445 +#endif
24446 +
24447 +#ifdef CONFIG_PAX_MEMORY_UDEREF
24448 + movl $NR_CPUS,%ecx
24449 + movl $pa(cpu_gdt_table),%edi
24450 +1:
24451 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24452 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24453 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24454 + addl $PAGE_SIZE_asm,%edi
24455 + loop 1b
24456 +#endif
24457 +
24458 +#ifdef CONFIG_PAX_KERNEXEC
24459 + movl $pa(boot_gdt),%edi
24460 + movl $__LOAD_PHYSICAL_ADDR,%eax
24461 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24462 + rorl $16,%eax
24463 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24464 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24465 + rorl $16,%eax
24466 +
24467 + ljmp $(__BOOT_CS),$1f
24468 +1:
24469 +
24470 + movl $NR_CPUS,%ecx
24471 + movl $pa(cpu_gdt_table),%edi
24472 + addl $__PAGE_OFFSET,%eax
24473 +1:
24474 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24475 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24476 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24477 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24478 + rorl $16,%eax
24479 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24480 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24481 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24482 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24483 + rorl $16,%eax
24484 + addl $PAGE_SIZE_asm,%edi
24485 + loop 1b
24486 +#endif
24487 +
24488 /*
24489 * Clear BSS first so that there are no surprises...
24490 */
24491 @@ -201,8 +269,11 @@ ENTRY(startup_32)
24492 movl %eax, pa(max_pfn_mapped)
24493
24494 /* Do early initialization of the fixmap area */
24495 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24496 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24497 +#ifdef CONFIG_COMPAT_VDSO
24498 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24499 +#else
24500 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24501 +#endif
24502 #else /* Not PAE */
24503
24504 page_pde_offset = (__PAGE_OFFSET >> 20);
24505 @@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24506 movl %eax, pa(max_pfn_mapped)
24507
24508 /* Do early initialization of the fixmap area */
24509 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24510 - movl %eax,pa(initial_page_table+0xffc)
24511 +#ifdef CONFIG_COMPAT_VDSO
24512 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24513 +#else
24514 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24515 +#endif
24516 #endif
24517
24518 #ifdef CONFIG_PARAVIRT
24519 @@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24520 cmpl $num_subarch_entries, %eax
24521 jae bad_subarch
24522
24523 - movl pa(subarch_entries)(,%eax,4), %eax
24524 - subl $__PAGE_OFFSET, %eax
24525 - jmp *%eax
24526 + jmp *pa(subarch_entries)(,%eax,4)
24527
24528 bad_subarch:
24529 WEAK(lguest_entry)
24530 @@ -261,10 +333,10 @@ WEAK(xen_entry)
24531 __INITDATA
24532
24533 subarch_entries:
24534 - .long default_entry /* normal x86/PC */
24535 - .long lguest_entry /* lguest hypervisor */
24536 - .long xen_entry /* Xen hypervisor */
24537 - .long default_entry /* Moorestown MID */
24538 + .long ta(default_entry) /* normal x86/PC */
24539 + .long ta(lguest_entry) /* lguest hypervisor */
24540 + .long ta(xen_entry) /* Xen hypervisor */
24541 + .long ta(default_entry) /* Moorestown MID */
24542 num_subarch_entries = (. - subarch_entries) / 4
24543 .previous
24544 #else
24545 @@ -354,6 +426,7 @@ default_entry:
24546 movl pa(mmu_cr4_features),%eax
24547 movl %eax,%cr4
24548
24549 +#ifdef CONFIG_X86_PAE
24550 testb $X86_CR4_PAE, %al # check if PAE is enabled
24551 jz enable_paging
24552
24553 @@ -382,6 +455,9 @@ default_entry:
24554 /* Make changes effective */
24555 wrmsr
24556
24557 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24558 +#endif
24559 +
24560 enable_paging:
24561
24562 /*
24563 @@ -449,14 +525,20 @@ is486:
24564 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24565 movl %eax,%ss # after changing gdt.
24566
24567 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
24568 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24569 movl %eax,%ds
24570 movl %eax,%es
24571
24572 movl $(__KERNEL_PERCPU), %eax
24573 movl %eax,%fs # set this cpu's percpu
24574
24575 +#ifdef CONFIG_CC_STACKPROTECTOR
24576 movl $(__KERNEL_STACK_CANARY),%eax
24577 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24578 + movl $(__USER_DS),%eax
24579 +#else
24580 + xorl %eax,%eax
24581 +#endif
24582 movl %eax,%gs
24583
24584 xorl %eax,%eax # Clear LDT
24585 @@ -512,8 +594,11 @@ setup_once:
24586 * relocation. Manually set base address in stack canary
24587 * segment descriptor.
24588 */
24589 - movl $gdt_page,%eax
24590 + movl $cpu_gdt_table,%eax
24591 movl $stack_canary,%ecx
24592 +#ifdef CONFIG_SMP
24593 + addl $__per_cpu_load,%ecx
24594 +#endif
24595 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24596 shrl $16, %ecx
24597 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24598 @@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24599 cmpl $2,(%esp) # X86_TRAP_NMI
24600 je is_nmi # Ignore NMI
24601
24602 - cmpl $2,%ss:early_recursion_flag
24603 + cmpl $1,%ss:early_recursion_flag
24604 je hlt_loop
24605 incl %ss:early_recursion_flag
24606
24607 @@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24608 pushl (20+6*4)(%esp) /* trapno */
24609 pushl $fault_msg
24610 call printk
24611 -#endif
24612 call dump_stack
24613 +#endif
24614 hlt_loop:
24615 hlt
24616 jmp hlt_loop
24617 @@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24618 /* This is the default interrupt "handler" :-) */
24619 ALIGN
24620 ignore_int:
24621 - cld
24622 #ifdef CONFIG_PRINTK
24623 + cmpl $2,%ss:early_recursion_flag
24624 + je hlt_loop
24625 + incl %ss:early_recursion_flag
24626 + cld
24627 pushl %eax
24628 pushl %ecx
24629 pushl %edx
24630 @@ -617,9 +705,6 @@ ignore_int:
24631 movl $(__KERNEL_DS),%eax
24632 movl %eax,%ds
24633 movl %eax,%es
24634 - cmpl $2,early_recursion_flag
24635 - je hlt_loop
24636 - incl early_recursion_flag
24637 pushl 16(%esp)
24638 pushl 24(%esp)
24639 pushl 32(%esp)
24640 @@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24641 /*
24642 * BSS section
24643 */
24644 -__PAGE_ALIGNED_BSS
24645 - .align PAGE_SIZE
24646 #ifdef CONFIG_X86_PAE
24647 +.section .initial_pg_pmd,"a",@progbits
24648 initial_pg_pmd:
24649 .fill 1024*KPMDS,4,0
24650 #else
24651 +.section .initial_page_table,"a",@progbits
24652 ENTRY(initial_page_table)
24653 .fill 1024,4,0
24654 #endif
24655 +.section .initial_pg_fixmap,"a",@progbits
24656 initial_pg_fixmap:
24657 .fill 1024,4,0
24658 +.section .empty_zero_page,"a",@progbits
24659 ENTRY(empty_zero_page)
24660 .fill 4096,1,0
24661 +.section .swapper_pg_dir,"a",@progbits
24662 ENTRY(swapper_pg_dir)
24663 +#ifdef CONFIG_X86_PAE
24664 + .fill 4,8,0
24665 +#else
24666 .fill 1024,4,0
24667 +#endif
24668
24669 /*
24670 * This starts the data section.
24671 */
24672 #ifdef CONFIG_X86_PAE
24673 -__PAGE_ALIGNED_DATA
24674 - /* Page-aligned for the benefit of paravirt? */
24675 - .align PAGE_SIZE
24676 +.section .initial_page_table,"a",@progbits
24677 ENTRY(initial_page_table)
24678 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24679 # if KPMDS == 3
24680 @@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24681 # error "Kernel PMDs should be 1, 2 or 3"
24682 # endif
24683 .align PAGE_SIZE /* needs to be page-sized too */
24684 +
24685 +#ifdef CONFIG_PAX_PER_CPU_PGD
24686 +ENTRY(cpu_pgd)
24687 + .rept 2*NR_CPUS
24688 + .fill 4,8,0
24689 + .endr
24690 +#endif
24691 +
24692 #endif
24693
24694 .data
24695 .balign 4
24696 ENTRY(stack_start)
24697 - .long init_thread_union+THREAD_SIZE
24698 + .long init_thread_union+THREAD_SIZE-8
24699
24700 __INITRODATA
24701 int_msg:
24702 @@ -727,7 +825,7 @@ fault_msg:
24703 * segment size, and 32-bit linear address value:
24704 */
24705
24706 - .data
24707 +.section .rodata,"a",@progbits
24708 .globl boot_gdt_descr
24709 .globl idt_descr
24710
24711 @@ -736,7 +834,7 @@ fault_msg:
24712 .word 0 # 32 bit align gdt_desc.address
24713 boot_gdt_descr:
24714 .word __BOOT_DS+7
24715 - .long boot_gdt - __PAGE_OFFSET
24716 + .long pa(boot_gdt)
24717
24718 .word 0 # 32-bit align idt_desc.address
24719 idt_descr:
24720 @@ -747,7 +845,7 @@ idt_descr:
24721 .word 0 # 32 bit align gdt_desc.address
24722 ENTRY(early_gdt_descr)
24723 .word GDT_ENTRIES*8-1
24724 - .long gdt_page /* Overwritten for secondary CPUs */
24725 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
24726
24727 /*
24728 * The boot_gdt must mirror the equivalent in setup.S and is
24729 @@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24730 .align L1_CACHE_BYTES
24731 ENTRY(boot_gdt)
24732 .fill GDT_ENTRY_BOOT_CS,8,0
24733 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24734 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24735 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24736 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24737 +
24738 + .align PAGE_SIZE_asm
24739 +ENTRY(cpu_gdt_table)
24740 + .rept NR_CPUS
24741 + .quad 0x0000000000000000 /* NULL descriptor */
24742 + .quad 0x0000000000000000 /* 0x0b reserved */
24743 + .quad 0x0000000000000000 /* 0x13 reserved */
24744 + .quad 0x0000000000000000 /* 0x1b reserved */
24745 +
24746 +#ifdef CONFIG_PAX_KERNEXEC
24747 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24748 +#else
24749 + .quad 0x0000000000000000 /* 0x20 unused */
24750 +#endif
24751 +
24752 + .quad 0x0000000000000000 /* 0x28 unused */
24753 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24754 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24755 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24756 + .quad 0x0000000000000000 /* 0x4b reserved */
24757 + .quad 0x0000000000000000 /* 0x53 reserved */
24758 + .quad 0x0000000000000000 /* 0x5b reserved */
24759 +
24760 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24761 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24762 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24763 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24764 +
24765 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24766 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24767 +
24768 + /*
24769 + * Segments used for calling PnP BIOS have byte granularity.
24770 + * The code segments and data segments have fixed 64k limits,
24771 + * the transfer segment sizes are set at run time.
24772 + */
24773 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
24774 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
24775 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
24776 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
24777 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
24778 +
24779 + /*
24780 + * The APM segments have byte granularity and their bases
24781 + * are set at run time. All have 64k limits.
24782 + */
24783 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24784 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24785 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
24786 +
24787 + .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24788 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24789 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24790 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24791 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24792 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24793 +
24794 + /* Be sure this is zeroed to avoid false validations in Xen */
24795 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24796 + .endr
24797 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24798 index a468c0a..8b5a879 100644
24799 --- a/arch/x86/kernel/head_64.S
24800 +++ b/arch/x86/kernel/head_64.S
24801 @@ -20,6 +20,8 @@
24802 #include <asm/processor-flags.h>
24803 #include <asm/percpu.h>
24804 #include <asm/nops.h>
24805 +#include <asm/cpufeature.h>
24806 +#include <asm/alternative-asm.h>
24807
24808 #ifdef CONFIG_PARAVIRT
24809 #include <asm/asm-offsets.h>
24810 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24811 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24812 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24813 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24814 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
24815 +L3_VMALLOC_START = pud_index(VMALLOC_START)
24816 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
24817 +L3_VMALLOC_END = pud_index(VMALLOC_END)
24818 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24819 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24820
24821 .text
24822 __HEAD
24823 @@ -89,11 +97,24 @@ startup_64:
24824 * Fixup the physical addresses in the page table
24825 */
24826 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24827 + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24828 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24829 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24830 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24831 + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24832
24833 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24834 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24835 + addq %rbp, level3_ident_pgt + (0*8)(%rip)
24836 +#ifndef CONFIG_XEN
24837 + addq %rbp, level3_ident_pgt + (1*8)(%rip)
24838 +#endif
24839 +
24840 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24841 +
24842 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24843 + addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24844
24845 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24846 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24847
24848 /*
24849 * Set up the identity mapping for the switchover. These
24850 @@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24851 * after the boot processor executes this code.
24852 */
24853
24854 + orq $-1, %rbp
24855 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24856 1:
24857
24858 - /* Enable PAE mode and PGE */
24859 - movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24860 + /* Enable PAE mode and PSE/PGE */
24861 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24862 movq %rcx, %cr4
24863
24864 /* Setup early boot stage 4 level pagetables. */
24865 @@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24866 movl $MSR_EFER, %ecx
24867 rdmsr
24868 btsl $_EFER_SCE, %eax /* Enable System Call */
24869 - btl $20,%edi /* No Execute supported? */
24870 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24871 jnc 1f
24872 btsl $_EFER_NX, %eax
24873 + cmpq $-1, %rbp
24874 + je 1f
24875 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24876 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24877 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24878 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24879 + btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24880 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24881 + btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24882 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24883 1: wrmsr /* Make changes effective */
24884
24885 /* Setup cr0 */
24886 @@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24887 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24888 * address given in m16:64.
24889 */
24890 + pax_set_fptr_mask
24891 movq initial_code(%rip),%rax
24892 pushq $0 # fake return address to stop unwinder
24893 pushq $__KERNEL_CS # set correct cs
24894 @@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24895 .quad INIT_PER_CPU_VAR(irq_stack_union)
24896
24897 GLOBAL(stack_start)
24898 - .quad init_thread_union+THREAD_SIZE-8
24899 + .quad init_thread_union+THREAD_SIZE-16
24900 .word 0
24901 __FINITDATA
24902
24903 @@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24904 call dump_stack
24905 #ifdef CONFIG_KALLSYMS
24906 leaq early_idt_ripmsg(%rip),%rdi
24907 - movq 40(%rsp),%rsi # %rip again
24908 + movq 88(%rsp),%rsi # %rip again
24909 call __print_symbol
24910 #endif
24911 #endif /* EARLY_PRINTK */
24912 @@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24913 early_recursion_flag:
24914 .long 0
24915
24916 + .section .rodata,"a",@progbits
24917 #ifdef CONFIG_EARLY_PRINTK
24918 early_idt_msg:
24919 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24920 @@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24921 NEXT_PAGE(early_dynamic_pgts)
24922 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24923
24924 - .data
24925 + .section .rodata,"a",@progbits
24926
24927 -#ifndef CONFIG_XEN
24928 NEXT_PAGE(init_level4_pgt)
24929 - .fill 512,8,0
24930 -#else
24931 -NEXT_PAGE(init_level4_pgt)
24932 - .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24933 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24934 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24935 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
24936 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24937 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
24938 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24939 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24940 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24941 .org init_level4_pgt + L4_START_KERNEL*8, 0
24942 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24943 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24944
24945 +#ifdef CONFIG_PAX_PER_CPU_PGD
24946 +NEXT_PAGE(cpu_pgd)
24947 + .rept 2*NR_CPUS
24948 + .fill 512,8,0
24949 + .endr
24950 +#endif
24951 +
24952 NEXT_PAGE(level3_ident_pgt)
24953 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24954 +#ifdef CONFIG_XEN
24955 .fill 511, 8, 0
24956 +#else
24957 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24958 + .fill 510,8,0
24959 +#endif
24960 +
24961 +NEXT_PAGE(level3_vmalloc_start_pgt)
24962 + .fill 512,8,0
24963 +
24964 +NEXT_PAGE(level3_vmalloc_end_pgt)
24965 + .fill 512,8,0
24966 +
24967 +NEXT_PAGE(level3_vmemmap_pgt)
24968 + .fill L3_VMEMMAP_START,8,0
24969 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24970 +
24971 NEXT_PAGE(level2_ident_pgt)
24972 - /* Since I easily can, map the first 1G.
24973 + /* Since I easily can, map the first 2G.
24974 * Don't set NX because code runs from these pages.
24975 */
24976 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24977 -#endif
24978 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24979
24980 NEXT_PAGE(level3_kernel_pgt)
24981 .fill L3_START_KERNEL,8,0
24982 @@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24983 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24984 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24985
24986 +NEXT_PAGE(level2_vmemmap_pgt)
24987 + .fill 512,8,0
24988 +
24989 NEXT_PAGE(level2_kernel_pgt)
24990 /*
24991 * 512 MB kernel mapping. We spend a full page on this pagetable
24992 @@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24993 NEXT_PAGE(level2_fixmap_pgt)
24994 .fill 506,8,0
24995 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24996 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24997 - .fill 5,8,0
24998 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24999 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25000 + .fill 4,8,0
25001
25002 NEXT_PAGE(level1_fixmap_pgt)
25003 .fill 512,8,0
25004
25005 +NEXT_PAGE(level1_vsyscall_pgt)
25006 + .fill 512,8,0
25007 +
25008 #undef PMDS
25009
25010 - .data
25011 + .align PAGE_SIZE
25012 +ENTRY(cpu_gdt_table)
25013 + .rept NR_CPUS
25014 + .quad 0x0000000000000000 /* NULL descriptor */
25015 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25016 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
25017 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
25018 + .quad 0x00cffb000000ffff /* __USER32_CS */
25019 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25020 + .quad 0x00affb000000ffff /* __USER_CS */
25021 +
25022 +#ifdef CONFIG_PAX_KERNEXEC
25023 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25024 +#else
25025 + .quad 0x0 /* unused */
25026 +#endif
25027 +
25028 + .quad 0,0 /* TSS */
25029 + .quad 0,0 /* LDT */
25030 + .quad 0,0,0 /* three TLS descriptors */
25031 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
25032 + /* asm/segment.h:GDT_ENTRIES must match this */
25033 +
25034 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25035 + .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25036 +#else
25037 + .quad 0x0 /* unused */
25038 +#endif
25039 +
25040 + /* zero the remaining page */
25041 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25042 + .endr
25043 +
25044 .align 16
25045 .globl early_gdt_descr
25046 early_gdt_descr:
25047 .word GDT_ENTRIES*8-1
25048 early_gdt_descr_base:
25049 - .quad INIT_PER_CPU_VAR(gdt_page)
25050 + .quad cpu_gdt_table
25051
25052 ENTRY(phys_base)
25053 /* This must match the first entry in level2_kernel_pgt */
25054 .quad 0x0000000000000000
25055
25056 #include "../../x86/xen/xen-head.S"
25057 -
25058 - __PAGE_ALIGNED_BSS
25059 +
25060 + .section .rodata,"a",@progbits
25061 NEXT_PAGE(empty_zero_page)
25062 .skip PAGE_SIZE
25063 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25064 index 05fd74f..c3548b1 100644
25065 --- a/arch/x86/kernel/i386_ksyms_32.c
25066 +++ b/arch/x86/kernel/i386_ksyms_32.c
25067 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25068 EXPORT_SYMBOL(cmpxchg8b_emu);
25069 #endif
25070
25071 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
25072 +
25073 /* Networking helper routines. */
25074 EXPORT_SYMBOL(csum_partial_copy_generic);
25075 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25076 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25077
25078 EXPORT_SYMBOL(__get_user_1);
25079 EXPORT_SYMBOL(__get_user_2);
25080 @@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25081 EXPORT_SYMBOL(___preempt_schedule_context);
25082 #endif
25083 #endif
25084 +
25085 +#ifdef CONFIG_PAX_KERNEXEC
25086 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25087 +#endif
25088 +
25089 +#ifdef CONFIG_PAX_PER_CPU_PGD
25090 +EXPORT_SYMBOL(cpu_pgd);
25091 +#endif
25092 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25093 index a9a4229..6f4d476 100644
25094 --- a/arch/x86/kernel/i387.c
25095 +++ b/arch/x86/kernel/i387.c
25096 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25097 static inline bool interrupted_user_mode(void)
25098 {
25099 struct pt_regs *regs = get_irq_regs();
25100 - return regs && user_mode_vm(regs);
25101 + return regs && user_mode(regs);
25102 }
25103
25104 /*
25105 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25106 index e7cc537..67d7372 100644
25107 --- a/arch/x86/kernel/i8259.c
25108 +++ b/arch/x86/kernel/i8259.c
25109 @@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25110 static void make_8259A_irq(unsigned int irq)
25111 {
25112 disable_irq_nosync(irq);
25113 - io_apic_irqs &= ~(1<<irq);
25114 + io_apic_irqs &= ~(1UL<<irq);
25115 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25116 enable_irq(irq);
25117 }
25118 @@ -208,7 +208,7 @@ spurious_8259A_irq:
25119 "spurious 8259A interrupt: IRQ%d.\n", irq);
25120 spurious_irq_mask |= irqmask;
25121 }
25122 - atomic_inc(&irq_err_count);
25123 + atomic_inc_unchecked(&irq_err_count);
25124 /*
25125 * Theoretically we do not have to handle this IRQ,
25126 * but in Linux this does not cause problems and is
25127 @@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25128 /* (slave's support for AEOI in flat mode is to be investigated) */
25129 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25130
25131 + pax_open_kernel();
25132 if (auto_eoi)
25133 /*
25134 * In AEOI mode we just have to mask the interrupt
25135 * when acking.
25136 */
25137 - i8259A_chip.irq_mask_ack = disable_8259A_irq;
25138 + *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25139 else
25140 - i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25141 + *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25142 + pax_close_kernel();
25143
25144 udelay(100); /* wait for 8259A to initialize */
25145
25146 diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25147 index a979b5b..1d6db75 100644
25148 --- a/arch/x86/kernel/io_delay.c
25149 +++ b/arch/x86/kernel/io_delay.c
25150 @@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25151 * Quirk table for systems that misbehave (lock up, etc.) if port
25152 * 0x80 is used:
25153 */
25154 -static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25155 +static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25156 {
25157 .callback = dmi_io_delay_0xed_port,
25158 .ident = "Compaq Presario V6000",
25159 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25160 index 4ddaf66..49d5c18 100644
25161 --- a/arch/x86/kernel/ioport.c
25162 +++ b/arch/x86/kernel/ioport.c
25163 @@ -6,6 +6,7 @@
25164 #include <linux/sched.h>
25165 #include <linux/kernel.h>
25166 #include <linux/capability.h>
25167 +#include <linux/security.h>
25168 #include <linux/errno.h>
25169 #include <linux/types.h>
25170 #include <linux/ioport.h>
25171 @@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25172 return -EINVAL;
25173 if (turn_on && !capable(CAP_SYS_RAWIO))
25174 return -EPERM;
25175 +#ifdef CONFIG_GRKERNSEC_IO
25176 + if (turn_on && grsec_disable_privio) {
25177 + gr_handle_ioperm();
25178 + return -ENODEV;
25179 + }
25180 +#endif
25181
25182 /*
25183 * If it's the first ioperm() call in this thread's lifetime, set the
25184 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25185 * because the ->io_bitmap_max value must match the bitmap
25186 * contents:
25187 */
25188 - tss = &per_cpu(init_tss, get_cpu());
25189 + tss = init_tss + get_cpu();
25190
25191 if (turn_on)
25192 bitmap_clear(t->io_bitmap_ptr, from, num);
25193 @@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25194 if (level > old) {
25195 if (!capable(CAP_SYS_RAWIO))
25196 return -EPERM;
25197 +#ifdef CONFIG_GRKERNSEC_IO
25198 + if (grsec_disable_privio) {
25199 + gr_handle_iopl();
25200 + return -ENODEV;
25201 + }
25202 +#endif
25203 }
25204 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25205 t->iopl = level << 12;
25206 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25207 index 922d285..6d20692 100644
25208 --- a/arch/x86/kernel/irq.c
25209 +++ b/arch/x86/kernel/irq.c
25210 @@ -22,7 +22,7 @@
25211 #define CREATE_TRACE_POINTS
25212 #include <asm/trace/irq_vectors.h>
25213
25214 -atomic_t irq_err_count;
25215 +atomic_unchecked_t irq_err_count;
25216
25217 /* Function pointer for generic interrupt vector handling */
25218 void (*x86_platform_ipi_callback)(void) = NULL;
25219 @@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25220 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25221 seq_printf(p, " Hypervisor callback interrupts\n");
25222 #endif
25223 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25224 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25225 #if defined(CONFIG_X86_IO_APIC)
25226 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25227 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25228 #endif
25229 return 0;
25230 }
25231 @@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25232
25233 u64 arch_irq_stat(void)
25234 {
25235 - u64 sum = atomic_read(&irq_err_count);
25236 + u64 sum = atomic_read_unchecked(&irq_err_count);
25237 return sum;
25238 }
25239
25240 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25241 index 63ce838..2ea3e06 100644
25242 --- a/arch/x86/kernel/irq_32.c
25243 +++ b/arch/x86/kernel/irq_32.c
25244 @@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25245
25246 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25247
25248 +extern void gr_handle_kernel_exploit(void);
25249 +
25250 int sysctl_panic_on_stackoverflow __read_mostly;
25251
25252 /* Debugging check for stack overflow: is there less than 1KB free? */
25253 @@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25254 __asm__ __volatile__("andl %%esp,%0" :
25255 "=r" (sp) : "0" (THREAD_SIZE - 1));
25256
25257 - return sp < (sizeof(struct thread_info) + STACK_WARN);
25258 + return sp < STACK_WARN;
25259 }
25260
25261 static void print_stack_overflow(void)
25262 {
25263 printk(KERN_WARNING "low stack detected by irq handler\n");
25264 dump_stack();
25265 + gr_handle_kernel_exploit();
25266 if (sysctl_panic_on_stackoverflow)
25267 panic("low stack detected by irq handler - check messages\n");
25268 }
25269 @@ -84,10 +87,9 @@ static inline void *current_stack(void)
25270 static inline int
25271 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25272 {
25273 - struct irq_stack *curstk, *irqstk;
25274 + struct irq_stack *irqstk;
25275 u32 *isp, *prev_esp, arg1, arg2;
25276
25277 - curstk = (struct irq_stack *) current_stack();
25278 irqstk = __this_cpu_read(hardirq_stack);
25279
25280 /*
25281 @@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25282 * handler) we can't do that and just have to keep using the
25283 * current stack (which is the irq stack already after all)
25284 */
25285 - if (unlikely(curstk == irqstk))
25286 + if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25287 return 0;
25288
25289 - isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25290 + isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25291
25292 /* Save the next esp at the bottom of the stack */
25293 prev_esp = (u32 *)irqstk;
25294 *prev_esp = current_stack_pointer;
25295
25296 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25297 + __set_fs(MAKE_MM_SEG(0));
25298 +#endif
25299 +
25300 if (unlikely(overflow))
25301 call_on_stack(print_stack_overflow, isp);
25302
25303 @@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25304 : "0" (irq), "1" (desc), "2" (isp),
25305 "D" (desc->handle_irq)
25306 : "memory", "cc", "ecx");
25307 +
25308 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25309 + __set_fs(current_thread_info()->addr_limit);
25310 +#endif
25311 +
25312 return 1;
25313 }
25314
25315 @@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25316 */
25317 void irq_ctx_init(int cpu)
25318 {
25319 - struct irq_stack *irqstk;
25320 -
25321 if (per_cpu(hardirq_stack, cpu))
25322 return;
25323
25324 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25325 - THREADINFO_GFP,
25326 - THREAD_SIZE_ORDER));
25327 - per_cpu(hardirq_stack, cpu) = irqstk;
25328 -
25329 - irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25330 - THREADINFO_GFP,
25331 - THREAD_SIZE_ORDER));
25332 - per_cpu(softirq_stack, cpu) = irqstk;
25333 -
25334 - printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25335 - cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25336 + per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25337 + per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25338 }
25339
25340 void do_softirq_own_stack(void)
25341 {
25342 - struct thread_info *curstk;
25343 struct irq_stack *irqstk;
25344 u32 *isp, *prev_esp;
25345
25346 - curstk = current_stack();
25347 irqstk = __this_cpu_read(softirq_stack);
25348
25349 /* build the stack frame on the softirq stack */
25350 @@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25351 prev_esp = (u32 *)irqstk;
25352 *prev_esp = current_stack_pointer;
25353
25354 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25355 + __set_fs(MAKE_MM_SEG(0));
25356 +#endif
25357 +
25358 call_on_stack(__do_softirq, isp);
25359 +
25360 +#ifdef CONFIG_PAX_MEMORY_UDEREF
25361 + __set_fs(current_thread_info()->addr_limit);
25362 +#endif
25363 +
25364 }
25365
25366 bool handle_irq(unsigned irq, struct pt_regs *regs)
25367 @@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25368 if (unlikely(!desc))
25369 return false;
25370
25371 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25372 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25373 if (unlikely(overflow))
25374 print_stack_overflow();
25375 desc->handle_irq(irq, desc);
25376 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25377 index e4b503d..824fce8 100644
25378 --- a/arch/x86/kernel/irq_64.c
25379 +++ b/arch/x86/kernel/irq_64.c
25380 @@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25381 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25382 EXPORT_PER_CPU_SYMBOL(irq_regs);
25383
25384 +extern void gr_handle_kernel_exploit(void);
25385 +
25386 int sysctl_panic_on_stackoverflow;
25387
25388 /*
25389 @@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25390 u64 estack_top, estack_bottom;
25391 u64 curbase = (u64)task_stack_page(current);
25392
25393 - if (user_mode_vm(regs))
25394 + if (user_mode(regs))
25395 return;
25396
25397 if (regs->sp >= curbase + sizeof(struct thread_info) +
25398 @@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25399 irq_stack_top, irq_stack_bottom,
25400 estack_top, estack_bottom);
25401
25402 + gr_handle_kernel_exploit();
25403 +
25404 if (sysctl_panic_on_stackoverflow)
25405 panic("low stack detected by irq handler - check messages\n");
25406 #endif
25407 diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25408 index 26d5a55..a01160a 100644
25409 --- a/arch/x86/kernel/jump_label.c
25410 +++ b/arch/x86/kernel/jump_label.c
25411 @@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25412 * Jump label is enabled for the first time.
25413 * So we expect a default_nop...
25414 */
25415 - if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25416 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25417 != 0))
25418 bug_at((void *)entry->code, __LINE__);
25419 } else {
25420 @@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25421 * ...otherwise expect an ideal_nop. Otherwise
25422 * something went horribly wrong.
25423 */
25424 - if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25425 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25426 != 0))
25427 bug_at((void *)entry->code, __LINE__);
25428 }
25429 @@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25430 * are converting the default nop to the ideal nop.
25431 */
25432 if (init) {
25433 - if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25434 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25435 bug_at((void *)entry->code, __LINE__);
25436 } else {
25437 code.jump = 0xe9;
25438 code.offset = entry->target -
25439 (entry->code + JUMP_LABEL_NOP_SIZE);
25440 - if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25441 + if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25442 bug_at((void *)entry->code, __LINE__);
25443 }
25444 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25445 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25446 index 7ec1d5f..5a7d130 100644
25447 --- a/arch/x86/kernel/kgdb.c
25448 +++ b/arch/x86/kernel/kgdb.c
25449 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25450 #ifdef CONFIG_X86_32
25451 switch (regno) {
25452 case GDB_SS:
25453 - if (!user_mode_vm(regs))
25454 + if (!user_mode(regs))
25455 *(unsigned long *)mem = __KERNEL_DS;
25456 break;
25457 case GDB_SP:
25458 - if (!user_mode_vm(regs))
25459 + if (!user_mode(regs))
25460 *(unsigned long *)mem = kernel_stack_pointer(regs);
25461 break;
25462 case GDB_GS:
25463 @@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25464 bp->attr.bp_addr = breakinfo[breakno].addr;
25465 bp->attr.bp_len = breakinfo[breakno].len;
25466 bp->attr.bp_type = breakinfo[breakno].type;
25467 - info->address = breakinfo[breakno].addr;
25468 + if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25469 + info->address = ktla_ktva(breakinfo[breakno].addr);
25470 + else
25471 + info->address = breakinfo[breakno].addr;
25472 info->len = breakinfo[breakno].len;
25473 info->type = breakinfo[breakno].type;
25474 val = arch_install_hw_breakpoint(bp);
25475 @@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25476 case 'k':
25477 /* clear the trace bit */
25478 linux_regs->flags &= ~X86_EFLAGS_TF;
25479 - atomic_set(&kgdb_cpu_doing_single_step, -1);
25480 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25481
25482 /* set the trace bit if we're stepping */
25483 if (remcomInBuffer[0] == 's') {
25484 linux_regs->flags |= X86_EFLAGS_TF;
25485 - atomic_set(&kgdb_cpu_doing_single_step,
25486 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25487 raw_smp_processor_id());
25488 }
25489
25490 @@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25491
25492 switch (cmd) {
25493 case DIE_DEBUG:
25494 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25495 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25496 if (user_mode(regs))
25497 return single_step_cont(regs, args);
25498 break;
25499 @@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25500 #endif /* CONFIG_DEBUG_RODATA */
25501
25502 bpt->type = BP_BREAKPOINT;
25503 - err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25504 + err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25505 BREAK_INSTR_SIZE);
25506 if (err)
25507 return err;
25508 - err = probe_kernel_write((char *)bpt->bpt_addr,
25509 + err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25510 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25511 #ifdef CONFIG_DEBUG_RODATA
25512 if (!err)
25513 @@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25514 return -EBUSY;
25515 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25516 BREAK_INSTR_SIZE);
25517 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25518 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25519 if (err)
25520 return err;
25521 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25522 @@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25523 if (mutex_is_locked(&text_mutex))
25524 goto knl_write;
25525 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25526 - err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25527 + err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25528 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25529 goto knl_write;
25530 return err;
25531 knl_write:
25532 #endif /* CONFIG_DEBUG_RODATA */
25533 - return probe_kernel_write((char *)bpt->bpt_addr,
25534 + return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25535 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25536 }
25537
25538 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25539 index 67e6d19..731ed28 100644
25540 --- a/arch/x86/kernel/kprobes/core.c
25541 +++ b/arch/x86/kernel/kprobes/core.c
25542 @@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25543 s32 raddr;
25544 } __packed *insn;
25545
25546 - insn = (struct __arch_relative_insn *)from;
25547 + insn = (struct __arch_relative_insn *)ktla_ktva(from);
25548 +
25549 + pax_open_kernel();
25550 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25551 insn->op = op;
25552 + pax_close_kernel();
25553 }
25554
25555 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25556 @@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25557 kprobe_opcode_t opcode;
25558 kprobe_opcode_t *orig_opcodes = opcodes;
25559
25560 - if (search_exception_tables((unsigned long)opcodes))
25561 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25562 return 0; /* Page fault may occur on this address. */
25563
25564 retry:
25565 @@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25566 * for the first byte, we can recover the original instruction
25567 * from it and kp->opcode.
25568 */
25569 - memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25570 + memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25571 buf[0] = kp->opcode;
25572 - return (unsigned long)buf;
25573 + return ktva_ktla((unsigned long)buf);
25574 }
25575
25576 /*
25577 @@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25578 /* Another subsystem puts a breakpoint, failed to recover */
25579 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25580 return 0;
25581 + pax_open_kernel();
25582 memcpy(dest, insn.kaddr, insn.length);
25583 + pax_close_kernel();
25584
25585 #ifdef CONFIG_X86_64
25586 if (insn_rip_relative(&insn)) {
25587 @@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25588 return 0;
25589 }
25590 disp = (u8 *) dest + insn_offset_displacement(&insn);
25591 + pax_open_kernel();
25592 *(s32 *) disp = (s32) newdisp;
25593 + pax_close_kernel();
25594 }
25595 #endif
25596 return insn.length;
25597 @@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25598 * nor set current_kprobe, because it doesn't use single
25599 * stepping.
25600 */
25601 - regs->ip = (unsigned long)p->ainsn.insn;
25602 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25603 preempt_enable_no_resched();
25604 return;
25605 }
25606 @@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25607 regs->flags &= ~X86_EFLAGS_IF;
25608 /* single step inline if the instruction is an int3 */
25609 if (p->opcode == BREAKPOINT_INSTRUCTION)
25610 - regs->ip = (unsigned long)p->addr;
25611 + regs->ip = ktla_ktva((unsigned long)p->addr);
25612 else
25613 - regs->ip = (unsigned long)p->ainsn.insn;
25614 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25615 }
25616 NOKPROBE_SYMBOL(setup_singlestep);
25617
25618 @@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25619 struct kprobe *p;
25620 struct kprobe_ctlblk *kcb;
25621
25622 - if (user_mode_vm(regs))
25623 + if (user_mode(regs))
25624 return 0;
25625
25626 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25627 @@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25628 setup_singlestep(p, regs, kcb, 0);
25629 return 1;
25630 }
25631 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
25632 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25633 /*
25634 * The breakpoint instruction was removed right
25635 * after we hit it. Another cpu has removed
25636 @@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25637 " movq %rax, 152(%rsp)\n"
25638 RESTORE_REGS_STRING
25639 " popfq\n"
25640 +#ifdef KERNEXEC_PLUGIN
25641 + " btsq $63,(%rsp)\n"
25642 +#endif
25643 #else
25644 " pushf\n"
25645 SAVE_REGS_STRING
25646 @@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25647 struct kprobe_ctlblk *kcb)
25648 {
25649 unsigned long *tos = stack_addr(regs);
25650 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25651 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25652 unsigned long orig_ip = (unsigned long)p->addr;
25653 kprobe_opcode_t *insn = p->ainsn.insn;
25654
25655 @@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25656 struct die_args *args = data;
25657 int ret = NOTIFY_DONE;
25658
25659 - if (args->regs && user_mode_vm(args->regs))
25660 + if (args->regs && user_mode(args->regs))
25661 return ret;
25662
25663 if (val == DIE_GPF) {
25664 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25665 index f1314d0..15f3154 100644
25666 --- a/arch/x86/kernel/kprobes/opt.c
25667 +++ b/arch/x86/kernel/kprobes/opt.c
25668 @@ -79,6 +79,7 @@ found:
25669 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25670 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25671 {
25672 + pax_open_kernel();
25673 #ifdef CONFIG_X86_64
25674 *addr++ = 0x48;
25675 *addr++ = 0xbf;
25676 @@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25677 *addr++ = 0xb8;
25678 #endif
25679 *(unsigned long *)addr = val;
25680 + pax_close_kernel();
25681 }
25682
25683 asm (
25684 @@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25685 * Verify if the address gap is in 2GB range, because this uses
25686 * a relative jump.
25687 */
25688 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25689 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25690 if (abs(rel) > 0x7fffffff) {
25691 __arch_remove_optimized_kprobe(op, 0);
25692 return -ERANGE;
25693 @@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25694 op->optinsn.size = ret;
25695
25696 /* Copy arch-dep-instance from template */
25697 - memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25698 + pax_open_kernel();
25699 + memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25700 + pax_close_kernel();
25701
25702 /* Set probe information */
25703 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25704
25705 /* Set probe function call */
25706 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25707 + synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25708
25709 /* Set returning jmp instruction at the tail of out-of-line buffer */
25710 - synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25711 + synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25712 (u8 *)op->kp.addr + op->optinsn.size);
25713
25714 flush_icache_range((unsigned long) buf,
25715 @@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25716 WARN_ON(kprobe_disabled(&op->kp));
25717
25718 /* Backup instructions which will be replaced by jump address */
25719 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25720 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25721 RELATIVE_ADDR_SIZE);
25722
25723 insn_buf[0] = RELATIVEJUMP_OPCODE;
25724 @@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25725 /* This kprobe is really able to run optimized path. */
25726 op = container_of(p, struct optimized_kprobe, kp);
25727 /* Detour through copied instructions */
25728 - regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25729 + regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25730 if (!reenter)
25731 reset_current_kprobe();
25732 preempt_enable_no_resched();
25733 diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25734 index c2bedae..25e7ab60 100644
25735 --- a/arch/x86/kernel/ksysfs.c
25736 +++ b/arch/x86/kernel/ksysfs.c
25737 @@ -184,7 +184,7 @@ out:
25738
25739 static struct kobj_attribute type_attr = __ATTR_RO(type);
25740
25741 -static struct bin_attribute data_attr = {
25742 +static bin_attribute_no_const data_attr __read_only = {
25743 .attr = {
25744 .name = "data",
25745 .mode = S_IRUGO,
25746 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25747 index c37886d..d851d32 100644
25748 --- a/arch/x86/kernel/ldt.c
25749 +++ b/arch/x86/kernel/ldt.c
25750 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25751 if (reload) {
25752 #ifdef CONFIG_SMP
25753 preempt_disable();
25754 - load_LDT(pc);
25755 + load_LDT_nolock(pc);
25756 if (!cpumask_equal(mm_cpumask(current->mm),
25757 cpumask_of(smp_processor_id())))
25758 smp_call_function(flush_ldt, current->mm, 1);
25759 preempt_enable();
25760 #else
25761 - load_LDT(pc);
25762 + load_LDT_nolock(pc);
25763 #endif
25764 }
25765 if (oldsize) {
25766 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25767 return err;
25768
25769 for (i = 0; i < old->size; i++)
25770 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25771 + write_ldt_entry(new->ldt, i, old->ldt + i);
25772 return 0;
25773 }
25774
25775 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25776 retval = copy_ldt(&mm->context, &old_mm->context);
25777 mutex_unlock(&old_mm->context.lock);
25778 }
25779 +
25780 + if (tsk == current) {
25781 + mm->context.vdso = 0;
25782 +
25783 +#ifdef CONFIG_X86_32
25784 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25785 + mm->context.user_cs_base = 0UL;
25786 + mm->context.user_cs_limit = ~0UL;
25787 +
25788 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25789 + cpus_clear(mm->context.cpu_user_cs_mask);
25790 +#endif
25791 +
25792 +#endif
25793 +#endif
25794 +
25795 + }
25796 +
25797 return retval;
25798 }
25799
25800 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25801 }
25802 }
25803
25804 +#ifdef CONFIG_PAX_SEGMEXEC
25805 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25806 + error = -EINVAL;
25807 + goto out_unlock;
25808 + }
25809 +#endif
25810 +
25811 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25812 error = -EINVAL;
25813 goto out_unlock;
25814 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25815 index 72e8e31..f2f1605 100644
25816 --- a/arch/x86/kernel/machine_kexec_32.c
25817 +++ b/arch/x86/kernel/machine_kexec_32.c
25818 @@ -25,7 +25,7 @@
25819 #include <asm/cacheflush.h>
25820 #include <asm/debugreg.h>
25821
25822 -static void set_idt(void *newidt, __u16 limit)
25823 +static void set_idt(struct desc_struct *newidt, __u16 limit)
25824 {
25825 struct desc_ptr curidt;
25826
25827 @@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25828 }
25829
25830
25831 -static void set_gdt(void *newgdt, __u16 limit)
25832 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25833 {
25834 struct desc_ptr curgdt;
25835
25836 @@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25837 }
25838
25839 control_page = page_address(image->control_code_page);
25840 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25841 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25842
25843 relocate_kernel_ptr = control_page;
25844 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25845 diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25846 index c73aecf..4c63630 100644
25847 --- a/arch/x86/kernel/mcount_64.S
25848 +++ b/arch/x86/kernel/mcount_64.S
25849 @@ -7,7 +7,7 @@
25850 #include <linux/linkage.h>
25851 #include <asm/ptrace.h>
25852 #include <asm/ftrace.h>
25853 -
25854 +#include <asm/alternative-asm.h>
25855
25856 .code64
25857 .section .entry.text, "ax"
25858 @@ -24,8 +24,9 @@
25859 #ifdef CONFIG_DYNAMIC_FTRACE
25860
25861 ENTRY(function_hook)
25862 + pax_force_retaddr
25863 retq
25864 -END(function_hook)
25865 +ENDPROC(function_hook)
25866
25867 /* skip is set if stack has been adjusted */
25868 .macro ftrace_caller_setup skip=0
25869 @@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25870 #endif
25871
25872 GLOBAL(ftrace_stub)
25873 + pax_force_retaddr
25874 retq
25875 -END(ftrace_caller)
25876 +ENDPROC(ftrace_caller)
25877
25878 ENTRY(ftrace_regs_caller)
25879 /* Save the current flags before compare (in SS location)*/
25880 @@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25881 popfq
25882 jmp ftrace_stub
25883
25884 -END(ftrace_regs_caller)
25885 +ENDPROC(ftrace_regs_caller)
25886
25887
25888 #else /* ! CONFIG_DYNAMIC_FTRACE */
25889 @@ -145,6 +147,7 @@ ENTRY(function_hook)
25890 #endif
25891
25892 GLOBAL(ftrace_stub)
25893 + pax_force_retaddr
25894 retq
25895
25896 trace:
25897 @@ -158,12 +161,13 @@ trace:
25898 #endif
25899 subq $MCOUNT_INSN_SIZE, %rdi
25900
25901 + pax_force_fptr ftrace_trace_function
25902 call *ftrace_trace_function
25903
25904 MCOUNT_RESTORE_FRAME
25905
25906 jmp ftrace_stub
25907 -END(function_hook)
25908 +ENDPROC(function_hook)
25909 #endif /* CONFIG_DYNAMIC_FTRACE */
25910 #endif /* CONFIG_FUNCTION_TRACER */
25911
25912 @@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25913
25914 MCOUNT_RESTORE_FRAME
25915
25916 + pax_force_retaddr
25917 retq
25918 -END(ftrace_graph_caller)
25919 +ENDPROC(ftrace_graph_caller)
25920
25921 GLOBAL(return_to_handler)
25922 subq $24, %rsp
25923 @@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25924 movq 8(%rsp), %rdx
25925 movq (%rsp), %rax
25926 addq $24, %rsp
25927 + pax_force_fptr %rdi
25928 jmp *%rdi
25929 +ENDPROC(return_to_handler)
25930 #endif
25931 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25932 index e69f988..da078ea 100644
25933 --- a/arch/x86/kernel/module.c
25934 +++ b/arch/x86/kernel/module.c
25935 @@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25936 }
25937 #endif
25938
25939 -void *module_alloc(unsigned long size)
25940 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25941 {
25942 - if (PAGE_ALIGN(size) > MODULES_LEN)
25943 + if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25944 return NULL;
25945 return __vmalloc_node_range(size, 1,
25946 MODULES_VADDR + get_module_load_offset(),
25947 - MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25948 - PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25949 + MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25950 + prot, NUMA_NO_NODE,
25951 __builtin_return_address(0));
25952 }
25953
25954 +void *module_alloc(unsigned long size)
25955 +{
25956 +
25957 +#ifdef CONFIG_PAX_KERNEXEC
25958 + return __module_alloc(size, PAGE_KERNEL);
25959 +#else
25960 + return __module_alloc(size, PAGE_KERNEL_EXEC);
25961 +#endif
25962 +
25963 +}
25964 +
25965 +#ifdef CONFIG_PAX_KERNEXEC
25966 +#ifdef CONFIG_X86_32
25967 +void *module_alloc_exec(unsigned long size)
25968 +{
25969 + struct vm_struct *area;
25970 +
25971 + if (size == 0)
25972 + return NULL;
25973 +
25974 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25975 +return area ? area->addr : NULL;
25976 +}
25977 +EXPORT_SYMBOL(module_alloc_exec);
25978 +
25979 +void module_free_exec(struct module *mod, void *module_region)
25980 +{
25981 + vunmap(module_region);
25982 +}
25983 +EXPORT_SYMBOL(module_free_exec);
25984 +#else
25985 +void module_free_exec(struct module *mod, void *module_region)
25986 +{
25987 + module_free(mod, module_region);
25988 +}
25989 +EXPORT_SYMBOL(module_free_exec);
25990 +
25991 +void *module_alloc_exec(unsigned long size)
25992 +{
25993 + return __module_alloc(size, PAGE_KERNEL_RX);
25994 +}
25995 +EXPORT_SYMBOL(module_alloc_exec);
25996 +#endif
25997 +#endif
25998 +
25999 #ifdef CONFIG_X86_32
26000 int apply_relocate(Elf32_Shdr *sechdrs,
26001 const char *strtab,
26002 @@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26003 unsigned int i;
26004 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26005 Elf32_Sym *sym;
26006 - uint32_t *location;
26007 + uint32_t *plocation, location;
26008
26009 DEBUGP("Applying relocate section %u to %u\n",
26010 relsec, sechdrs[relsec].sh_info);
26011 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26012 /* This is where to make the change */
26013 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26014 - + rel[i].r_offset;
26015 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26016 + location = (uint32_t)plocation;
26017 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26018 + plocation = ktla_ktva((void *)plocation);
26019 /* This is the symbol it is referring to. Note that all
26020 undefined symbols have been resolved. */
26021 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26022 @@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26023 switch (ELF32_R_TYPE(rel[i].r_info)) {
26024 case R_386_32:
26025 /* We add the value into the location given */
26026 - *location += sym->st_value;
26027 + pax_open_kernel();
26028 + *plocation += sym->st_value;
26029 + pax_close_kernel();
26030 break;
26031 case R_386_PC32:
26032 /* Add the value, subtract its position */
26033 - *location += sym->st_value - (uint32_t)location;
26034 + pax_open_kernel();
26035 + *plocation += sym->st_value - location;
26036 + pax_close_kernel();
26037 break;
26038 default:
26039 pr_err("%s: Unknown relocation: %u\n",
26040 @@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26041 case R_X86_64_NONE:
26042 break;
26043 case R_X86_64_64:
26044 + pax_open_kernel();
26045 *(u64 *)loc = val;
26046 + pax_close_kernel();
26047 break;
26048 case R_X86_64_32:
26049 + pax_open_kernel();
26050 *(u32 *)loc = val;
26051 + pax_close_kernel();
26052 if (val != *(u32 *)loc)
26053 goto overflow;
26054 break;
26055 case R_X86_64_32S:
26056 + pax_open_kernel();
26057 *(s32 *)loc = val;
26058 + pax_close_kernel();
26059 if ((s64)val != *(s32 *)loc)
26060 goto overflow;
26061 break;
26062 case R_X86_64_PC32:
26063 val -= (u64)loc;
26064 + pax_open_kernel();
26065 *(u32 *)loc = val;
26066 + pax_close_kernel();
26067 +
26068 #if 0
26069 if ((s64)val != *(s32 *)loc)
26070 goto overflow;
26071 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26072 index c9603ac..9f88728 100644
26073 --- a/arch/x86/kernel/msr.c
26074 +++ b/arch/x86/kernel/msr.c
26075 @@ -37,6 +37,7 @@
26076 #include <linux/notifier.h>
26077 #include <linux/uaccess.h>
26078 #include <linux/gfp.h>
26079 +#include <linux/grsecurity.h>
26080
26081 #include <asm/processor.h>
26082 #include <asm/msr.h>
26083 @@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26084 int err = 0;
26085 ssize_t bytes = 0;
26086
26087 +#ifdef CONFIG_GRKERNSEC_KMEM
26088 + gr_handle_msr_write();
26089 + return -EPERM;
26090 +#endif
26091 +
26092 if (count % 8)
26093 return -EINVAL; /* Invalid chunk size */
26094
26095 @@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26096 err = -EBADF;
26097 break;
26098 }
26099 +#ifdef CONFIG_GRKERNSEC_KMEM
26100 + gr_handle_msr_write();
26101 + return -EPERM;
26102 +#endif
26103 if (copy_from_user(&regs, uregs, sizeof regs)) {
26104 err = -EFAULT;
26105 break;
26106 @@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26107 return notifier_from_errno(err);
26108 }
26109
26110 -static struct notifier_block __refdata msr_class_cpu_notifier = {
26111 +static struct notifier_block msr_class_cpu_notifier = {
26112 .notifier_call = msr_class_cpu_callback,
26113 };
26114
26115 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26116 index c3e985d..110a36a 100644
26117 --- a/arch/x86/kernel/nmi.c
26118 +++ b/arch/x86/kernel/nmi.c
26119 @@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26120
26121 static void nmi_max_handler(struct irq_work *w)
26122 {
26123 - struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26124 + struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26125 int remainder_ns, decimal_msecs;
26126 - u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26127 + u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26128
26129 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26130 decimal_msecs = remainder_ns / 1000;
26131
26132 printk_ratelimited(KERN_INFO
26133 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26134 - a->handler, whole_msecs, decimal_msecs);
26135 + n->action->handler, whole_msecs, decimal_msecs);
26136 }
26137
26138 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26139 @@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26140 delta = sched_clock() - delta;
26141 trace_nmi_handler(a->handler, (int)delta, thishandled);
26142
26143 - if (delta < nmi_longest_ns || delta < a->max_duration)
26144 + if (delta < nmi_longest_ns || delta < a->work->max_duration)
26145 continue;
26146
26147 - a->max_duration = delta;
26148 - irq_work_queue(&a->irq_work);
26149 + a->work->max_duration = delta;
26150 + irq_work_queue(&a->work->irq_work);
26151 }
26152
26153 rcu_read_unlock();
26154 @@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26155 }
26156 NOKPROBE_SYMBOL(nmi_handle);
26157
26158 -int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26159 +int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26160 {
26161 struct nmi_desc *desc = nmi_to_desc(type);
26162 unsigned long flags;
26163 @@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26164 if (!action->handler)
26165 return -EINVAL;
26166
26167 - init_irq_work(&action->irq_work, nmi_max_handler);
26168 + action->work->action = action;
26169 + init_irq_work(&action->work->irq_work, nmi_max_handler);
26170
26171 spin_lock_irqsave(&desc->lock, flags);
26172
26173 @@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26174 * event confuses some handlers (kdump uses this flag)
26175 */
26176 if (action->flags & NMI_FLAG_FIRST)
26177 - list_add_rcu(&action->list, &desc->head);
26178 + pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26179 else
26180 - list_add_tail_rcu(&action->list, &desc->head);
26181 + pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26182
26183 spin_unlock_irqrestore(&desc->lock, flags);
26184 return 0;
26185 @@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26186 if (!strcmp(n->name, name)) {
26187 WARN(in_nmi(),
26188 "Trying to free NMI (%s) from NMI context!\n", n->name);
26189 - list_del_rcu(&n->list);
26190 + pax_list_del_rcu((struct list_head *)&n->list);
26191 break;
26192 }
26193 }
26194 @@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26195 dotraplinkage notrace void
26196 do_nmi(struct pt_regs *regs, long error_code)
26197 {
26198 +
26199 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26200 + if (!user_mode(regs)) {
26201 + unsigned long cs = regs->cs & 0xFFFF;
26202 + unsigned long ip = ktva_ktla(regs->ip);
26203 +
26204 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26205 + regs->ip = ip;
26206 + }
26207 +#endif
26208 +
26209 nmi_nesting_preprocess(regs);
26210
26211 nmi_enter();
26212 diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26213 index 6d9582e..f746287 100644
26214 --- a/arch/x86/kernel/nmi_selftest.c
26215 +++ b/arch/x86/kernel/nmi_selftest.c
26216 @@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26217 {
26218 /* trap all the unknown NMIs we may generate */
26219 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26220 - __initdata);
26221 + __initconst);
26222 }
26223
26224 static void __init cleanup_nmi_testsuite(void)
26225 @@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26226 unsigned long timeout;
26227
26228 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26229 - NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26230 + NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26231 nmi_fail = FAILURE;
26232 return;
26233 }
26234 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26235 index bbb6c73..24a58ef 100644
26236 --- a/arch/x86/kernel/paravirt-spinlocks.c
26237 +++ b/arch/x86/kernel/paravirt-spinlocks.c
26238 @@ -8,7 +8,7 @@
26239
26240 #include <asm/paravirt.h>
26241
26242 -struct pv_lock_ops pv_lock_ops = {
26243 +struct pv_lock_ops pv_lock_ops __read_only = {
26244 #ifdef CONFIG_SMP
26245 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26246 .unlock_kick = paravirt_nop,
26247 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26248 index 548d25f..f8fb99c 100644
26249 --- a/arch/x86/kernel/paravirt.c
26250 +++ b/arch/x86/kernel/paravirt.c
26251 @@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26252 {
26253 return x;
26254 }
26255 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26256 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26257 +#endif
26258
26259 void __init default_banner(void)
26260 {
26261 @@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26262
26263 if (opfunc == NULL)
26264 /* If there's no function, patch it with a ud2a (BUG) */
26265 - ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26266 - else if (opfunc == _paravirt_nop)
26267 + ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26268 + else if (opfunc == (void *)_paravirt_nop)
26269 /* If the operation is a nop, then nop the callsite */
26270 ret = paravirt_patch_nop();
26271
26272 /* identity functions just return their single argument */
26273 - else if (opfunc == _paravirt_ident_32)
26274 + else if (opfunc == (void *)_paravirt_ident_32)
26275 ret = paravirt_patch_ident_32(insnbuf, len);
26276 - else if (opfunc == _paravirt_ident_64)
26277 + else if (opfunc == (void *)_paravirt_ident_64)
26278 ret = paravirt_patch_ident_64(insnbuf, len);
26279 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26280 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26281 + ret = paravirt_patch_ident_64(insnbuf, len);
26282 +#endif
26283
26284 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26285 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26286 @@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26287 if (insn_len > len || start == NULL)
26288 insn_len = len;
26289 else
26290 - memcpy(insnbuf, start, insn_len);
26291 + memcpy(insnbuf, ktla_ktva(start), insn_len);
26292
26293 return insn_len;
26294 }
26295 @@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26296 return this_cpu_read(paravirt_lazy_mode);
26297 }
26298
26299 -struct pv_info pv_info = {
26300 +struct pv_info pv_info __read_only = {
26301 .name = "bare hardware",
26302 .paravirt_enabled = 0,
26303 .kernel_rpl = 0,
26304 @@ -311,16 +318,16 @@ struct pv_info pv_info = {
26305 #endif
26306 };
26307
26308 -struct pv_init_ops pv_init_ops = {
26309 +struct pv_init_ops pv_init_ops __read_only = {
26310 .patch = native_patch,
26311 };
26312
26313 -struct pv_time_ops pv_time_ops = {
26314 +struct pv_time_ops pv_time_ops __read_only = {
26315 .sched_clock = native_sched_clock,
26316 .steal_clock = native_steal_clock,
26317 };
26318
26319 -__visible struct pv_irq_ops pv_irq_ops = {
26320 +__visible struct pv_irq_ops pv_irq_ops __read_only = {
26321 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26322 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26323 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26324 @@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26325 #endif
26326 };
26327
26328 -__visible struct pv_cpu_ops pv_cpu_ops = {
26329 +__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26330 .cpuid = native_cpuid,
26331 .get_debugreg = native_get_debugreg,
26332 .set_debugreg = native_set_debugreg,
26333 @@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26334 NOKPROBE_SYMBOL(native_set_debugreg);
26335 NOKPROBE_SYMBOL(native_load_idt);
26336
26337 -struct pv_apic_ops pv_apic_ops = {
26338 +struct pv_apic_ops pv_apic_ops __read_only= {
26339 #ifdef CONFIG_X86_LOCAL_APIC
26340 .startup_ipi_hook = paravirt_nop,
26341 #endif
26342 };
26343
26344 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26345 +#ifdef CONFIG_X86_32
26346 +#ifdef CONFIG_X86_PAE
26347 +/* 64-bit pagetable entries */
26348 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26349 +#else
26350 /* 32-bit pagetable entries */
26351 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26352 +#endif
26353 #else
26354 /* 64-bit pagetable entries */
26355 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26356 #endif
26357
26358 -struct pv_mmu_ops pv_mmu_ops = {
26359 +struct pv_mmu_ops pv_mmu_ops __read_only = {
26360
26361 .read_cr2 = native_read_cr2,
26362 .write_cr2 = native_write_cr2,
26363 @@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26364 .make_pud = PTE_IDENT,
26365
26366 .set_pgd = native_set_pgd,
26367 + .set_pgd_batched = native_set_pgd_batched,
26368 #endif
26369 #endif /* PAGETABLE_LEVELS >= 3 */
26370
26371 @@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26372 },
26373
26374 .set_fixmap = native_set_fixmap,
26375 +
26376 +#ifdef CONFIG_PAX_KERNEXEC
26377 + .pax_open_kernel = native_pax_open_kernel,
26378 + .pax_close_kernel = native_pax_close_kernel,
26379 +#endif
26380 +
26381 };
26382
26383 EXPORT_SYMBOL_GPL(pv_time_ops);
26384 diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26385 index a1da673..b6f5831 100644
26386 --- a/arch/x86/kernel/paravirt_patch_64.c
26387 +++ b/arch/x86/kernel/paravirt_patch_64.c
26388 @@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26389 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26390 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26391 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26392 +
26393 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26394 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26395 +#endif
26396 +
26397 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26398 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26399
26400 @@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26401 PATCH_SITE(pv_mmu_ops, read_cr3);
26402 PATCH_SITE(pv_mmu_ops, write_cr3);
26403 PATCH_SITE(pv_cpu_ops, clts);
26404 +
26405 +#ifndef CONFIG_PAX_MEMORY_UDEREF
26406 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26407 +#endif
26408 +
26409 PATCH_SITE(pv_cpu_ops, wbinvd);
26410
26411 patch_site:
26412 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26413 index 0497f71..7186c0d 100644
26414 --- a/arch/x86/kernel/pci-calgary_64.c
26415 +++ b/arch/x86/kernel/pci-calgary_64.c
26416 @@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26417 tce_space = be64_to_cpu(readq(target));
26418 tce_space = tce_space & TAR_SW_BITS;
26419
26420 - tce_space = tce_space & (~specified_table_size);
26421 + tce_space = tce_space & (~(unsigned long)specified_table_size);
26422 info->tce_space = (u64 *)__va(tce_space);
26423 }
26424 }
26425 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26426 index 35ccf75..7a15747 100644
26427 --- a/arch/x86/kernel/pci-iommu_table.c
26428 +++ b/arch/x86/kernel/pci-iommu_table.c
26429 @@ -2,7 +2,7 @@
26430 #include <asm/iommu_table.h>
26431 #include <linux/string.h>
26432 #include <linux/kallsyms.h>
26433 -
26434 +#include <linux/sched.h>
26435
26436 #define DEBUG 1
26437
26438 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26439 index 77dd0ad..9ec4723 100644
26440 --- a/arch/x86/kernel/pci-swiotlb.c
26441 +++ b/arch/x86/kernel/pci-swiotlb.c
26442 @@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26443 struct dma_attrs *attrs)
26444 {
26445 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26446 - swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26447 + swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26448 else
26449 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26450 }
26451 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26452 index e127dda..94e384d 100644
26453 --- a/arch/x86/kernel/process.c
26454 +++ b/arch/x86/kernel/process.c
26455 @@ -36,7 +36,8 @@
26456 * section. Since TSS's are completely CPU-local, we want them
26457 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26458 */
26459 -__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26460 +struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26461 +EXPORT_SYMBOL(init_tss);
26462
26463 #ifdef CONFIG_X86_64
26464 static DEFINE_PER_CPU(unsigned char, is_idle);
26465 @@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26466 task_xstate_cachep =
26467 kmem_cache_create("task_xstate", xstate_size,
26468 __alignof__(union thread_xstate),
26469 - SLAB_PANIC | SLAB_NOTRACK, NULL);
26470 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26471 setup_xstate_comp();
26472 }
26473
26474 @@ -108,7 +109,7 @@ void exit_thread(void)
26475 unsigned long *bp = t->io_bitmap_ptr;
26476
26477 if (bp) {
26478 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26479 + struct tss_struct *tss = init_tss + get_cpu();
26480
26481 t->io_bitmap_ptr = NULL;
26482 clear_thread_flag(TIF_IO_BITMAP);
26483 @@ -128,6 +129,9 @@ void flush_thread(void)
26484 {
26485 struct task_struct *tsk = current;
26486
26487 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26488 + loadsegment(gs, 0);
26489 +#endif
26490 flush_ptrace_hw_breakpoint(tsk);
26491 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26492 drop_init_fpu(tsk);
26493 @@ -274,7 +278,7 @@ static void __exit_idle(void)
26494 void exit_idle(void)
26495 {
26496 /* idle loop has pid 0 */
26497 - if (current->pid)
26498 + if (task_pid_nr(current))
26499 return;
26500 __exit_idle();
26501 }
26502 @@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26503 return ret;
26504 }
26505 #endif
26506 -void stop_this_cpu(void *dummy)
26507 +__noreturn void stop_this_cpu(void *dummy)
26508 {
26509 local_irq_disable();
26510 /*
26511 @@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26512 }
26513 early_param("idle", idle_setup);
26514
26515 -unsigned long arch_align_stack(unsigned long sp)
26516 +#ifdef CONFIG_PAX_RANDKSTACK
26517 +void pax_randomize_kstack(struct pt_regs *regs)
26518 {
26519 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26520 - sp -= get_random_int() % 8192;
26521 - return sp & ~0xf;
26522 -}
26523 + struct thread_struct *thread = &current->thread;
26524 + unsigned long time;
26525
26526 -unsigned long arch_randomize_brk(struct mm_struct *mm)
26527 -{
26528 - unsigned long range_end = mm->brk + 0x02000000;
26529 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26530 -}
26531 + if (!randomize_va_space)
26532 + return;
26533 +
26534 + if (v8086_mode(regs))
26535 + return;
26536
26537 + rdtscl(time);
26538 +
26539 + /* P4 seems to return a 0 LSB, ignore it */
26540 +#ifdef CONFIG_MPENTIUM4
26541 + time &= 0x3EUL;
26542 + time <<= 2;
26543 +#elif defined(CONFIG_X86_64)
26544 + time &= 0xFUL;
26545 + time <<= 4;
26546 +#else
26547 + time &= 0x1FUL;
26548 + time <<= 3;
26549 +#endif
26550 +
26551 + thread->sp0 ^= time;
26552 + load_sp0(init_tss + smp_processor_id(), thread);
26553 +
26554 +#ifdef CONFIG_X86_64
26555 + this_cpu_write(kernel_stack, thread->sp0);
26556 +#endif
26557 +}
26558 +#endif
26559 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26560 index 8f3ebfe..cbc731b 100644
26561 --- a/arch/x86/kernel/process_32.c
26562 +++ b/arch/x86/kernel/process_32.c
26563 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26564 unsigned long thread_saved_pc(struct task_struct *tsk)
26565 {
26566 return ((unsigned long *)tsk->thread.sp)[3];
26567 +//XXX return tsk->thread.eip;
26568 }
26569
26570 void __show_regs(struct pt_regs *regs, int all)
26571 @@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26572 unsigned long sp;
26573 unsigned short ss, gs;
26574
26575 - if (user_mode_vm(regs)) {
26576 + if (user_mode(regs)) {
26577 sp = regs->sp;
26578 ss = regs->ss & 0xffff;
26579 - gs = get_user_gs(regs);
26580 } else {
26581 sp = kernel_stack_pointer(regs);
26582 savesegment(ss, ss);
26583 - savesegment(gs, gs);
26584 }
26585 + gs = get_user_gs(regs);
26586
26587 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26588 (u16)regs->cs, regs->ip, regs->flags,
26589 - smp_processor_id());
26590 + raw_smp_processor_id());
26591 print_symbol("EIP is at %s\n", regs->ip);
26592
26593 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26594 @@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26595 int copy_thread(unsigned long clone_flags, unsigned long sp,
26596 unsigned long arg, struct task_struct *p)
26597 {
26598 - struct pt_regs *childregs = task_pt_regs(p);
26599 + struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26600 struct task_struct *tsk;
26601 int err;
26602
26603 p->thread.sp = (unsigned long) childregs;
26604 p->thread.sp0 = (unsigned long) (childregs+1);
26605 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26606 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26607
26608 if (unlikely(p->flags & PF_KTHREAD)) {
26609 /* kernel thread */
26610 memset(childregs, 0, sizeof(struct pt_regs));
26611 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26612 - task_user_gs(p) = __KERNEL_STACK_CANARY;
26613 - childregs->ds = __USER_DS;
26614 - childregs->es = __USER_DS;
26615 + savesegment(gs, childregs->gs);
26616 + childregs->ds = __KERNEL_DS;
26617 + childregs->es = __KERNEL_DS;
26618 childregs->fs = __KERNEL_PERCPU;
26619 childregs->bx = sp; /* function */
26620 childregs->bp = arg;
26621 @@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26622 struct thread_struct *prev = &prev_p->thread,
26623 *next = &next_p->thread;
26624 int cpu = smp_processor_id();
26625 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26626 + struct tss_struct *tss = init_tss + cpu;
26627 fpu_switch_t fpu;
26628
26629 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26630 @@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26631 */
26632 lazy_save_gs(prev->gs);
26633
26634 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26635 + __set_fs(task_thread_info(next_p)->addr_limit);
26636 +#endif
26637 +
26638 /*
26639 * Load the per-thread Thread-Local Storage descriptor.
26640 */
26641 @@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26642 */
26643 arch_end_context_switch(next_p);
26644
26645 - this_cpu_write(kernel_stack,
26646 - (unsigned long)task_stack_page(next_p) +
26647 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26648 + this_cpu_write(current_task, next_p);
26649 + this_cpu_write(current_tinfo, &next_p->tinfo);
26650 + this_cpu_write(kernel_stack, next->sp0);
26651
26652 /*
26653 * Restore %gs if needed (which is common)
26654 @@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26655
26656 switch_fpu_finish(next_p, fpu);
26657
26658 - this_cpu_write(current_task, next_p);
26659 -
26660 return prev_p;
26661 }
26662
26663 @@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26664 } while (count++ < 16);
26665 return 0;
26666 }
26667 -
26668 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26669 index 5a2c029..ec8611d 100644
26670 --- a/arch/x86/kernel/process_64.c
26671 +++ b/arch/x86/kernel/process_64.c
26672 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26673 struct pt_regs *childregs;
26674 struct task_struct *me = current;
26675
26676 - p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26677 + p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26678 childregs = task_pt_regs(p);
26679 p->thread.sp = (unsigned long) childregs;
26680 p->thread.usersp = me->thread.usersp;
26681 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26682 set_tsk_thread_flag(p, TIF_FORK);
26683 p->thread.io_bitmap_ptr = NULL;
26684
26685 @@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26686 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26687 savesegment(es, p->thread.es);
26688 savesegment(ds, p->thread.ds);
26689 + savesegment(ss, p->thread.ss);
26690 + BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26691 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26692
26693 if (unlikely(p->flags & PF_KTHREAD)) {
26694 @@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26695 struct thread_struct *prev = &prev_p->thread;
26696 struct thread_struct *next = &next_p->thread;
26697 int cpu = smp_processor_id();
26698 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26699 + struct tss_struct *tss = init_tss + cpu;
26700 unsigned fsindex, gsindex;
26701 fpu_switch_t fpu;
26702
26703 @@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26704 if (unlikely(next->ds | prev->ds))
26705 loadsegment(ds, next->ds);
26706
26707 + savesegment(ss, prev->ss);
26708 + if (unlikely(next->ss != prev->ss))
26709 + loadsegment(ss, next->ss);
26710 +
26711 /*
26712 * Switch FS and GS.
26713 *
26714 @@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26715 prev->usersp = this_cpu_read(old_rsp);
26716 this_cpu_write(old_rsp, next->usersp);
26717 this_cpu_write(current_task, next_p);
26718 + this_cpu_write(current_tinfo, &next_p->tinfo);
26719
26720 /*
26721 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26722 @@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26723 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26724 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26725
26726 - this_cpu_write(kernel_stack,
26727 - (unsigned long)task_stack_page(next_p) +
26728 - THREAD_SIZE - KERNEL_STACK_OFFSET);
26729 + this_cpu_write(kernel_stack, next->sp0);
26730
26731 /*
26732 * Now maybe reload the debug registers and handle I/O bitmaps
26733 @@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26734 if (!p || p == current || p->state == TASK_RUNNING)
26735 return 0;
26736 stack = (unsigned long)task_stack_page(p);
26737 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26738 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26739 return 0;
26740 fp = *(u64 *)(p->thread.sp);
26741 do {
26742 - if (fp < (unsigned long)stack ||
26743 - fp >= (unsigned long)stack+THREAD_SIZE)
26744 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26745 return 0;
26746 ip = *(u64 *)(fp+8);
26747 if (!in_sched_functions(ip))
26748 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26749 index e510618..5165ac0 100644
26750 --- a/arch/x86/kernel/ptrace.c
26751 +++ b/arch/x86/kernel/ptrace.c
26752 @@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26753 unsigned long sp = (unsigned long)&regs->sp;
26754 u32 *prev_esp;
26755
26756 - if (context == (sp & ~(THREAD_SIZE - 1)))
26757 + if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26758 return sp;
26759
26760 - prev_esp = (u32 *)(context);
26761 + prev_esp = *(u32 **)(context);
26762 if (prev_esp)
26763 return (unsigned long)prev_esp;
26764
26765 @@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26766 if (child->thread.gs != value)
26767 return do_arch_prctl(child, ARCH_SET_GS, value);
26768 return 0;
26769 +
26770 + case offsetof(struct user_regs_struct,ip):
26771 + /*
26772 + * Protect against any attempt to set ip to an
26773 + * impossible address. There are dragons lurking if the
26774 + * address is noncanonical. (This explicitly allows
26775 + * setting ip to TASK_SIZE_MAX, because user code can do
26776 + * that all by itself by running off the end of its
26777 + * address space.
26778 + */
26779 + if (value > TASK_SIZE_MAX)
26780 + return -EIO;
26781 + break;
26782 +
26783 #endif
26784 }
26785
26786 @@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26787 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26788 {
26789 int i;
26790 - int dr7 = 0;
26791 + unsigned long dr7 = 0;
26792 struct arch_hw_breakpoint *info;
26793
26794 for (i = 0; i < HBP_NUM; i++) {
26795 @@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26796 unsigned long addr, unsigned long data)
26797 {
26798 int ret;
26799 - unsigned long __user *datap = (unsigned long __user *)data;
26800 + unsigned long __user *datap = (__force unsigned long __user *)data;
26801
26802 switch (request) {
26803 /* read the word at location addr in the USER area. */
26804 @@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26805 if ((int) addr < 0)
26806 return -EIO;
26807 ret = do_get_thread_area(child, addr,
26808 - (struct user_desc __user *)data);
26809 + (__force struct user_desc __user *) data);
26810 break;
26811
26812 case PTRACE_SET_THREAD_AREA:
26813 if ((int) addr < 0)
26814 return -EIO;
26815 ret = do_set_thread_area(child, addr,
26816 - (struct user_desc __user *)data, 0);
26817 + (__force struct user_desc __user *) data, 0);
26818 break;
26819 #endif
26820
26821 @@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26822
26823 #ifdef CONFIG_X86_64
26824
26825 -static struct user_regset x86_64_regsets[] __read_mostly = {
26826 +static user_regset_no_const x86_64_regsets[] __read_only = {
26827 [REGSET_GENERAL] = {
26828 .core_note_type = NT_PRSTATUS,
26829 .n = sizeof(struct user_regs_struct) / sizeof(long),
26830 @@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26831 #endif /* CONFIG_X86_64 */
26832
26833 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26834 -static struct user_regset x86_32_regsets[] __read_mostly = {
26835 +static user_regset_no_const x86_32_regsets[] __read_only = {
26836 [REGSET_GENERAL] = {
26837 .core_note_type = NT_PRSTATUS,
26838 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26839 @@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26840 */
26841 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26842
26843 -void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26844 +void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26845 {
26846 #ifdef CONFIG_X86_64
26847 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26848 @@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26849 memset(info, 0, sizeof(*info));
26850 info->si_signo = SIGTRAP;
26851 info->si_code = si_code;
26852 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26853 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26854 }
26855
26856 void user_single_step_siginfo(struct task_struct *tsk,
26857 @@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26858 }
26859 }
26860
26861 +#ifdef CONFIG_GRKERNSEC_SETXID
26862 +extern void gr_delayed_cred_worker(void);
26863 +#endif
26864 +
26865 /*
26866 * We can return 0 to resume the syscall or anything else to go to phase
26867 * 2. If we resume the syscall, we need to put something appropriate in
26868 @@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26869
26870 BUG_ON(regs != task_pt_regs(current));
26871
26872 +#ifdef CONFIG_GRKERNSEC_SETXID
26873 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26874 + gr_delayed_cred_worker();
26875 +#endif
26876 +
26877 /*
26878 * If we stepped into a sysenter/syscall insn, it trapped in
26879 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26880 @@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26881 */
26882 user_exit();
26883
26884 +#ifdef CONFIG_GRKERNSEC_SETXID
26885 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26886 + gr_delayed_cred_worker();
26887 +#endif
26888 +
26889 audit_syscall_exit(regs);
26890
26891 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26892 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26893 index 2f355d2..e75ed0a 100644
26894 --- a/arch/x86/kernel/pvclock.c
26895 +++ b/arch/x86/kernel/pvclock.c
26896 @@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26897 reset_hung_task_detector();
26898 }
26899
26900 -static atomic64_t last_value = ATOMIC64_INIT(0);
26901 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26902
26903 void pvclock_resume(void)
26904 {
26905 - atomic64_set(&last_value, 0);
26906 + atomic64_set_unchecked(&last_value, 0);
26907 }
26908
26909 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26910 @@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26911 * updating at the same time, and one of them could be slightly behind,
26912 * making the assumption that last_value always go forward fail to hold.
26913 */
26914 - last = atomic64_read(&last_value);
26915 + last = atomic64_read_unchecked(&last_value);
26916 do {
26917 if (ret < last)
26918 return last;
26919 - last = atomic64_cmpxchg(&last_value, last, ret);
26920 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26921 } while (unlikely(last != ret));
26922
26923 return ret;
26924 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26925 index 17962e6..47f55db 100644
26926 --- a/arch/x86/kernel/reboot.c
26927 +++ b/arch/x86/kernel/reboot.c
26928 @@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26929
26930 void __noreturn machine_real_restart(unsigned int type)
26931 {
26932 +
26933 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26934 + struct desc_struct *gdt;
26935 +#endif
26936 +
26937 local_irq_disable();
26938
26939 /*
26940 @@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26941
26942 /* Jump to the identity-mapped low memory code */
26943 #ifdef CONFIG_X86_32
26944 - asm volatile("jmpl *%0" : :
26945 +
26946 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26947 + gdt = get_cpu_gdt_table(smp_processor_id());
26948 + pax_open_kernel();
26949 +#ifdef CONFIG_PAX_MEMORY_UDEREF
26950 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26951 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26952 + loadsegment(ds, __KERNEL_DS);
26953 + loadsegment(es, __KERNEL_DS);
26954 + loadsegment(ss, __KERNEL_DS);
26955 +#endif
26956 +#ifdef CONFIG_PAX_KERNEXEC
26957 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26958 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26959 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26960 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26961 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26962 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26963 +#endif
26964 + pax_close_kernel();
26965 +#endif
26966 +
26967 + asm volatile("ljmpl *%0" : :
26968 "rm" (real_mode_header->machine_real_restart_asm),
26969 "a" (type));
26970 #else
26971 @@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26972 * This means that this function can never return, it can misbehave
26973 * by not rebooting properly and hanging.
26974 */
26975 -static void native_machine_emergency_restart(void)
26976 +static void __noreturn native_machine_emergency_restart(void)
26977 {
26978 int i;
26979 int attempt = 0;
26980 @@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26981 #endif
26982 }
26983
26984 -static void __machine_emergency_restart(int emergency)
26985 +static void __noreturn __machine_emergency_restart(int emergency)
26986 {
26987 reboot_emergency = emergency;
26988 machine_ops.emergency_restart();
26989 }
26990
26991 -static void native_machine_restart(char *__unused)
26992 +static void __noreturn native_machine_restart(char *__unused)
26993 {
26994 pr_notice("machine restart\n");
26995
26996 @@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
26997 __machine_emergency_restart(0);
26998 }
26999
27000 -static void native_machine_halt(void)
27001 +static void __noreturn native_machine_halt(void)
27002 {
27003 /* Stop other cpus and apics */
27004 machine_shutdown();
27005 @@ -645,7 +672,7 @@ static void native_machine_halt(void)
27006 stop_this_cpu(NULL);
27007 }
27008
27009 -static void native_machine_power_off(void)
27010 +static void __noreturn native_machine_power_off(void)
27011 {
27012 if (pm_power_off) {
27013 if (!reboot_force)
27014 @@ -654,9 +681,10 @@ static void native_machine_power_off(void)
27015 }
27016 /* A fallback in case there is no PM info available */
27017 tboot_shutdown(TB_SHUTDOWN_HALT);
27018 + unreachable();
27019 }
27020
27021 -struct machine_ops machine_ops = {
27022 +struct machine_ops machine_ops __read_only = {
27023 .power_off = native_machine_power_off,
27024 .shutdown = native_machine_shutdown,
27025 .emergency_restart = native_machine_emergency_restart,
27026 diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27027 index c8e41e9..64049ef 100644
27028 --- a/arch/x86/kernel/reboot_fixups_32.c
27029 +++ b/arch/x86/kernel/reboot_fixups_32.c
27030 @@ -57,7 +57,7 @@ struct device_fixup {
27031 unsigned int vendor;
27032 unsigned int device;
27033 void (*reboot_fixup)(struct pci_dev *);
27034 -};
27035 +} __do_const;
27036
27037 /*
27038 * PCI ids solely used for fixups_table go here
27039 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27040 index 3fd2c69..a444264 100644
27041 --- a/arch/x86/kernel/relocate_kernel_64.S
27042 +++ b/arch/x86/kernel/relocate_kernel_64.S
27043 @@ -96,8 +96,7 @@ relocate_kernel:
27044
27045 /* jump to identity mapped page */
27046 addq $(identity_mapped - relocate_kernel), %r8
27047 - pushq %r8
27048 - ret
27049 + jmp *%r8
27050
27051 identity_mapped:
27052 /* set return address to 0 if not preserving context */
27053 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27054 index ab08aa2..6d74a3a 100644
27055 --- a/arch/x86/kernel/setup.c
27056 +++ b/arch/x86/kernel/setup.c
27057 @@ -110,6 +110,7 @@
27058 #include <asm/mce.h>
27059 #include <asm/alternative.h>
27060 #include <asm/prom.h>
27061 +#include <asm/boot.h>
27062
27063 /*
27064 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27065 @@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27066 #endif
27067
27068
27069 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27070 -__visible unsigned long mmu_cr4_features;
27071 +#ifdef CONFIG_X86_64
27072 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27073 +#elif defined(CONFIG_X86_PAE)
27074 +__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27075 #else
27076 -__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27077 +__visible unsigned long mmu_cr4_features __read_only;
27078 #endif
27079
27080 +void set_in_cr4(unsigned long mask)
27081 +{
27082 + unsigned long cr4 = read_cr4();
27083 +
27084 + if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27085 + return;
27086 +
27087 + pax_open_kernel();
27088 + mmu_cr4_features |= mask;
27089 + pax_close_kernel();
27090 +
27091 + if (trampoline_cr4_features)
27092 + *trampoline_cr4_features = mmu_cr4_features;
27093 + cr4 |= mask;
27094 + write_cr4(cr4);
27095 +}
27096 +EXPORT_SYMBOL(set_in_cr4);
27097 +
27098 +void clear_in_cr4(unsigned long mask)
27099 +{
27100 + unsigned long cr4 = read_cr4();
27101 +
27102 + if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27103 + return;
27104 +
27105 + pax_open_kernel();
27106 + mmu_cr4_features &= ~mask;
27107 + pax_close_kernel();
27108 +
27109 + if (trampoline_cr4_features)
27110 + *trampoline_cr4_features = mmu_cr4_features;
27111 + cr4 &= ~mask;
27112 + write_cr4(cr4);
27113 +}
27114 +EXPORT_SYMBOL(clear_in_cr4);
27115 +
27116 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27117 int bootloader_type, bootloader_version;
27118
27119 @@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27120 * area (640->1Mb) as ram even though it is not.
27121 * take them out.
27122 */
27123 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27124 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27125
27126 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27127 }
27128 @@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27129 /* called before trim_bios_range() to spare extra sanitize */
27130 static void __init e820_add_kernel_range(void)
27131 {
27132 - u64 start = __pa_symbol(_text);
27133 + u64 start = __pa_symbol(ktla_ktva(_text));
27134 u64 size = __pa_symbol(_end) - start;
27135
27136 /*
27137 @@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27138
27139 void __init setup_arch(char **cmdline_p)
27140 {
27141 +#ifdef CONFIG_X86_32
27142 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27143 +#else
27144 memblock_reserve(__pa_symbol(_text),
27145 (unsigned long)__bss_stop - (unsigned long)_text);
27146 +#endif
27147
27148 early_reserve_initrd();
27149
27150 @@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27151
27152 if (!boot_params.hdr.root_flags)
27153 root_mountflags &= ~MS_RDONLY;
27154 - init_mm.start_code = (unsigned long) _text;
27155 - init_mm.end_code = (unsigned long) _etext;
27156 + init_mm.start_code = ktla_ktva((unsigned long) _text);
27157 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
27158 init_mm.end_data = (unsigned long) _edata;
27159 init_mm.brk = _brk_end;
27160
27161 - code_resource.start = __pa_symbol(_text);
27162 - code_resource.end = __pa_symbol(_etext)-1;
27163 - data_resource.start = __pa_symbol(_etext);
27164 + code_resource.start = __pa_symbol(ktla_ktva(_text));
27165 + code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27166 + data_resource.start = __pa_symbol(_sdata);
27167 data_resource.end = __pa_symbol(_edata)-1;
27168 bss_resource.start = __pa_symbol(__bss_start);
27169 bss_resource.end = __pa_symbol(__bss_stop)-1;
27170 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27171 index 5cdff03..80fa283 100644
27172 --- a/arch/x86/kernel/setup_percpu.c
27173 +++ b/arch/x86/kernel/setup_percpu.c
27174 @@ -21,19 +21,17 @@
27175 #include <asm/cpu.h>
27176 #include <asm/stackprotector.h>
27177
27178 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27179 +#ifdef CONFIG_SMP
27180 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27181 EXPORT_PER_CPU_SYMBOL(cpu_number);
27182 +#endif
27183
27184 -#ifdef CONFIG_X86_64
27185 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27186 -#else
27187 -#define BOOT_PERCPU_OFFSET 0
27188 -#endif
27189
27190 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27191 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27192
27193 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27194 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27195 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27196 };
27197 EXPORT_SYMBOL(__per_cpu_offset);
27198 @@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27199 {
27200 #ifdef CONFIG_NEED_MULTIPLE_NODES
27201 pg_data_t *last = NULL;
27202 - unsigned int cpu;
27203 + int cpu;
27204
27205 for_each_possible_cpu(cpu) {
27206 int node = early_cpu_to_node(cpu);
27207 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27208 {
27209 #ifdef CONFIG_X86_32
27210 struct desc_struct gdt;
27211 + unsigned long base = per_cpu_offset(cpu);
27212
27213 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27214 - 0x2 | DESCTYPE_S, 0x8);
27215 - gdt.s = 1;
27216 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27217 + 0x83 | DESCTYPE_S, 0xC);
27218 write_gdt_entry(get_cpu_gdt_table(cpu),
27219 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27220 #endif
27221 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27222 /* alrighty, percpu areas up and running */
27223 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27224 for_each_possible_cpu(cpu) {
27225 +#ifdef CONFIG_CC_STACKPROTECTOR
27226 +#ifdef CONFIG_X86_32
27227 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
27228 +#endif
27229 +#endif
27230 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27231 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27232 per_cpu(cpu_number, cpu) = cpu;
27233 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27234 */
27235 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27236 #endif
27237 +#ifdef CONFIG_CC_STACKPROTECTOR
27238 +#ifdef CONFIG_X86_32
27239 + if (!cpu)
27240 + per_cpu(stack_canary.canary, cpu) = canary;
27241 +#endif
27242 +#endif
27243 /*
27244 * Up to this point, the boot CPU has been using .init.data
27245 * area. Reload any changed state for the boot CPU.
27246 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27247 index ed37a76..39f936e 100644
27248 --- a/arch/x86/kernel/signal.c
27249 +++ b/arch/x86/kernel/signal.c
27250 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27251 * Align the stack pointer according to the i386 ABI,
27252 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27253 */
27254 - sp = ((sp + 4) & -16ul) - 4;
27255 + sp = ((sp - 12) & -16ul) - 4;
27256 #else /* !CONFIG_X86_32 */
27257 sp = round_down(sp, 16) - 8;
27258 #endif
27259 @@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27260 }
27261
27262 if (current->mm->context.vdso)
27263 - restorer = current->mm->context.vdso +
27264 - selected_vdso32->sym___kernel_sigreturn;
27265 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27266 else
27267 - restorer = &frame->retcode;
27268 + restorer = (void __user *)&frame->retcode;
27269 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27270 restorer = ksig->ka.sa.sa_restorer;
27271
27272 @@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27273 * reasons and because gdb uses it as a signature to notice
27274 * signal handler stack frames.
27275 */
27276 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27277 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27278
27279 if (err)
27280 return -EFAULT;
27281 @@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27282 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27283
27284 /* Set up to return from userspace. */
27285 - restorer = current->mm->context.vdso +
27286 - selected_vdso32->sym___kernel_rt_sigreturn;
27287 + if (current->mm->context.vdso)
27288 + restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27289 + else
27290 + restorer = (void __user *)&frame->retcode;
27291 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27292 restorer = ksig->ka.sa.sa_restorer;
27293 put_user_ex(restorer, &frame->pretcode);
27294 @@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27295 * reasons and because gdb uses it as a signature to notice
27296 * signal handler stack frames.
27297 */
27298 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27299 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27300 } put_user_catch(err);
27301
27302 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27303 @@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27304 {
27305 int usig = signr_convert(ksig->sig);
27306 sigset_t *set = sigmask_to_save();
27307 - compat_sigset_t *cset = (compat_sigset_t *) set;
27308 + sigset_t sigcopy;
27309 + compat_sigset_t *cset;
27310 +
27311 + sigcopy = *set;
27312 +
27313 + cset = (compat_sigset_t *) &sigcopy;
27314
27315 /* Set up the stack frame */
27316 if (is_ia32_frame()) {
27317 @@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27318 } else if (is_x32_frame()) {
27319 return x32_setup_rt_frame(ksig, cset, regs);
27320 } else {
27321 - return __setup_rt_frame(ksig->sig, ksig, set, regs);
27322 + return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27323 }
27324 }
27325
27326 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27327 index be8e1bd..a3d93fa 100644
27328 --- a/arch/x86/kernel/smp.c
27329 +++ b/arch/x86/kernel/smp.c
27330 @@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27331
27332 __setup("nonmi_ipi", nonmi_ipi_setup);
27333
27334 -struct smp_ops smp_ops = {
27335 +struct smp_ops smp_ops __read_only = {
27336 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27337 .smp_prepare_cpus = native_smp_prepare_cpus,
27338 .smp_cpus_done = native_smp_cpus_done,
27339 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27340 index 668d8f2..84a9d54 100644
27341 --- a/arch/x86/kernel/smpboot.c
27342 +++ b/arch/x86/kernel/smpboot.c
27343 @@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27344
27345 enable_start_cpu0 = 0;
27346
27347 -#ifdef CONFIG_X86_32
27348 + /* otherwise gcc will move up smp_processor_id before the cpu_init */
27349 + barrier();
27350 +
27351 /* switch away from the initial page table */
27352 +#ifdef CONFIG_PAX_PER_CPU_PGD
27353 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27354 +#else
27355 load_cr3(swapper_pg_dir);
27356 +#endif
27357 __flush_tlb_all();
27358 -#endif
27359
27360 - /* otherwise gcc will move up smp_processor_id before the cpu_init */
27361 - barrier();
27362 /*
27363 * Check TSC synchronization with the BP:
27364 */
27365 @@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27366 alternatives_enable_smp();
27367
27368 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27369 - (THREAD_SIZE + task_stack_page(idle))) - 1);
27370 + (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27371 per_cpu(current_task, cpu) = idle;
27372 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27373
27374 #ifdef CONFIG_X86_32
27375 /* Stack for startup_32 can be just as for start_secondary onwards */
27376 @@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27377 clear_tsk_thread_flag(idle, TIF_FORK);
27378 initial_gs = per_cpu_offset(cpu);
27379 #endif
27380 - per_cpu(kernel_stack, cpu) =
27381 - (unsigned long)task_stack_page(idle) -
27382 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27383 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27384 + pax_open_kernel();
27385 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27386 + pax_close_kernel();
27387 initial_code = (unsigned long)start_secondary;
27388 stack_start = idle->thread.sp;
27389
27390 @@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27391 /* the FPU context is blank, nobody can own it */
27392 __cpu_disable_lazy_restore(cpu);
27393
27394 +#ifdef CONFIG_PAX_PER_CPU_PGD
27395 + clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27396 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27397 + KERNEL_PGD_PTRS);
27398 + clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27399 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27400 + KERNEL_PGD_PTRS);
27401 +#endif
27402 +
27403 err = do_boot_cpu(apicid, cpu, tidle);
27404 if (err) {
27405 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27406 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27407 index 9b4d51d..5d28b58 100644
27408 --- a/arch/x86/kernel/step.c
27409 +++ b/arch/x86/kernel/step.c
27410 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27411 struct desc_struct *desc;
27412 unsigned long base;
27413
27414 - seg &= ~7UL;
27415 + seg >>= 3;
27416
27417 mutex_lock(&child->mm->context.lock);
27418 - if (unlikely((seg >> 3) >= child->mm->context.size))
27419 + if (unlikely(seg >= child->mm->context.size))
27420 addr = -1L; /* bogus selector, access would fault */
27421 else {
27422 desc = child->mm->context.ldt + seg;
27423 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27424 addr += base;
27425 }
27426 mutex_unlock(&child->mm->context.lock);
27427 - }
27428 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27429 + addr = ktla_ktva(addr);
27430
27431 return addr;
27432 }
27433 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27434 unsigned char opcode[15];
27435 unsigned long addr = convert_ip_to_linear(child, regs);
27436
27437 + if (addr == -EINVAL)
27438 + return 0;
27439 +
27440 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27441 for (i = 0; i < copied; i++) {
27442 switch (opcode[i]) {
27443 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27444 new file mode 100644
27445 index 0000000..5877189
27446 --- /dev/null
27447 +++ b/arch/x86/kernel/sys_i386_32.c
27448 @@ -0,0 +1,189 @@
27449 +/*
27450 + * This file contains various random system calls that
27451 + * have a non-standard calling sequence on the Linux/i386
27452 + * platform.
27453 + */
27454 +
27455 +#include <linux/errno.h>
27456 +#include <linux/sched.h>
27457 +#include <linux/mm.h>
27458 +#include <linux/fs.h>
27459 +#include <linux/smp.h>
27460 +#include <linux/sem.h>
27461 +#include <linux/msg.h>
27462 +#include <linux/shm.h>
27463 +#include <linux/stat.h>
27464 +#include <linux/syscalls.h>
27465 +#include <linux/mman.h>
27466 +#include <linux/file.h>
27467 +#include <linux/utsname.h>
27468 +#include <linux/ipc.h>
27469 +#include <linux/elf.h>
27470 +
27471 +#include <linux/uaccess.h>
27472 +#include <linux/unistd.h>
27473 +
27474 +#include <asm/syscalls.h>
27475 +
27476 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27477 +{
27478 + unsigned long pax_task_size = TASK_SIZE;
27479 +
27480 +#ifdef CONFIG_PAX_SEGMEXEC
27481 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27482 + pax_task_size = SEGMEXEC_TASK_SIZE;
27483 +#endif
27484 +
27485 + if (flags & MAP_FIXED)
27486 + if (len > pax_task_size || addr > pax_task_size - len)
27487 + return -EINVAL;
27488 +
27489 + return 0;
27490 +}
27491 +
27492 +/*
27493 + * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27494 + */
27495 +static unsigned long get_align_mask(void)
27496 +{
27497 + if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27498 + return 0;
27499 +
27500 + if (!(current->flags & PF_RANDOMIZE))
27501 + return 0;
27502 +
27503 + return va_align.mask;
27504 +}
27505 +
27506 +unsigned long
27507 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
27508 + unsigned long len, unsigned long pgoff, unsigned long flags)
27509 +{
27510 + struct mm_struct *mm = current->mm;
27511 + struct vm_area_struct *vma;
27512 + unsigned long pax_task_size = TASK_SIZE;
27513 + struct vm_unmapped_area_info info;
27514 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27515 +
27516 +#ifdef CONFIG_PAX_SEGMEXEC
27517 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27518 + pax_task_size = SEGMEXEC_TASK_SIZE;
27519 +#endif
27520 +
27521 + pax_task_size -= PAGE_SIZE;
27522 +
27523 + if (len > pax_task_size)
27524 + return -ENOMEM;
27525 +
27526 + if (flags & MAP_FIXED)
27527 + return addr;
27528 +
27529 +#ifdef CONFIG_PAX_RANDMMAP
27530 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27531 +#endif
27532 +
27533 + if (addr) {
27534 + addr = PAGE_ALIGN(addr);
27535 + if (pax_task_size - len >= addr) {
27536 + vma = find_vma(mm, addr);
27537 + if (check_heap_stack_gap(vma, addr, len, offset))
27538 + return addr;
27539 + }
27540 + }
27541 +
27542 + info.flags = 0;
27543 + info.length = len;
27544 + info.align_mask = filp ? get_align_mask() : 0;
27545 + info.align_offset = pgoff << PAGE_SHIFT;
27546 + info.threadstack_offset = offset;
27547 +
27548 +#ifdef CONFIG_PAX_PAGEEXEC
27549 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27550 + info.low_limit = 0x00110000UL;
27551 + info.high_limit = mm->start_code;
27552 +
27553 +#ifdef CONFIG_PAX_RANDMMAP
27554 + if (mm->pax_flags & MF_PAX_RANDMMAP)
27555 + info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27556 +#endif
27557 +
27558 + if (info.low_limit < info.high_limit) {
27559 + addr = vm_unmapped_area(&info);
27560 + if (!IS_ERR_VALUE(addr))
27561 + return addr;
27562 + }
27563 + } else
27564 +#endif
27565 +
27566 + info.low_limit = mm->mmap_base;
27567 + info.high_limit = pax_task_size;
27568 +
27569 + return vm_unmapped_area(&info);
27570 +}
27571 +
27572 +unsigned long
27573 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27574 + const unsigned long len, const unsigned long pgoff,
27575 + const unsigned long flags)
27576 +{
27577 + struct vm_area_struct *vma;
27578 + struct mm_struct *mm = current->mm;
27579 + unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27580 + struct vm_unmapped_area_info info;
27581 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27582 +
27583 +#ifdef CONFIG_PAX_SEGMEXEC
27584 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
27585 + pax_task_size = SEGMEXEC_TASK_SIZE;
27586 +#endif
27587 +
27588 + pax_task_size -= PAGE_SIZE;
27589 +
27590 + /* requested length too big for entire address space */
27591 + if (len > pax_task_size)
27592 + return -ENOMEM;
27593 +
27594 + if (flags & MAP_FIXED)
27595 + return addr;
27596 +
27597 +#ifdef CONFIG_PAX_PAGEEXEC
27598 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27599 + goto bottomup;
27600 +#endif
27601 +
27602 +#ifdef CONFIG_PAX_RANDMMAP
27603 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27604 +#endif
27605 +
27606 + /* requesting a specific address */
27607 + if (addr) {
27608 + addr = PAGE_ALIGN(addr);
27609 + if (pax_task_size - len >= addr) {
27610 + vma = find_vma(mm, addr);
27611 + if (check_heap_stack_gap(vma, addr, len, offset))
27612 + return addr;
27613 + }
27614 + }
27615 +
27616 + info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27617 + info.length = len;
27618 + info.low_limit = PAGE_SIZE;
27619 + info.high_limit = mm->mmap_base;
27620 + info.align_mask = filp ? get_align_mask() : 0;
27621 + info.align_offset = pgoff << PAGE_SHIFT;
27622 + info.threadstack_offset = offset;
27623 +
27624 + addr = vm_unmapped_area(&info);
27625 + if (!(addr & ~PAGE_MASK))
27626 + return addr;
27627 + VM_BUG_ON(addr != -ENOMEM);
27628 +
27629 +bottomup:
27630 + /*
27631 + * A failed mmap() very likely causes application failure,
27632 + * so fall back to the bottom-up function here. This scenario
27633 + * can happen with large stack limits and large mmap()
27634 + * allocations.
27635 + */
27636 + return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27637 +}
27638 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27639 index 30277e2..5664a29 100644
27640 --- a/arch/x86/kernel/sys_x86_64.c
27641 +++ b/arch/x86/kernel/sys_x86_64.c
27642 @@ -81,8 +81,8 @@ out:
27643 return error;
27644 }
27645
27646 -static void find_start_end(unsigned long flags, unsigned long *begin,
27647 - unsigned long *end)
27648 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
27649 + unsigned long *begin, unsigned long *end)
27650 {
27651 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27652 unsigned long new_begin;
27653 @@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27654 *begin = new_begin;
27655 }
27656 } else {
27657 - *begin = current->mm->mmap_legacy_base;
27658 + *begin = mm->mmap_legacy_base;
27659 *end = TASK_SIZE;
27660 }
27661 }
27662 @@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27663 struct vm_area_struct *vma;
27664 struct vm_unmapped_area_info info;
27665 unsigned long begin, end;
27666 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27667
27668 if (flags & MAP_FIXED)
27669 return addr;
27670
27671 - find_start_end(flags, &begin, &end);
27672 + find_start_end(mm, flags, &begin, &end);
27673
27674 if (len > end)
27675 return -ENOMEM;
27676
27677 +#ifdef CONFIG_PAX_RANDMMAP
27678 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27679 +#endif
27680 +
27681 if (addr) {
27682 addr = PAGE_ALIGN(addr);
27683 vma = find_vma(mm, addr);
27684 - if (end - len >= addr &&
27685 - (!vma || addr + len <= vma->vm_start))
27686 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27687 return addr;
27688 }
27689
27690 @@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27691 info.high_limit = end;
27692 info.align_mask = filp ? get_align_mask() : 0;
27693 info.align_offset = pgoff << PAGE_SHIFT;
27694 + info.threadstack_offset = offset;
27695 return vm_unmapped_area(&info);
27696 }
27697
27698 @@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27699 struct mm_struct *mm = current->mm;
27700 unsigned long addr = addr0;
27701 struct vm_unmapped_area_info info;
27702 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27703
27704 /* requested length too big for entire address space */
27705 if (len > TASK_SIZE)
27706 @@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27707 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27708 goto bottomup;
27709
27710 +#ifdef CONFIG_PAX_RANDMMAP
27711 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27712 +#endif
27713 +
27714 /* requesting a specific address */
27715 if (addr) {
27716 addr = PAGE_ALIGN(addr);
27717 vma = find_vma(mm, addr);
27718 - if (TASK_SIZE - len >= addr &&
27719 - (!vma || addr + len <= vma->vm_start))
27720 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27721 return addr;
27722 }
27723
27724 @@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27725 info.high_limit = mm->mmap_base;
27726 info.align_mask = filp ? get_align_mask() : 0;
27727 info.align_offset = pgoff << PAGE_SHIFT;
27728 + info.threadstack_offset = offset;
27729 addr = vm_unmapped_area(&info);
27730 if (!(addr & ~PAGE_MASK))
27731 return addr;
27732 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27733 index 91a4496..bb87552 100644
27734 --- a/arch/x86/kernel/tboot.c
27735 +++ b/arch/x86/kernel/tboot.c
27736 @@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27737
27738 void tboot_shutdown(u32 shutdown_type)
27739 {
27740 - void (*shutdown)(void);
27741 + void (* __noreturn shutdown)(void);
27742
27743 if (!tboot_enabled())
27744 return;
27745 @@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27746
27747 switch_to_tboot_pt();
27748
27749 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27750 + shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27751 shutdown();
27752
27753 /* should not reach here */
27754 @@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27755 return -ENODEV;
27756 }
27757
27758 -static atomic_t ap_wfs_count;
27759 +static atomic_unchecked_t ap_wfs_count;
27760
27761 static int tboot_wait_for_aps(int num_aps)
27762 {
27763 @@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27764 {
27765 switch (action) {
27766 case CPU_DYING:
27767 - atomic_inc(&ap_wfs_count);
27768 + atomic_inc_unchecked(&ap_wfs_count);
27769 if (num_online_cpus() == 1)
27770 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27771 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27772 return NOTIFY_BAD;
27773 break;
27774 }
27775 @@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27776
27777 tboot_create_trampoline();
27778
27779 - atomic_set(&ap_wfs_count, 0);
27780 + atomic_set_unchecked(&ap_wfs_count, 0);
27781 register_hotcpu_notifier(&tboot_cpu_notifier);
27782
27783 #ifdef CONFIG_DEBUG_FS
27784 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27785 index 0fa2960..91eabbe 100644
27786 --- a/arch/x86/kernel/time.c
27787 +++ b/arch/x86/kernel/time.c
27788 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27789 {
27790 unsigned long pc = instruction_pointer(regs);
27791
27792 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27793 + if (!user_mode(regs) && in_lock_functions(pc)) {
27794 #ifdef CONFIG_FRAME_POINTER
27795 - return *(unsigned long *)(regs->bp + sizeof(long));
27796 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27797 #else
27798 unsigned long *sp =
27799 (unsigned long *)kernel_stack_pointer(regs);
27800 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27801 * or above a saved flags. Eflags has bits 22-31 zero,
27802 * kernel addresses don't.
27803 */
27804 +
27805 +#ifdef CONFIG_PAX_KERNEXEC
27806 + return ktla_ktva(sp[0]);
27807 +#else
27808 if (sp[0] >> 22)
27809 return sp[0];
27810 if (sp[1] >> 22)
27811 return sp[1];
27812 #endif
27813 +
27814 +#endif
27815 }
27816 return pc;
27817 }
27818 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27819 index 4e942f3..d0f623f 100644
27820 --- a/arch/x86/kernel/tls.c
27821 +++ b/arch/x86/kernel/tls.c
27822 @@ -118,6 +118,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27823 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27824 return -EINVAL;
27825
27826 +#ifdef CONFIG_PAX_SEGMEXEC
27827 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27828 + return -EINVAL;
27829 +#endif
27830 +
27831 set_tls_desc(p, idx, &info, 1);
27832
27833 return 0;
27834 @@ -235,7 +240,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27835
27836 if (kbuf)
27837 info = kbuf;
27838 - else if (__copy_from_user(infobuf, ubuf, count))
27839 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27840 return -EFAULT;
27841 else
27842 info = infobuf;
27843 diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27844 index 1c113db..287b42e 100644
27845 --- a/arch/x86/kernel/tracepoint.c
27846 +++ b/arch/x86/kernel/tracepoint.c
27847 @@ -9,11 +9,11 @@
27848 #include <linux/atomic.h>
27849
27850 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27851 -struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27852 +const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27853 (unsigned long) trace_idt_table };
27854
27855 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27856 -gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27857 +gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27858
27859 static int trace_irq_vector_refcount;
27860 static DEFINE_MUTEX(irq_vector_mutex);
27861 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27862 index 07ab8e9..99c8456 100644
27863 --- a/arch/x86/kernel/traps.c
27864 +++ b/arch/x86/kernel/traps.c
27865 @@ -67,7 +67,7 @@
27866 #include <asm/proto.h>
27867
27868 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27869 -gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27870 +gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27871 #else
27872 #include <asm/processor-flags.h>
27873 #include <asm/setup.h>
27874 @@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27875 #endif
27876
27877 /* Must be page-aligned because the real IDT is used in a fixmap. */
27878 -gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27879 +gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27880
27881 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27882 EXPORT_SYMBOL_GPL(used_vectors);
27883 @@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27884 }
27885
27886 static nokprobe_inline int
27887 -do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27888 +do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27889 struct pt_regs *regs, long error_code)
27890 {
27891 #ifdef CONFIG_X86_32
27892 - if (regs->flags & X86_VM_MASK) {
27893 + if (v8086_mode(regs)) {
27894 /*
27895 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27896 * On nmi (interrupt 2), do_trap should not be called.
27897 @@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27898 return -1;
27899 }
27900 #endif
27901 - if (!user_mode(regs)) {
27902 + if (!user_mode_novm(regs)) {
27903 if (!fixup_exception(regs)) {
27904 tsk->thread.error_code = error_code;
27905 tsk->thread.trap_nr = trapnr;
27906 +
27907 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27908 + if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27909 + str = "PAX: suspicious stack segment fault";
27910 +#endif
27911 +
27912 die(str, regs, error_code);
27913 }
27914 +
27915 +#ifdef CONFIG_PAX_REFCOUNT
27916 + if (trapnr == X86_TRAP_OF)
27917 + pax_report_refcount_overflow(regs);
27918 +#endif
27919 +
27920 return 0;
27921 }
27922
27923 @@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27924 }
27925
27926 static void
27927 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27928 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27929 long error_code, siginfo_t *info)
27930 {
27931 struct task_struct *tsk = current;
27932 @@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27933 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27934 printk_ratelimit()) {
27935 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27936 - tsk->comm, tsk->pid, str,
27937 + tsk->comm, task_pid_nr(tsk), str,
27938 regs->ip, regs->sp, error_code);
27939 print_vma_addr(" in ", regs->ip);
27940 pr_cont("\n");
27941 @@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27942 tsk->thread.error_code = error_code;
27943 tsk->thread.trap_nr = X86_TRAP_DF;
27944
27945 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27946 + if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27947 + die("grsec: kernel stack overflow detected", regs, error_code);
27948 +#endif
27949 +
27950 #ifdef CONFIG_DOUBLEFAULT
27951 df_debug(regs, error_code);
27952 #endif
27953 @@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27954 conditional_sti(regs);
27955
27956 #ifdef CONFIG_X86_32
27957 - if (regs->flags & X86_VM_MASK) {
27958 + if (v8086_mode(regs)) {
27959 local_irq_enable();
27960 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27961 goto exit;
27962 @@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27963 #endif
27964
27965 tsk = current;
27966 - if (!user_mode(regs)) {
27967 + if (!user_mode_novm(regs)) {
27968 if (fixup_exception(regs))
27969 goto exit;
27970
27971 tsk->thread.error_code = error_code;
27972 tsk->thread.trap_nr = X86_TRAP_GP;
27973 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27974 - X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27975 + X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27976 +
27977 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27978 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27979 + die("PAX: suspicious general protection fault", regs, error_code);
27980 + else
27981 +#endif
27982 +
27983 die("general protection fault", regs, error_code);
27984 + }
27985 goto exit;
27986 }
27987
27988 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27989 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27990 + struct mm_struct *mm = tsk->mm;
27991 + unsigned long limit;
27992 +
27993 + down_write(&mm->mmap_sem);
27994 + limit = mm->context.user_cs_limit;
27995 + if (limit < TASK_SIZE) {
27996 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27997 + up_write(&mm->mmap_sem);
27998 + return;
27999 + }
28000 + up_write(&mm->mmap_sem);
28001 + }
28002 +#endif
28003 +
28004 tsk->thread.error_code = error_code;
28005 tsk->thread.trap_nr = X86_TRAP_GP;
28006
28007 @@ -427,13 +468,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28008 container_of(task_pt_regs(current),
28009 struct bad_iret_stack, regs);
28010
28011 + if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28012 + new_stack = s;
28013 +
28014 /* Copy the IRET target to the new stack. */
28015 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28016
28017 /* Copy the remainder of the stack from the current stack. */
28018 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28019
28020 - BUG_ON(!user_mode_vm(&new_stack->regs));
28021 + BUG_ON(!user_mode(&new_stack->regs));
28022 return new_stack;
28023 }
28024 NOKPROBE_SYMBOL(fixup_bad_iret);
28025 @@ -519,7 +563,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28026 /* It's safe to allow irq's after DR6 has been saved */
28027 preempt_conditional_sti(regs);
28028
28029 - if (regs->flags & X86_VM_MASK) {
28030 + if (v8086_mode(regs)) {
28031 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28032 X86_TRAP_DB);
28033 preempt_conditional_cli(regs);
28034 @@ -534,7 +578,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28035 * We already checked v86 mode above, so we can check for kernel mode
28036 * by just checking the CPL of CS.
28037 */
28038 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
28039 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28040 tsk->thread.debugreg6 &= ~DR_STEP;
28041 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28042 regs->flags &= ~X86_EFLAGS_TF;
28043 @@ -567,7 +611,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28044 return;
28045 conditional_sti(regs);
28046
28047 - if (!user_mode_vm(regs))
28048 + if (!user_mode(regs))
28049 {
28050 if (!fixup_exception(regs)) {
28051 task->thread.error_code = error_code;
28052 diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28053 index b7e50bb..f4a93ae 100644
28054 --- a/arch/x86/kernel/tsc.c
28055 +++ b/arch/x86/kernel/tsc.c
28056 @@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28057 */
28058 smp_wmb();
28059
28060 - ACCESS_ONCE(c2n->head) = data;
28061 + ACCESS_ONCE_RW(c2n->head) = data;
28062 }
28063
28064 /*
28065 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28066 index 5d1cbfe..2a21feb 100644
28067 --- a/arch/x86/kernel/uprobes.c
28068 +++ b/arch/x86/kernel/uprobes.c
28069 @@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28070 int ret = NOTIFY_DONE;
28071
28072 /* We are only interested in userspace traps */
28073 - if (regs && !user_mode_vm(regs))
28074 + if (regs && !user_mode(regs))
28075 return NOTIFY_DONE;
28076
28077 switch (val) {
28078 @@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28079
28080 if (nleft != rasize) {
28081 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28082 - "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28083 + "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28084
28085 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28086 }
28087 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28088 index b9242ba..50c5edd 100644
28089 --- a/arch/x86/kernel/verify_cpu.S
28090 +++ b/arch/x86/kernel/verify_cpu.S
28091 @@ -20,6 +20,7 @@
28092 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28093 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28094 * arch/x86/kernel/head_32.S: processor startup
28095 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28096 *
28097 * verify_cpu, returns the status of longmode and SSE in register %eax.
28098 * 0: Success 1: Failure
28099 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28100 index e8edcf5..27f9344 100644
28101 --- a/arch/x86/kernel/vm86_32.c
28102 +++ b/arch/x86/kernel/vm86_32.c
28103 @@ -44,6 +44,7 @@
28104 #include <linux/ptrace.h>
28105 #include <linux/audit.h>
28106 #include <linux/stddef.h>
28107 +#include <linux/grsecurity.h>
28108
28109 #include <asm/uaccess.h>
28110 #include <asm/io.h>
28111 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28112 do_exit(SIGSEGV);
28113 }
28114
28115 - tss = &per_cpu(init_tss, get_cpu());
28116 + tss = init_tss + get_cpu();
28117 current->thread.sp0 = current->thread.saved_sp0;
28118 current->thread.sysenter_cs = __KERNEL_CS;
28119 load_sp0(tss, &current->thread);
28120 @@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28121
28122 if (tsk->thread.saved_sp0)
28123 return -EPERM;
28124 +
28125 +#ifdef CONFIG_GRKERNSEC_VM86
28126 + if (!capable(CAP_SYS_RAWIO)) {
28127 + gr_handle_vm86();
28128 + return -EPERM;
28129 + }
28130 +#endif
28131 +
28132 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28133 offsetof(struct kernel_vm86_struct, vm86plus) -
28134 sizeof(info.regs));
28135 @@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28136 int tmp;
28137 struct vm86plus_struct __user *v86;
28138
28139 +#ifdef CONFIG_GRKERNSEC_VM86
28140 + if (!capable(CAP_SYS_RAWIO)) {
28141 + gr_handle_vm86();
28142 + return -EPERM;
28143 + }
28144 +#endif
28145 +
28146 tsk = current;
28147 switch (cmd) {
28148 case VM86_REQUEST_IRQ:
28149 @@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28150 tsk->thread.saved_fs = info->regs32->fs;
28151 tsk->thread.saved_gs = get_user_gs(info->regs32);
28152
28153 - tss = &per_cpu(init_tss, get_cpu());
28154 + tss = init_tss + get_cpu();
28155 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28156 if (cpu_has_sep)
28157 tsk->thread.sysenter_cs = 0;
28158 @@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28159 goto cannot_handle;
28160 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28161 goto cannot_handle;
28162 - intr_ptr = (unsigned long __user *) (i << 2);
28163 + intr_ptr = (__force unsigned long __user *) (i << 2);
28164 if (get_user(segoffs, intr_ptr))
28165 goto cannot_handle;
28166 if ((segoffs >> 16) == BIOSSEG)
28167 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28168 index 49edf2d..c0d1362 100644
28169 --- a/arch/x86/kernel/vmlinux.lds.S
28170 +++ b/arch/x86/kernel/vmlinux.lds.S
28171 @@ -26,6 +26,13 @@
28172 #include <asm/page_types.h>
28173 #include <asm/cache.h>
28174 #include <asm/boot.h>
28175 +#include <asm/segment.h>
28176 +
28177 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28178 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28179 +#else
28180 +#define __KERNEL_TEXT_OFFSET 0
28181 +#endif
28182
28183 #undef i386 /* in case the preprocessor is a 32bit one */
28184
28185 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28186
28187 PHDRS {
28188 text PT_LOAD FLAGS(5); /* R_E */
28189 +#ifdef CONFIG_X86_32
28190 + module PT_LOAD FLAGS(5); /* R_E */
28191 +#endif
28192 +#ifdef CONFIG_XEN
28193 + rodata PT_LOAD FLAGS(5); /* R_E */
28194 +#else
28195 + rodata PT_LOAD FLAGS(4); /* R__ */
28196 +#endif
28197 data PT_LOAD FLAGS(6); /* RW_ */
28198 -#ifdef CONFIG_X86_64
28199 + init.begin PT_LOAD FLAGS(6); /* RW_ */
28200 #ifdef CONFIG_SMP
28201 percpu PT_LOAD FLAGS(6); /* RW_ */
28202 #endif
28203 + text.init PT_LOAD FLAGS(5); /* R_E */
28204 + text.exit PT_LOAD FLAGS(5); /* R_E */
28205 init PT_LOAD FLAGS(7); /* RWE */
28206 -#endif
28207 note PT_NOTE FLAGS(0); /* ___ */
28208 }
28209
28210 SECTIONS
28211 {
28212 #ifdef CONFIG_X86_32
28213 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28214 - phys_startup_32 = startup_32 - LOAD_OFFSET;
28215 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28216 #else
28217 - . = __START_KERNEL;
28218 - phys_startup_64 = startup_64 - LOAD_OFFSET;
28219 + . = __START_KERNEL;
28220 #endif
28221
28222 /* Text and read-only data */
28223 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
28224 - _text = .;
28225 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28226 /* bootstrapping code */
28227 +#ifdef CONFIG_X86_32
28228 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28229 +#else
28230 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28231 +#endif
28232 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28233 + _text = .;
28234 HEAD_TEXT
28235 . = ALIGN(8);
28236 _stext = .;
28237 @@ -104,13 +124,47 @@ SECTIONS
28238 IRQENTRY_TEXT
28239 *(.fixup)
28240 *(.gnu.warning)
28241 - /* End of text section */
28242 - _etext = .;
28243 } :text = 0x9090
28244
28245 - NOTES :text :note
28246 + . += __KERNEL_TEXT_OFFSET;
28247
28248 - EXCEPTION_TABLE(16) :text = 0x9090
28249 +#ifdef CONFIG_X86_32
28250 + . = ALIGN(PAGE_SIZE);
28251 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28252 +
28253 +#ifdef CONFIG_PAX_KERNEXEC
28254 + MODULES_EXEC_VADDR = .;
28255 + BYTE(0)
28256 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28257 + . = ALIGN(HPAGE_SIZE) - 1;
28258 + MODULES_EXEC_END = .;
28259 +#endif
28260 +
28261 + } :module
28262 +#endif
28263 +
28264 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28265 + /* End of text section */
28266 + BYTE(0)
28267 + _etext = . - __KERNEL_TEXT_OFFSET;
28268 + }
28269 +
28270 +#ifdef CONFIG_X86_32
28271 + . = ALIGN(PAGE_SIZE);
28272 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28273 + . = ALIGN(PAGE_SIZE);
28274 + *(.empty_zero_page)
28275 + *(.initial_pg_fixmap)
28276 + *(.initial_pg_pmd)
28277 + *(.initial_page_table)
28278 + *(.swapper_pg_dir)
28279 + } :rodata
28280 +#endif
28281 +
28282 + . = ALIGN(PAGE_SIZE);
28283 + NOTES :rodata :note
28284 +
28285 + EXCEPTION_TABLE(16) :rodata
28286
28287 #if defined(CONFIG_DEBUG_RODATA)
28288 /* .text should occupy whole number of pages */
28289 @@ -122,16 +176,20 @@ SECTIONS
28290
28291 /* Data */
28292 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28293 +
28294 +#ifdef CONFIG_PAX_KERNEXEC
28295 + . = ALIGN(HPAGE_SIZE);
28296 +#else
28297 + . = ALIGN(PAGE_SIZE);
28298 +#endif
28299 +
28300 /* Start of data section */
28301 _sdata = .;
28302
28303 /* init_task */
28304 INIT_TASK_DATA(THREAD_SIZE)
28305
28306 -#ifdef CONFIG_X86_32
28307 - /* 32 bit has nosave before _edata */
28308 NOSAVE_DATA
28309 -#endif
28310
28311 PAGE_ALIGNED_DATA(PAGE_SIZE)
28312
28313 @@ -174,12 +232,19 @@ SECTIONS
28314 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28315
28316 /* Init code and data - will be freed after init */
28317 - . = ALIGN(PAGE_SIZE);
28318 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28319 + BYTE(0)
28320 +
28321 +#ifdef CONFIG_PAX_KERNEXEC
28322 + . = ALIGN(HPAGE_SIZE);
28323 +#else
28324 + . = ALIGN(PAGE_SIZE);
28325 +#endif
28326 +
28327 __init_begin = .; /* paired with __init_end */
28328 - }
28329 + } :init.begin
28330
28331 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28332 +#ifdef CONFIG_SMP
28333 /*
28334 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28335 * output PHDR, so the next output section - .init.text - should
28336 @@ -188,12 +253,27 @@ SECTIONS
28337 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28338 #endif
28339
28340 - INIT_TEXT_SECTION(PAGE_SIZE)
28341 -#ifdef CONFIG_X86_64
28342 - :init
28343 -#endif
28344 + . = ALIGN(PAGE_SIZE);
28345 + init_begin = .;
28346 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28347 + VMLINUX_SYMBOL(_sinittext) = .;
28348 + INIT_TEXT
28349 + VMLINUX_SYMBOL(_einittext) = .;
28350 + . = ALIGN(PAGE_SIZE);
28351 + } :text.init
28352
28353 - INIT_DATA_SECTION(16)
28354 + /*
28355 + * .exit.text is discard at runtime, not link time, to deal with
28356 + * references from .altinstructions and .eh_frame
28357 + */
28358 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28359 + EXIT_TEXT
28360 + . = ALIGN(16);
28361 + } :text.exit
28362 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28363 +
28364 + . = ALIGN(PAGE_SIZE);
28365 + INIT_DATA_SECTION(16) :init
28366
28367 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28368 __x86_cpu_dev_start = .;
28369 @@ -264,19 +344,12 @@ SECTIONS
28370 }
28371
28372 . = ALIGN(8);
28373 - /*
28374 - * .exit.text is discard at runtime, not link time, to deal with
28375 - * references from .altinstructions and .eh_frame
28376 - */
28377 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28378 - EXIT_TEXT
28379 - }
28380
28381 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28382 EXIT_DATA
28383 }
28384
28385 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28386 +#ifndef CONFIG_SMP
28387 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28388 #endif
28389
28390 @@ -295,16 +368,10 @@ SECTIONS
28391 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28392 __smp_locks = .;
28393 *(.smp_locks)
28394 - . = ALIGN(PAGE_SIZE);
28395 __smp_locks_end = .;
28396 + . = ALIGN(PAGE_SIZE);
28397 }
28398
28399 -#ifdef CONFIG_X86_64
28400 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28401 - NOSAVE_DATA
28402 - }
28403 -#endif
28404 -
28405 /* BSS */
28406 . = ALIGN(PAGE_SIZE);
28407 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28408 @@ -320,6 +387,7 @@ SECTIONS
28409 __brk_base = .;
28410 . += 64 * 1024; /* 64k alignment slop space */
28411 *(.brk_reservation) /* areas brk users have reserved */
28412 + . = ALIGN(HPAGE_SIZE);
28413 __brk_limit = .;
28414 }
28415
28416 @@ -346,13 +414,12 @@ SECTIONS
28417 * for the boot processor.
28418 */
28419 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28420 -INIT_PER_CPU(gdt_page);
28421 INIT_PER_CPU(irq_stack_union);
28422
28423 /*
28424 * Build-time check on the image size:
28425 */
28426 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28427 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28428 "kernel image bigger than KERNEL_IMAGE_SIZE");
28429
28430 #ifdef CONFIG_SMP
28431 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28432 index 957779f..74e405c 100644
28433 --- a/arch/x86/kernel/vsyscall_64.c
28434 +++ b/arch/x86/kernel/vsyscall_64.c
28435 @@ -54,15 +54,13 @@
28436
28437 DEFINE_VVAR(int, vgetcpu_mode);
28438
28439 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28440 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28441
28442 static int __init vsyscall_setup(char *str)
28443 {
28444 if (str) {
28445 if (!strcmp("emulate", str))
28446 vsyscall_mode = EMULATE;
28447 - else if (!strcmp("native", str))
28448 - vsyscall_mode = NATIVE;
28449 else if (!strcmp("none", str))
28450 vsyscall_mode = NONE;
28451 else
28452 @@ -279,8 +277,7 @@ do_ret:
28453 return true;
28454
28455 sigsegv:
28456 - force_sig(SIGSEGV, current);
28457 - return true;
28458 + do_group_exit(SIGKILL);
28459 }
28460
28461 /*
28462 @@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28463 extern char __vsyscall_page;
28464 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28465
28466 - __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28467 - vsyscall_mode == NATIVE
28468 - ? PAGE_KERNEL_VSYSCALL
28469 - : PAGE_KERNEL_VVAR);
28470 + __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28471 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28472 (unsigned long)VSYSCALL_ADDR);
28473 }
28474 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28475 index 04068192..4d75aa6 100644
28476 --- a/arch/x86/kernel/x8664_ksyms_64.c
28477 +++ b/arch/x86/kernel/x8664_ksyms_64.c
28478 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28479 EXPORT_SYMBOL(copy_user_generic_unrolled);
28480 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28481 EXPORT_SYMBOL(__copy_user_nocache);
28482 -EXPORT_SYMBOL(_copy_from_user);
28483 -EXPORT_SYMBOL(_copy_to_user);
28484
28485 EXPORT_SYMBOL(copy_page);
28486 EXPORT_SYMBOL(clear_page);
28487 @@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28488 EXPORT_SYMBOL(___preempt_schedule_context);
28489 #endif
28490 #endif
28491 +
28492 +#ifdef CONFIG_PAX_PER_CPU_PGD
28493 +EXPORT_SYMBOL(cpu_pgd);
28494 +#endif
28495 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28496 index e48b674..a451dd9 100644
28497 --- a/arch/x86/kernel/x86_init.c
28498 +++ b/arch/x86/kernel/x86_init.c
28499 @@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28500 static void default_nmi_init(void) { };
28501 static int default_i8042_detect(void) { return 1; };
28502
28503 -struct x86_platform_ops x86_platform = {
28504 +struct x86_platform_ops x86_platform __read_only = {
28505 .calibrate_tsc = native_calibrate_tsc,
28506 .get_wallclock = mach_get_cmos_time,
28507 .set_wallclock = mach_set_rtc_mmss,
28508 @@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28509 EXPORT_SYMBOL_GPL(x86_platform);
28510
28511 #if defined(CONFIG_PCI_MSI)
28512 -struct x86_msi_ops x86_msi = {
28513 +struct x86_msi_ops x86_msi __read_only = {
28514 .setup_msi_irqs = native_setup_msi_irqs,
28515 .compose_msi_msg = native_compose_msi_msg,
28516 .teardown_msi_irq = native_teardown_msi_irq,
28517 @@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28518 }
28519 #endif
28520
28521 -struct x86_io_apic_ops x86_io_apic_ops = {
28522 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28523 .init = native_io_apic_init_mappings,
28524 .read = native_io_apic_read,
28525 .write = native_io_apic_write,
28526 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28527 index 0de1fae..298d037 100644
28528 --- a/arch/x86/kernel/xsave.c
28529 +++ b/arch/x86/kernel/xsave.c
28530 @@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28531
28532 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28533 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28534 - err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28535 + err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28536
28537 if (!use_xsave())
28538 return err;
28539
28540 - err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28541 + err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28542
28543 /*
28544 * Read the xstate_bv which we copied (directly from the cpu or
28545 * from the state in task struct) to the user buffers.
28546 */
28547 - err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28548 + err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28549
28550 /*
28551 * For legacy compatible, we always set FP/SSE bits in the bit
28552 @@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28553 */
28554 xstate_bv |= XSTATE_FPSSE;
28555
28556 - err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28557 + err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28558
28559 return err;
28560 }
28561 @@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28562 {
28563 int err;
28564
28565 + buf = (struct xsave_struct __user *)____m(buf);
28566 if (use_xsave())
28567 err = xsave_user(buf);
28568 else if (use_fxsr())
28569 @@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28570 */
28571 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28572 {
28573 + buf = (void __user *)____m(buf);
28574 if (use_xsave()) {
28575 if ((unsigned long)buf % 64 || fx_only) {
28576 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28577 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28578 index 88f9201..0e7f1a3 100644
28579 --- a/arch/x86/kvm/cpuid.c
28580 +++ b/arch/x86/kvm/cpuid.c
28581 @@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28582 struct kvm_cpuid2 *cpuid,
28583 struct kvm_cpuid_entry2 __user *entries)
28584 {
28585 - int r;
28586 + int r, i;
28587
28588 r = -E2BIG;
28589 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28590 goto out;
28591 r = -EFAULT;
28592 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28593 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28594 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28595 goto out;
28596 + for (i = 0; i < cpuid->nent; ++i) {
28597 + struct kvm_cpuid_entry2 cpuid_entry;
28598 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28599 + goto out;
28600 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
28601 + }
28602 vcpu->arch.cpuid_nent = cpuid->nent;
28603 kvm_apic_set_version(vcpu);
28604 kvm_x86_ops->cpuid_update(vcpu);
28605 @@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28606 struct kvm_cpuid2 *cpuid,
28607 struct kvm_cpuid_entry2 __user *entries)
28608 {
28609 - int r;
28610 + int r, i;
28611
28612 r = -E2BIG;
28613 if (cpuid->nent < vcpu->arch.cpuid_nent)
28614 goto out;
28615 r = -EFAULT;
28616 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28617 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28618 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28619 goto out;
28620 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28621 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28622 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28623 + goto out;
28624 + }
28625 return 0;
28626
28627 out:
28628 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28629 index 22e7ed9..e03a378 100644
28630 --- a/arch/x86/kvm/emulate.c
28631 +++ b/arch/x86/kvm/emulate.c
28632 @@ -3519,7 +3519,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28633 int cr = ctxt->modrm_reg;
28634 u64 efer = 0;
28635
28636 - static u64 cr_reserved_bits[] = {
28637 + static const u64 cr_reserved_bits[] = {
28638 0xffffffff00000000ULL,
28639 0, 0, 0, /* CR3 checked later */
28640 CR4_RESERVED_BITS,
28641 @@ -3554,7 +3554,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28642
28643 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28644 if (efer & EFER_LMA)
28645 - rsvd = CR3_L_MODE_RESERVED_BITS;
28646 + rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28647
28648 if (new_val & rsvd)
28649 return emulate_gp(ctxt, 0);
28650 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28651 index b8345dd..f225d71 100644
28652 --- a/arch/x86/kvm/lapic.c
28653 +++ b/arch/x86/kvm/lapic.c
28654 @@ -55,7 +55,7 @@
28655 #define APIC_BUS_CYCLE_NS 1
28656
28657 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28658 -#define apic_debug(fmt, arg...)
28659 +#define apic_debug(fmt, arg...) do {} while (0)
28660
28661 #define APIC_LVT_NUM 6
28662 /* 14 is the version for Xeon and Pentium 8.4.8*/
28663 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28664 index fd49c86..77e1aa0 100644
28665 --- a/arch/x86/kvm/paging_tmpl.h
28666 +++ b/arch/x86/kvm/paging_tmpl.h
28667 @@ -343,7 +343,7 @@ retry_walk:
28668 if (unlikely(kvm_is_error_hva(host_addr)))
28669 goto error;
28670
28671 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28672 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28673 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28674 goto error;
28675 walker->ptep_user[walker->level - 1] = ptep_user;
28676 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28677 index 7527cef..c63a838e 100644
28678 --- a/arch/x86/kvm/svm.c
28679 +++ b/arch/x86/kvm/svm.c
28680 @@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28681 int cpu = raw_smp_processor_id();
28682
28683 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28684 +
28685 + pax_open_kernel();
28686 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28687 + pax_close_kernel();
28688 +
28689 load_TR_desc();
28690 }
28691
28692 @@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28693 #endif
28694 #endif
28695
28696 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28697 + __set_fs(current_thread_info()->addr_limit);
28698 +#endif
28699 +
28700 reload_tss(vcpu);
28701
28702 local_irq_disable();
28703 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28704 index 3e556c6..08bbf7f 100644
28705 --- a/arch/x86/kvm/vmx.c
28706 +++ b/arch/x86/kvm/vmx.c
28707 @@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28708 #endif
28709 }
28710
28711 -static void vmcs_clear_bits(unsigned long field, u32 mask)
28712 +static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28713 {
28714 vmcs_writel(field, vmcs_readl(field) & ~mask);
28715 }
28716
28717 -static void vmcs_set_bits(unsigned long field, u32 mask)
28718 +static void vmcs_set_bits(unsigned long field, unsigned long mask)
28719 {
28720 vmcs_writel(field, vmcs_readl(field) | mask);
28721 }
28722 @@ -1631,7 +1631,11 @@ static void reload_tss(void)
28723 struct desc_struct *descs;
28724
28725 descs = (void *)gdt->address;
28726 +
28727 + pax_open_kernel();
28728 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28729 + pax_close_kernel();
28730 +
28731 load_TR_desc();
28732 }
28733
28734 @@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28735 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28736 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28737
28738 +#ifdef CONFIG_PAX_PER_CPU_PGD
28739 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28740 +#endif
28741 +
28742 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28743 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28744 vmx->loaded_vmcs->cpu = cpu;
28745 @@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28746 * reads and returns guest's timestamp counter "register"
28747 * guest_tsc = host_tsc + tsc_offset -- 21.3
28748 */
28749 -static u64 guest_read_tsc(void)
28750 +static u64 __intentional_overflow(-1) guest_read_tsc(void)
28751 {
28752 u64 host_tsc, tsc_offset;
28753
28754 @@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28755 * page upon invalidation. No need to do anything if the
28756 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28757 */
28758 - kvm_x86_ops->set_apic_access_page_addr = NULL;
28759 + pax_open_kernel();
28760 + *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28761 + pax_close_kernel();
28762 }
28763
28764 - if (!cpu_has_vmx_tpr_shadow())
28765 - kvm_x86_ops->update_cr8_intercept = NULL;
28766 + if (!cpu_has_vmx_tpr_shadow()) {
28767 + pax_open_kernel();
28768 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28769 + pax_close_kernel();
28770 + }
28771
28772 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28773 kvm_disable_largepages();
28774 @@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28775 if (!cpu_has_vmx_apicv())
28776 enable_apicv = 0;
28777
28778 + pax_open_kernel();
28779 if (enable_apicv)
28780 - kvm_x86_ops->update_cr8_intercept = NULL;
28781 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28782 else {
28783 - kvm_x86_ops->hwapic_irr_update = NULL;
28784 - kvm_x86_ops->deliver_posted_interrupt = NULL;
28785 - kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28786 + *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28787 + *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28788 + *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28789 }
28790 + pax_close_kernel();
28791
28792 if (nested)
28793 nested_vmx_setup_ctls_msrs();
28794 @@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28795 unsigned long cr4;
28796
28797 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28798 +
28799 +#ifndef CONFIG_PAX_PER_CPU_PGD
28800 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28801 +#endif
28802
28803 /* Save the most likely value for this task's CR4 in the VMCS. */
28804 cr4 = read_cr4();
28805 @@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28806 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28807 vmx->host_idt_base = dt.address;
28808
28809 - vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28810 + vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28811
28812 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28813 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28814 @@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28815 "jmp 2f \n\t"
28816 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28817 "2: "
28818 +
28819 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28820 + "ljmp %[cs],$3f\n\t"
28821 + "3: "
28822 +#endif
28823 +
28824 /* Save guest registers, load host registers, keep flags */
28825 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28826 "pop %0 \n\t"
28827 @@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28828 #endif
28829 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28830 [wordsize]"i"(sizeof(ulong))
28831 +
28832 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28833 + ,[cs]"i"(__KERNEL_CS)
28834 +#endif
28835 +
28836 : "cc", "memory"
28837 #ifdef CONFIG_X86_64
28838 , "rax", "rbx", "rdi", "rsi"
28839 @@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28840 if (debugctlmsr)
28841 update_debugctlmsr(debugctlmsr);
28842
28843 -#ifndef CONFIG_X86_64
28844 +#ifdef CONFIG_X86_32
28845 /*
28846 * The sysexit path does not restore ds/es, so we must set them to
28847 * a reasonable value ourselves.
28848 @@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28849 * may be executed in interrupt context, which saves and restore segments
28850 * around it, nullifying its effect.
28851 */
28852 - loadsegment(ds, __USER_DS);
28853 - loadsegment(es, __USER_DS);
28854 + loadsegment(ds, __KERNEL_DS);
28855 + loadsegment(es, __KERNEL_DS);
28856 + loadsegment(ss, __KERNEL_DS);
28857 +
28858 +#ifdef CONFIG_PAX_KERNEXEC
28859 + loadsegment(fs, __KERNEL_PERCPU);
28860 +#endif
28861 +
28862 +#ifdef CONFIG_PAX_MEMORY_UDEREF
28863 + __set_fs(current_thread_info()->addr_limit);
28864 +#endif
28865 +
28866 #endif
28867
28868 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28869 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28870 index 506488c..f8df17e 100644
28871 --- a/arch/x86/kvm/x86.c
28872 +++ b/arch/x86/kvm/x86.c
28873 @@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28874
28875 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28876 {
28877 + cr3 &= ~CR3_PCID_INVD;
28878 +
28879 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28880 kvm_mmu_sync_roots(vcpu);
28881 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28882 @@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28883 {
28884 struct kvm *kvm = vcpu->kvm;
28885 int lm = is_long_mode(vcpu);
28886 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28887 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28888 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28889 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28890 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28891 : kvm->arch.xen_hvm_config.blob_size_32;
28892 u32 page_num = data & ~PAGE_MASK;
28893 @@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28894 if (n < msr_list.nmsrs)
28895 goto out;
28896 r = -EFAULT;
28897 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28898 + goto out;
28899 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28900 num_msrs_to_save * sizeof(u32)))
28901 goto out;
28902 @@ -5743,7 +5747,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28903 };
28904 #endif
28905
28906 -int kvm_arch_init(void *opaque)
28907 +int kvm_arch_init(const void *opaque)
28908 {
28909 int r;
28910 struct kvm_x86_ops *ops = opaque;
28911 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28912 index aae9413..d11e829 100644
28913 --- a/arch/x86/lguest/boot.c
28914 +++ b/arch/x86/lguest/boot.c
28915 @@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28916 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28917 * Launcher to reboot us.
28918 */
28919 -static void lguest_restart(char *reason)
28920 +static __noreturn void lguest_restart(char *reason)
28921 {
28922 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28923 + BUG();
28924 }
28925
28926 /*G:050
28927 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28928 index 00933d5..3a64af9 100644
28929 --- a/arch/x86/lib/atomic64_386_32.S
28930 +++ b/arch/x86/lib/atomic64_386_32.S
28931 @@ -48,6 +48,10 @@ BEGIN(read)
28932 movl (v), %eax
28933 movl 4(v), %edx
28934 RET_ENDP
28935 +BEGIN(read_unchecked)
28936 + movl (v), %eax
28937 + movl 4(v), %edx
28938 +RET_ENDP
28939 #undef v
28940
28941 #define v %esi
28942 @@ -55,6 +59,10 @@ BEGIN(set)
28943 movl %ebx, (v)
28944 movl %ecx, 4(v)
28945 RET_ENDP
28946 +BEGIN(set_unchecked)
28947 + movl %ebx, (v)
28948 + movl %ecx, 4(v)
28949 +RET_ENDP
28950 #undef v
28951
28952 #define v %esi
28953 @@ -70,6 +78,20 @@ RET_ENDP
28954 BEGIN(add)
28955 addl %eax, (v)
28956 adcl %edx, 4(v)
28957 +
28958 +#ifdef CONFIG_PAX_REFCOUNT
28959 + jno 0f
28960 + subl %eax, (v)
28961 + sbbl %edx, 4(v)
28962 + int $4
28963 +0:
28964 + _ASM_EXTABLE(0b, 0b)
28965 +#endif
28966 +
28967 +RET_ENDP
28968 +BEGIN(add_unchecked)
28969 + addl %eax, (v)
28970 + adcl %edx, 4(v)
28971 RET_ENDP
28972 #undef v
28973
28974 @@ -77,6 +99,24 @@ RET_ENDP
28975 BEGIN(add_return)
28976 addl (v), %eax
28977 adcl 4(v), %edx
28978 +
28979 +#ifdef CONFIG_PAX_REFCOUNT
28980 + into
28981 +1234:
28982 + _ASM_EXTABLE(1234b, 2f)
28983 +#endif
28984 +
28985 + movl %eax, (v)
28986 + movl %edx, 4(v)
28987 +
28988 +#ifdef CONFIG_PAX_REFCOUNT
28989 +2:
28990 +#endif
28991 +
28992 +RET_ENDP
28993 +BEGIN(add_return_unchecked)
28994 + addl (v), %eax
28995 + adcl 4(v), %edx
28996 movl %eax, (v)
28997 movl %edx, 4(v)
28998 RET_ENDP
28999 @@ -86,6 +126,20 @@ RET_ENDP
29000 BEGIN(sub)
29001 subl %eax, (v)
29002 sbbl %edx, 4(v)
29003 +
29004 +#ifdef CONFIG_PAX_REFCOUNT
29005 + jno 0f
29006 + addl %eax, (v)
29007 + adcl %edx, 4(v)
29008 + int $4
29009 +0:
29010 + _ASM_EXTABLE(0b, 0b)
29011 +#endif
29012 +
29013 +RET_ENDP
29014 +BEGIN(sub_unchecked)
29015 + subl %eax, (v)
29016 + sbbl %edx, 4(v)
29017 RET_ENDP
29018 #undef v
29019
29020 @@ -96,6 +150,27 @@ BEGIN(sub_return)
29021 sbbl $0, %edx
29022 addl (v), %eax
29023 adcl 4(v), %edx
29024 +
29025 +#ifdef CONFIG_PAX_REFCOUNT
29026 + into
29027 +1234:
29028 + _ASM_EXTABLE(1234b, 2f)
29029 +#endif
29030 +
29031 + movl %eax, (v)
29032 + movl %edx, 4(v)
29033 +
29034 +#ifdef CONFIG_PAX_REFCOUNT
29035 +2:
29036 +#endif
29037 +
29038 +RET_ENDP
29039 +BEGIN(sub_return_unchecked)
29040 + negl %edx
29041 + negl %eax
29042 + sbbl $0, %edx
29043 + addl (v), %eax
29044 + adcl 4(v), %edx
29045 movl %eax, (v)
29046 movl %edx, 4(v)
29047 RET_ENDP
29048 @@ -105,6 +180,20 @@ RET_ENDP
29049 BEGIN(inc)
29050 addl $1, (v)
29051 adcl $0, 4(v)
29052 +
29053 +#ifdef CONFIG_PAX_REFCOUNT
29054 + jno 0f
29055 + subl $1, (v)
29056 + sbbl $0, 4(v)
29057 + int $4
29058 +0:
29059 + _ASM_EXTABLE(0b, 0b)
29060 +#endif
29061 +
29062 +RET_ENDP
29063 +BEGIN(inc_unchecked)
29064 + addl $1, (v)
29065 + adcl $0, 4(v)
29066 RET_ENDP
29067 #undef v
29068
29069 @@ -114,6 +203,26 @@ BEGIN(inc_return)
29070 movl 4(v), %edx
29071 addl $1, %eax
29072 adcl $0, %edx
29073 +
29074 +#ifdef CONFIG_PAX_REFCOUNT
29075 + into
29076 +1234:
29077 + _ASM_EXTABLE(1234b, 2f)
29078 +#endif
29079 +
29080 + movl %eax, (v)
29081 + movl %edx, 4(v)
29082 +
29083 +#ifdef CONFIG_PAX_REFCOUNT
29084 +2:
29085 +#endif
29086 +
29087 +RET_ENDP
29088 +BEGIN(inc_return_unchecked)
29089 + movl (v), %eax
29090 + movl 4(v), %edx
29091 + addl $1, %eax
29092 + adcl $0, %edx
29093 movl %eax, (v)
29094 movl %edx, 4(v)
29095 RET_ENDP
29096 @@ -123,6 +232,20 @@ RET_ENDP
29097 BEGIN(dec)
29098 subl $1, (v)
29099 sbbl $0, 4(v)
29100 +
29101 +#ifdef CONFIG_PAX_REFCOUNT
29102 + jno 0f
29103 + addl $1, (v)
29104 + adcl $0, 4(v)
29105 + int $4
29106 +0:
29107 + _ASM_EXTABLE(0b, 0b)
29108 +#endif
29109 +
29110 +RET_ENDP
29111 +BEGIN(dec_unchecked)
29112 + subl $1, (v)
29113 + sbbl $0, 4(v)
29114 RET_ENDP
29115 #undef v
29116
29117 @@ -132,6 +255,26 @@ BEGIN(dec_return)
29118 movl 4(v), %edx
29119 subl $1, %eax
29120 sbbl $0, %edx
29121 +
29122 +#ifdef CONFIG_PAX_REFCOUNT
29123 + into
29124 +1234:
29125 + _ASM_EXTABLE(1234b, 2f)
29126 +#endif
29127 +
29128 + movl %eax, (v)
29129 + movl %edx, 4(v)
29130 +
29131 +#ifdef CONFIG_PAX_REFCOUNT
29132 +2:
29133 +#endif
29134 +
29135 +RET_ENDP
29136 +BEGIN(dec_return_unchecked)
29137 + movl (v), %eax
29138 + movl 4(v), %edx
29139 + subl $1, %eax
29140 + sbbl $0, %edx
29141 movl %eax, (v)
29142 movl %edx, 4(v)
29143 RET_ENDP
29144 @@ -143,6 +286,13 @@ BEGIN(add_unless)
29145 adcl %edx, %edi
29146 addl (v), %eax
29147 adcl 4(v), %edx
29148 +
29149 +#ifdef CONFIG_PAX_REFCOUNT
29150 + into
29151 +1234:
29152 + _ASM_EXTABLE(1234b, 2f)
29153 +#endif
29154 +
29155 cmpl %eax, %ecx
29156 je 3f
29157 1:
29158 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29159 1:
29160 addl $1, %eax
29161 adcl $0, %edx
29162 +
29163 +#ifdef CONFIG_PAX_REFCOUNT
29164 + into
29165 +1234:
29166 + _ASM_EXTABLE(1234b, 2f)
29167 +#endif
29168 +
29169 movl %eax, (v)
29170 movl %edx, 4(v)
29171 movl $1, %eax
29172 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29173 movl 4(v), %edx
29174 subl $1, %eax
29175 sbbl $0, %edx
29176 +
29177 +#ifdef CONFIG_PAX_REFCOUNT
29178 + into
29179 +1234:
29180 + _ASM_EXTABLE(1234b, 1f)
29181 +#endif
29182 +
29183 js 1f
29184 movl %eax, (v)
29185 movl %edx, 4(v)
29186 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29187 index f5cc9eb..51fa319 100644
29188 --- a/arch/x86/lib/atomic64_cx8_32.S
29189 +++ b/arch/x86/lib/atomic64_cx8_32.S
29190 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29191 CFI_STARTPROC
29192
29193 read64 %ecx
29194 + pax_force_retaddr
29195 ret
29196 CFI_ENDPROC
29197 ENDPROC(atomic64_read_cx8)
29198
29199 +ENTRY(atomic64_read_unchecked_cx8)
29200 + CFI_STARTPROC
29201 +
29202 + read64 %ecx
29203 + pax_force_retaddr
29204 + ret
29205 + CFI_ENDPROC
29206 +ENDPROC(atomic64_read_unchecked_cx8)
29207 +
29208 ENTRY(atomic64_set_cx8)
29209 CFI_STARTPROC
29210
29211 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29212 cmpxchg8b (%esi)
29213 jne 1b
29214
29215 + pax_force_retaddr
29216 ret
29217 CFI_ENDPROC
29218 ENDPROC(atomic64_set_cx8)
29219
29220 +ENTRY(atomic64_set_unchecked_cx8)
29221 + CFI_STARTPROC
29222 +
29223 +1:
29224 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
29225 + * are atomic on 586 and newer */
29226 + cmpxchg8b (%esi)
29227 + jne 1b
29228 +
29229 + pax_force_retaddr
29230 + ret
29231 + CFI_ENDPROC
29232 +ENDPROC(atomic64_set_unchecked_cx8)
29233 +
29234 ENTRY(atomic64_xchg_cx8)
29235 CFI_STARTPROC
29236
29237 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29238 cmpxchg8b (%esi)
29239 jne 1b
29240
29241 + pax_force_retaddr
29242 ret
29243 CFI_ENDPROC
29244 ENDPROC(atomic64_xchg_cx8)
29245
29246 -.macro addsub_return func ins insc
29247 -ENTRY(atomic64_\func\()_return_cx8)
29248 +.macro addsub_return func ins insc unchecked=""
29249 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29250 CFI_STARTPROC
29251 SAVE ebp
29252 SAVE ebx
29253 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29254 movl %edx, %ecx
29255 \ins\()l %esi, %ebx
29256 \insc\()l %edi, %ecx
29257 +
29258 +.ifb \unchecked
29259 +#ifdef CONFIG_PAX_REFCOUNT
29260 + into
29261 +2:
29262 + _ASM_EXTABLE(2b, 3f)
29263 +#endif
29264 +.endif
29265 +
29266 LOCK_PREFIX
29267 cmpxchg8b (%ebp)
29268 jne 1b
29269 -
29270 -10:
29271 movl %ebx, %eax
29272 movl %ecx, %edx
29273 +
29274 +.ifb \unchecked
29275 +#ifdef CONFIG_PAX_REFCOUNT
29276 +3:
29277 +#endif
29278 +.endif
29279 +
29280 RESTORE edi
29281 RESTORE esi
29282 RESTORE ebx
29283 RESTORE ebp
29284 + pax_force_retaddr
29285 ret
29286 CFI_ENDPROC
29287 -ENDPROC(atomic64_\func\()_return_cx8)
29288 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29289 .endm
29290
29291 addsub_return add add adc
29292 addsub_return sub sub sbb
29293 +addsub_return add add adc _unchecked
29294 +addsub_return sub sub sbb _unchecked
29295
29296 -.macro incdec_return func ins insc
29297 -ENTRY(atomic64_\func\()_return_cx8)
29298 +.macro incdec_return func ins insc unchecked=""
29299 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29300 CFI_STARTPROC
29301 SAVE ebx
29302
29303 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29304 movl %edx, %ecx
29305 \ins\()l $1, %ebx
29306 \insc\()l $0, %ecx
29307 +
29308 +.ifb \unchecked
29309 +#ifdef CONFIG_PAX_REFCOUNT
29310 + into
29311 +2:
29312 + _ASM_EXTABLE(2b, 3f)
29313 +#endif
29314 +.endif
29315 +
29316 LOCK_PREFIX
29317 cmpxchg8b (%esi)
29318 jne 1b
29319
29320 -10:
29321 movl %ebx, %eax
29322 movl %ecx, %edx
29323 +
29324 +.ifb \unchecked
29325 +#ifdef CONFIG_PAX_REFCOUNT
29326 +3:
29327 +#endif
29328 +.endif
29329 +
29330 RESTORE ebx
29331 + pax_force_retaddr
29332 ret
29333 CFI_ENDPROC
29334 -ENDPROC(atomic64_\func\()_return_cx8)
29335 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29336 .endm
29337
29338 incdec_return inc add adc
29339 incdec_return dec sub sbb
29340 +incdec_return inc add adc _unchecked
29341 +incdec_return dec sub sbb _unchecked
29342
29343 ENTRY(atomic64_dec_if_positive_cx8)
29344 CFI_STARTPROC
29345 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29346 movl %edx, %ecx
29347 subl $1, %ebx
29348 sbb $0, %ecx
29349 +
29350 +#ifdef CONFIG_PAX_REFCOUNT
29351 + into
29352 +1234:
29353 + _ASM_EXTABLE(1234b, 2f)
29354 +#endif
29355 +
29356 js 2f
29357 LOCK_PREFIX
29358 cmpxchg8b (%esi)
29359 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29360 movl %ebx, %eax
29361 movl %ecx, %edx
29362 RESTORE ebx
29363 + pax_force_retaddr
29364 ret
29365 CFI_ENDPROC
29366 ENDPROC(atomic64_dec_if_positive_cx8)
29367 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29368 movl %edx, %ecx
29369 addl %ebp, %ebx
29370 adcl %edi, %ecx
29371 +
29372 +#ifdef CONFIG_PAX_REFCOUNT
29373 + into
29374 +1234:
29375 + _ASM_EXTABLE(1234b, 3f)
29376 +#endif
29377 +
29378 LOCK_PREFIX
29379 cmpxchg8b (%esi)
29380 jne 1b
29381 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29382 CFI_ADJUST_CFA_OFFSET -8
29383 RESTORE ebx
29384 RESTORE ebp
29385 + pax_force_retaddr
29386 ret
29387 4:
29388 cmpl %edx, 4(%esp)
29389 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29390 xorl %ecx, %ecx
29391 addl $1, %ebx
29392 adcl %edx, %ecx
29393 +
29394 +#ifdef CONFIG_PAX_REFCOUNT
29395 + into
29396 +1234:
29397 + _ASM_EXTABLE(1234b, 3f)
29398 +#endif
29399 +
29400 LOCK_PREFIX
29401 cmpxchg8b (%esi)
29402 jne 1b
29403 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29404 movl $1, %eax
29405 3:
29406 RESTORE ebx
29407 + pax_force_retaddr
29408 ret
29409 CFI_ENDPROC
29410 ENDPROC(atomic64_inc_not_zero_cx8)
29411 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29412 index e78b8eee..7e173a8 100644
29413 --- a/arch/x86/lib/checksum_32.S
29414 +++ b/arch/x86/lib/checksum_32.S
29415 @@ -29,7 +29,8 @@
29416 #include <asm/dwarf2.h>
29417 #include <asm/errno.h>
29418 #include <asm/asm.h>
29419 -
29420 +#include <asm/segment.h>
29421 +
29422 /*
29423 * computes a partial checksum, e.g. for TCP/UDP fragments
29424 */
29425 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29426
29427 #define ARGBASE 16
29428 #define FP 12
29429 -
29430 -ENTRY(csum_partial_copy_generic)
29431 +
29432 +ENTRY(csum_partial_copy_generic_to_user)
29433 CFI_STARTPROC
29434 +
29435 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29436 + pushl_cfi %gs
29437 + popl_cfi %es
29438 + jmp csum_partial_copy_generic
29439 +#endif
29440 +
29441 +ENTRY(csum_partial_copy_generic_from_user)
29442 +
29443 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29444 + pushl_cfi %gs
29445 + popl_cfi %ds
29446 +#endif
29447 +
29448 +ENTRY(csum_partial_copy_generic)
29449 subl $4,%esp
29450 CFI_ADJUST_CFA_OFFSET 4
29451 pushl_cfi %edi
29452 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29453 jmp 4f
29454 SRC(1: movw (%esi), %bx )
29455 addl $2, %esi
29456 -DST( movw %bx, (%edi) )
29457 +DST( movw %bx, %es:(%edi) )
29458 addl $2, %edi
29459 addw %bx, %ax
29460 adcl $0, %eax
29461 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29462 SRC(1: movl (%esi), %ebx )
29463 SRC( movl 4(%esi), %edx )
29464 adcl %ebx, %eax
29465 -DST( movl %ebx, (%edi) )
29466 +DST( movl %ebx, %es:(%edi) )
29467 adcl %edx, %eax
29468 -DST( movl %edx, 4(%edi) )
29469 +DST( movl %edx, %es:4(%edi) )
29470
29471 SRC( movl 8(%esi), %ebx )
29472 SRC( movl 12(%esi), %edx )
29473 adcl %ebx, %eax
29474 -DST( movl %ebx, 8(%edi) )
29475 +DST( movl %ebx, %es:8(%edi) )
29476 adcl %edx, %eax
29477 -DST( movl %edx, 12(%edi) )
29478 +DST( movl %edx, %es:12(%edi) )
29479
29480 SRC( movl 16(%esi), %ebx )
29481 SRC( movl 20(%esi), %edx )
29482 adcl %ebx, %eax
29483 -DST( movl %ebx, 16(%edi) )
29484 +DST( movl %ebx, %es:16(%edi) )
29485 adcl %edx, %eax
29486 -DST( movl %edx, 20(%edi) )
29487 +DST( movl %edx, %es:20(%edi) )
29488
29489 SRC( movl 24(%esi), %ebx )
29490 SRC( movl 28(%esi), %edx )
29491 adcl %ebx, %eax
29492 -DST( movl %ebx, 24(%edi) )
29493 +DST( movl %ebx, %es:24(%edi) )
29494 adcl %edx, %eax
29495 -DST( movl %edx, 28(%edi) )
29496 +DST( movl %edx, %es:28(%edi) )
29497
29498 lea 32(%esi), %esi
29499 lea 32(%edi), %edi
29500 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29501 shrl $2, %edx # This clears CF
29502 SRC(3: movl (%esi), %ebx )
29503 adcl %ebx, %eax
29504 -DST( movl %ebx, (%edi) )
29505 +DST( movl %ebx, %es:(%edi) )
29506 lea 4(%esi), %esi
29507 lea 4(%edi), %edi
29508 dec %edx
29509 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29510 jb 5f
29511 SRC( movw (%esi), %cx )
29512 leal 2(%esi), %esi
29513 -DST( movw %cx, (%edi) )
29514 +DST( movw %cx, %es:(%edi) )
29515 leal 2(%edi), %edi
29516 je 6f
29517 shll $16,%ecx
29518 SRC(5: movb (%esi), %cl )
29519 -DST( movb %cl, (%edi) )
29520 +DST( movb %cl, %es:(%edi) )
29521 6: addl %ecx, %eax
29522 adcl $0, %eax
29523 7:
29524 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29525
29526 6001:
29527 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29528 - movl $-EFAULT, (%ebx)
29529 + movl $-EFAULT, %ss:(%ebx)
29530
29531 # zero the complete destination - computing the rest
29532 # is too much work
29533 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29534
29535 6002:
29536 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29537 - movl $-EFAULT,(%ebx)
29538 + movl $-EFAULT,%ss:(%ebx)
29539 jmp 5000b
29540
29541 .previous
29542
29543 + pushl_cfi %ss
29544 + popl_cfi %ds
29545 + pushl_cfi %ss
29546 + popl_cfi %es
29547 popl_cfi %ebx
29548 CFI_RESTORE ebx
29549 popl_cfi %esi
29550 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29551 popl_cfi %ecx # equivalent to addl $4,%esp
29552 ret
29553 CFI_ENDPROC
29554 -ENDPROC(csum_partial_copy_generic)
29555 +ENDPROC(csum_partial_copy_generic_to_user)
29556
29557 #else
29558
29559 /* Version for PentiumII/PPro */
29560
29561 #define ROUND1(x) \
29562 + nop; nop; nop; \
29563 SRC(movl x(%esi), %ebx ) ; \
29564 addl %ebx, %eax ; \
29565 - DST(movl %ebx, x(%edi) ) ;
29566 + DST(movl %ebx, %es:x(%edi)) ;
29567
29568 #define ROUND(x) \
29569 + nop; nop; nop; \
29570 SRC(movl x(%esi), %ebx ) ; \
29571 adcl %ebx, %eax ; \
29572 - DST(movl %ebx, x(%edi) ) ;
29573 + DST(movl %ebx, %es:x(%edi)) ;
29574
29575 #define ARGBASE 12
29576 -
29577 -ENTRY(csum_partial_copy_generic)
29578 +
29579 +ENTRY(csum_partial_copy_generic_to_user)
29580 CFI_STARTPROC
29581 +
29582 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29583 + pushl_cfi %gs
29584 + popl_cfi %es
29585 + jmp csum_partial_copy_generic
29586 +#endif
29587 +
29588 +ENTRY(csum_partial_copy_generic_from_user)
29589 +
29590 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29591 + pushl_cfi %gs
29592 + popl_cfi %ds
29593 +#endif
29594 +
29595 +ENTRY(csum_partial_copy_generic)
29596 pushl_cfi %ebx
29597 CFI_REL_OFFSET ebx, 0
29598 pushl_cfi %edi
29599 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29600 subl %ebx, %edi
29601 lea -1(%esi),%edx
29602 andl $-32,%edx
29603 - lea 3f(%ebx,%ebx), %ebx
29604 + lea 3f(%ebx,%ebx,2), %ebx
29605 testl %esi, %esi
29606 jmp *%ebx
29607 1: addl $64,%esi
29608 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29609 jb 5f
29610 SRC( movw (%esi), %dx )
29611 leal 2(%esi), %esi
29612 -DST( movw %dx, (%edi) )
29613 +DST( movw %dx, %es:(%edi) )
29614 leal 2(%edi), %edi
29615 je 6f
29616 shll $16,%edx
29617 5:
29618 SRC( movb (%esi), %dl )
29619 -DST( movb %dl, (%edi) )
29620 +DST( movb %dl, %es:(%edi) )
29621 6: addl %edx, %eax
29622 adcl $0, %eax
29623 7:
29624 .section .fixup, "ax"
29625 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29626 - movl $-EFAULT, (%ebx)
29627 + movl $-EFAULT, %ss:(%ebx)
29628 # zero the complete destination (computing the rest is too much work)
29629 movl ARGBASE+8(%esp),%edi # dst
29630 movl ARGBASE+12(%esp),%ecx # len
29631 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29632 rep; stosb
29633 jmp 7b
29634 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29635 - movl $-EFAULT, (%ebx)
29636 + movl $-EFAULT, %ss:(%ebx)
29637 jmp 7b
29638 .previous
29639
29640 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29641 + pushl_cfi %ss
29642 + popl_cfi %ds
29643 + pushl_cfi %ss
29644 + popl_cfi %es
29645 +#endif
29646 +
29647 popl_cfi %esi
29648 CFI_RESTORE esi
29649 popl_cfi %edi
29650 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29651 CFI_RESTORE ebx
29652 ret
29653 CFI_ENDPROC
29654 -ENDPROC(csum_partial_copy_generic)
29655 +ENDPROC(csum_partial_copy_generic_to_user)
29656
29657 #undef ROUND
29658 #undef ROUND1
29659 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29660 index f2145cf..cea889d 100644
29661 --- a/arch/x86/lib/clear_page_64.S
29662 +++ b/arch/x86/lib/clear_page_64.S
29663 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29664 movl $4096/8,%ecx
29665 xorl %eax,%eax
29666 rep stosq
29667 + pax_force_retaddr
29668 ret
29669 CFI_ENDPROC
29670 ENDPROC(clear_page_c)
29671 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29672 movl $4096,%ecx
29673 xorl %eax,%eax
29674 rep stosb
29675 + pax_force_retaddr
29676 ret
29677 CFI_ENDPROC
29678 ENDPROC(clear_page_c_e)
29679 @@ -43,6 +45,7 @@ ENTRY(clear_page)
29680 leaq 64(%rdi),%rdi
29681 jnz .Lloop
29682 nop
29683 + pax_force_retaddr
29684 ret
29685 CFI_ENDPROC
29686 .Lclear_page_end:
29687 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
29688
29689 #include <asm/cpufeature.h>
29690
29691 - .section .altinstr_replacement,"ax"
29692 + .section .altinstr_replacement,"a"
29693 1: .byte 0xeb /* jmp <disp8> */
29694 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29695 2: .byte 0xeb /* jmp <disp8> */
29696 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29697 index 40a1725..5d12ac4 100644
29698 --- a/arch/x86/lib/cmpxchg16b_emu.S
29699 +++ b/arch/x86/lib/cmpxchg16b_emu.S
29700 @@ -8,6 +8,7 @@
29701 #include <linux/linkage.h>
29702 #include <asm/dwarf2.h>
29703 #include <asm/percpu.h>
29704 +#include <asm/alternative-asm.h>
29705
29706 .text
29707
29708 @@ -46,12 +47,14 @@ CFI_STARTPROC
29709 CFI_REMEMBER_STATE
29710 popfq_cfi
29711 mov $1, %al
29712 + pax_force_retaddr
29713 ret
29714
29715 CFI_RESTORE_STATE
29716 .Lnot_same:
29717 popfq_cfi
29718 xor %al,%al
29719 + pax_force_retaddr
29720 ret
29721
29722 CFI_ENDPROC
29723 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29724 index 176cca6..e0d658e 100644
29725 --- a/arch/x86/lib/copy_page_64.S
29726 +++ b/arch/x86/lib/copy_page_64.S
29727 @@ -9,6 +9,7 @@ copy_page_rep:
29728 CFI_STARTPROC
29729 movl $4096/8, %ecx
29730 rep movsq
29731 + pax_force_retaddr
29732 ret
29733 CFI_ENDPROC
29734 ENDPROC(copy_page_rep)
29735 @@ -24,8 +25,8 @@ ENTRY(copy_page)
29736 CFI_ADJUST_CFA_OFFSET 2*8
29737 movq %rbx, (%rsp)
29738 CFI_REL_OFFSET rbx, 0
29739 - movq %r12, 1*8(%rsp)
29740 - CFI_REL_OFFSET r12, 1*8
29741 + movq %r13, 1*8(%rsp)
29742 + CFI_REL_OFFSET r13, 1*8
29743
29744 movl $(4096/64)-5, %ecx
29745 .p2align 4
29746 @@ -38,7 +39,7 @@ ENTRY(copy_page)
29747 movq 0x8*4(%rsi), %r9
29748 movq 0x8*5(%rsi), %r10
29749 movq 0x8*6(%rsi), %r11
29750 - movq 0x8*7(%rsi), %r12
29751 + movq 0x8*7(%rsi), %r13
29752
29753 prefetcht0 5*64(%rsi)
29754
29755 @@ -49,7 +50,7 @@ ENTRY(copy_page)
29756 movq %r9, 0x8*4(%rdi)
29757 movq %r10, 0x8*5(%rdi)
29758 movq %r11, 0x8*6(%rdi)
29759 - movq %r12, 0x8*7(%rdi)
29760 + movq %r13, 0x8*7(%rdi)
29761
29762 leaq 64 (%rsi), %rsi
29763 leaq 64 (%rdi), %rdi
29764 @@ -68,7 +69,7 @@ ENTRY(copy_page)
29765 movq 0x8*4(%rsi), %r9
29766 movq 0x8*5(%rsi), %r10
29767 movq 0x8*6(%rsi), %r11
29768 - movq 0x8*7(%rsi), %r12
29769 + movq 0x8*7(%rsi), %r13
29770
29771 movq %rax, 0x8*0(%rdi)
29772 movq %rbx, 0x8*1(%rdi)
29773 @@ -77,7 +78,7 @@ ENTRY(copy_page)
29774 movq %r9, 0x8*4(%rdi)
29775 movq %r10, 0x8*5(%rdi)
29776 movq %r11, 0x8*6(%rdi)
29777 - movq %r12, 0x8*7(%rdi)
29778 + movq %r13, 0x8*7(%rdi)
29779
29780 leaq 64(%rdi), %rdi
29781 leaq 64(%rsi), %rsi
29782 @@ -85,10 +86,11 @@ ENTRY(copy_page)
29783
29784 movq (%rsp), %rbx
29785 CFI_RESTORE rbx
29786 - movq 1*8(%rsp), %r12
29787 - CFI_RESTORE r12
29788 + movq 1*8(%rsp), %r13
29789 + CFI_RESTORE r13
29790 addq $2*8, %rsp
29791 CFI_ADJUST_CFA_OFFSET -2*8
29792 + pax_force_retaddr
29793 ret
29794 .Lcopy_page_end:
29795 CFI_ENDPROC
29796 @@ -99,7 +101,7 @@ ENDPROC(copy_page)
29797
29798 #include <asm/cpufeature.h>
29799
29800 - .section .altinstr_replacement,"ax"
29801 + .section .altinstr_replacement,"a"
29802 1: .byte 0xeb /* jmp <disp8> */
29803 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29804 2:
29805 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29806 index dee945d..a84067b 100644
29807 --- a/arch/x86/lib/copy_user_64.S
29808 +++ b/arch/x86/lib/copy_user_64.S
29809 @@ -18,31 +18,7 @@
29810 #include <asm/alternative-asm.h>
29811 #include <asm/asm.h>
29812 #include <asm/smap.h>
29813 -
29814 -/*
29815 - * By placing feature2 after feature1 in altinstructions section, we logically
29816 - * implement:
29817 - * If CPU has feature2, jmp to alt2 is used
29818 - * else if CPU has feature1, jmp to alt1 is used
29819 - * else jmp to orig is used.
29820 - */
29821 - .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29822 -0:
29823 - .byte 0xe9 /* 32bit jump */
29824 - .long \orig-1f /* by default jump to orig */
29825 -1:
29826 - .section .altinstr_replacement,"ax"
29827 -2: .byte 0xe9 /* near jump with 32bit immediate */
29828 - .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29829 -3: .byte 0xe9 /* near jump with 32bit immediate */
29830 - .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29831 - .previous
29832 -
29833 - .section .altinstructions,"a"
29834 - altinstruction_entry 0b,2b,\feature1,5,5
29835 - altinstruction_entry 0b,3b,\feature2,5,5
29836 - .previous
29837 - .endm
29838 +#include <asm/pgtable.h>
29839
29840 .macro ALIGN_DESTINATION
29841 #ifdef FIX_ALIGNMENT
29842 @@ -70,52 +46,6 @@
29843 #endif
29844 .endm
29845
29846 -/* Standard copy_to_user with segment limit checking */
29847 -ENTRY(_copy_to_user)
29848 - CFI_STARTPROC
29849 - GET_THREAD_INFO(%rax)
29850 - movq %rdi,%rcx
29851 - addq %rdx,%rcx
29852 - jc bad_to_user
29853 - cmpq TI_addr_limit(%rax),%rcx
29854 - ja bad_to_user
29855 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29856 - copy_user_generic_unrolled,copy_user_generic_string, \
29857 - copy_user_enhanced_fast_string
29858 - CFI_ENDPROC
29859 -ENDPROC(_copy_to_user)
29860 -
29861 -/* Standard copy_from_user with segment limit checking */
29862 -ENTRY(_copy_from_user)
29863 - CFI_STARTPROC
29864 - GET_THREAD_INFO(%rax)
29865 - movq %rsi,%rcx
29866 - addq %rdx,%rcx
29867 - jc bad_from_user
29868 - cmpq TI_addr_limit(%rax),%rcx
29869 - ja bad_from_user
29870 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29871 - copy_user_generic_unrolled,copy_user_generic_string, \
29872 - copy_user_enhanced_fast_string
29873 - CFI_ENDPROC
29874 -ENDPROC(_copy_from_user)
29875 -
29876 - .section .fixup,"ax"
29877 - /* must zero dest */
29878 -ENTRY(bad_from_user)
29879 -bad_from_user:
29880 - CFI_STARTPROC
29881 - movl %edx,%ecx
29882 - xorl %eax,%eax
29883 - rep
29884 - stosb
29885 -bad_to_user:
29886 - movl %edx,%eax
29887 - ret
29888 - CFI_ENDPROC
29889 -ENDPROC(bad_from_user)
29890 - .previous
29891 -
29892 /*
29893 * copy_user_generic_unrolled - memory copy with exception handling.
29894 * This version is for CPUs like P4 that don't have efficient micro
29895 @@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29896 */
29897 ENTRY(copy_user_generic_unrolled)
29898 CFI_STARTPROC
29899 + ASM_PAX_OPEN_USERLAND
29900 ASM_STAC
29901 cmpl $8,%edx
29902 jb 20f /* less then 8 bytes, go to byte copy loop */
29903 @@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29904 jnz 21b
29905 23: xor %eax,%eax
29906 ASM_CLAC
29907 + ASM_PAX_CLOSE_USERLAND
29908 + pax_force_retaddr
29909 ret
29910
29911 .section .fixup,"ax"
29912 @@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29913 */
29914 ENTRY(copy_user_generic_string)
29915 CFI_STARTPROC
29916 + ASM_PAX_OPEN_USERLAND
29917 ASM_STAC
29918 cmpl $8,%edx
29919 jb 2f /* less than 8 bytes, go to byte copy loop */
29920 @@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29921 movsb
29922 xorl %eax,%eax
29923 ASM_CLAC
29924 + ASM_PAX_CLOSE_USERLAND
29925 + pax_force_retaddr
29926 ret
29927
29928 .section .fixup,"ax"
29929 @@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29930 */
29931 ENTRY(copy_user_enhanced_fast_string)
29932 CFI_STARTPROC
29933 + ASM_PAX_OPEN_USERLAND
29934 ASM_STAC
29935 movl %edx,%ecx
29936 1: rep
29937 movsb
29938 xorl %eax,%eax
29939 ASM_CLAC
29940 + ASM_PAX_CLOSE_USERLAND
29941 + pax_force_retaddr
29942 ret
29943
29944 .section .fixup,"ax"
29945 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29946 index 6a4f43c..c70fb52 100644
29947 --- a/arch/x86/lib/copy_user_nocache_64.S
29948 +++ b/arch/x86/lib/copy_user_nocache_64.S
29949 @@ -8,6 +8,7 @@
29950
29951 #include <linux/linkage.h>
29952 #include <asm/dwarf2.h>
29953 +#include <asm/alternative-asm.h>
29954
29955 #define FIX_ALIGNMENT 1
29956
29957 @@ -16,6 +17,7 @@
29958 #include <asm/thread_info.h>
29959 #include <asm/asm.h>
29960 #include <asm/smap.h>
29961 +#include <asm/pgtable.h>
29962
29963 .macro ALIGN_DESTINATION
29964 #ifdef FIX_ALIGNMENT
29965 @@ -49,6 +51,16 @@
29966 */
29967 ENTRY(__copy_user_nocache)
29968 CFI_STARTPROC
29969 +
29970 +#ifdef CONFIG_PAX_MEMORY_UDEREF
29971 + mov pax_user_shadow_base,%rcx
29972 + cmp %rcx,%rsi
29973 + jae 1f
29974 + add %rcx,%rsi
29975 +1:
29976 +#endif
29977 +
29978 + ASM_PAX_OPEN_USERLAND
29979 ASM_STAC
29980 cmpl $8,%edx
29981 jb 20f /* less then 8 bytes, go to byte copy loop */
29982 @@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29983 jnz 21b
29984 23: xorl %eax,%eax
29985 ASM_CLAC
29986 + ASM_PAX_CLOSE_USERLAND
29987 sfence
29988 + pax_force_retaddr
29989 ret
29990
29991 .section .fixup,"ax"
29992 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29993 index 2419d5f..fe52d0e 100644
29994 --- a/arch/x86/lib/csum-copy_64.S
29995 +++ b/arch/x86/lib/csum-copy_64.S
29996 @@ -9,6 +9,7 @@
29997 #include <asm/dwarf2.h>
29998 #include <asm/errno.h>
29999 #include <asm/asm.h>
30000 +#include <asm/alternative-asm.h>
30001
30002 /*
30003 * Checksum copy with exception handling.
30004 @@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30005 CFI_ADJUST_CFA_OFFSET 7*8
30006 movq %rbx, 2*8(%rsp)
30007 CFI_REL_OFFSET rbx, 2*8
30008 - movq %r12, 3*8(%rsp)
30009 - CFI_REL_OFFSET r12, 3*8
30010 + movq %r15, 3*8(%rsp)
30011 + CFI_REL_OFFSET r15, 3*8
30012 movq %r14, 4*8(%rsp)
30013 CFI_REL_OFFSET r14, 4*8
30014 movq %r13, 5*8(%rsp)
30015 @@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30016 movl %edx, %ecx
30017
30018 xorl %r9d, %r9d
30019 - movq %rcx, %r12
30020 + movq %rcx, %r15
30021
30022 - shrq $6, %r12
30023 + shrq $6, %r15
30024 jz .Lhandle_tail /* < 64 */
30025
30026 clc
30027
30028 /* main loop. clear in 64 byte blocks */
30029 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30030 - /* r11: temp3, rdx: temp4, r12 loopcnt */
30031 + /* r11: temp3, rdx: temp4, r15 loopcnt */
30032 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30033 .p2align 4
30034 .Lloop:
30035 @@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30036 adcq %r14, %rax
30037 adcq %r13, %rax
30038
30039 - decl %r12d
30040 + decl %r15d
30041
30042 dest
30043 movq %rbx, (%rsi)
30044 @@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30045 .Lende:
30046 movq 2*8(%rsp), %rbx
30047 CFI_RESTORE rbx
30048 - movq 3*8(%rsp), %r12
30049 - CFI_RESTORE r12
30050 + movq 3*8(%rsp), %r15
30051 + CFI_RESTORE r15
30052 movq 4*8(%rsp), %r14
30053 CFI_RESTORE r14
30054 movq 5*8(%rsp), %r13
30055 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30056 CFI_RESTORE rbp
30057 addq $7*8, %rsp
30058 CFI_ADJUST_CFA_OFFSET -7*8
30059 + pax_force_retaddr
30060 ret
30061 CFI_RESTORE_STATE
30062
30063 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30064 index 1318f75..44c30fd 100644
30065 --- a/arch/x86/lib/csum-wrappers_64.c
30066 +++ b/arch/x86/lib/csum-wrappers_64.c
30067 @@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30068 len -= 2;
30069 }
30070 }
30071 + pax_open_userland();
30072 stac();
30073 - isum = csum_partial_copy_generic((__force const void *)src,
30074 + isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30075 dst, len, isum, errp, NULL);
30076 clac();
30077 + pax_close_userland();
30078 if (unlikely(*errp))
30079 goto out_err;
30080
30081 @@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30082 }
30083
30084 *errp = 0;
30085 + pax_open_userland();
30086 stac();
30087 - ret = csum_partial_copy_generic(src, (void __force *)dst,
30088 + ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30089 len, isum, NULL, errp);
30090 clac();
30091 + pax_close_userland();
30092 return ret;
30093 }
30094 EXPORT_SYMBOL(csum_partial_copy_to_user);
30095 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30096 index a451235..1daa956 100644
30097 --- a/arch/x86/lib/getuser.S
30098 +++ b/arch/x86/lib/getuser.S
30099 @@ -33,17 +33,40 @@
30100 #include <asm/thread_info.h>
30101 #include <asm/asm.h>
30102 #include <asm/smap.h>
30103 +#include <asm/segment.h>
30104 +#include <asm/pgtable.h>
30105 +#include <asm/alternative-asm.h>
30106 +
30107 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30108 +#define __copyuser_seg gs;
30109 +#else
30110 +#define __copyuser_seg
30111 +#endif
30112
30113 .text
30114 ENTRY(__get_user_1)
30115 CFI_STARTPROC
30116 +
30117 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30118 GET_THREAD_INFO(%_ASM_DX)
30119 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30120 jae bad_get_user
30121 ASM_STAC
30122 -1: movzbl (%_ASM_AX),%edx
30123 +
30124 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30125 + mov pax_user_shadow_base,%_ASM_DX
30126 + cmp %_ASM_DX,%_ASM_AX
30127 + jae 1234f
30128 + add %_ASM_DX,%_ASM_AX
30129 +1234:
30130 +#endif
30131 +
30132 +#endif
30133 +
30134 +1: __copyuser_seg movzbl (%_ASM_AX),%edx
30135 xor %eax,%eax
30136 ASM_CLAC
30137 + pax_force_retaddr
30138 ret
30139 CFI_ENDPROC
30140 ENDPROC(__get_user_1)
30141 @@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30142 ENTRY(__get_user_2)
30143 CFI_STARTPROC
30144 add $1,%_ASM_AX
30145 +
30146 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30147 jc bad_get_user
30148 GET_THREAD_INFO(%_ASM_DX)
30149 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30150 jae bad_get_user
30151 ASM_STAC
30152 -2: movzwl -1(%_ASM_AX),%edx
30153 +
30154 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30155 + mov pax_user_shadow_base,%_ASM_DX
30156 + cmp %_ASM_DX,%_ASM_AX
30157 + jae 1234f
30158 + add %_ASM_DX,%_ASM_AX
30159 +1234:
30160 +#endif
30161 +
30162 +#endif
30163 +
30164 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30165 xor %eax,%eax
30166 ASM_CLAC
30167 + pax_force_retaddr
30168 ret
30169 CFI_ENDPROC
30170 ENDPROC(__get_user_2)
30171 @@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30172 ENTRY(__get_user_4)
30173 CFI_STARTPROC
30174 add $3,%_ASM_AX
30175 +
30176 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30177 jc bad_get_user
30178 GET_THREAD_INFO(%_ASM_DX)
30179 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30180 jae bad_get_user
30181 ASM_STAC
30182 -3: movl -3(%_ASM_AX),%edx
30183 +
30184 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30185 + mov pax_user_shadow_base,%_ASM_DX
30186 + cmp %_ASM_DX,%_ASM_AX
30187 + jae 1234f
30188 + add %_ASM_DX,%_ASM_AX
30189 +1234:
30190 +#endif
30191 +
30192 +#endif
30193 +
30194 +3: __copyuser_seg movl -3(%_ASM_AX),%edx
30195 xor %eax,%eax
30196 ASM_CLAC
30197 + pax_force_retaddr
30198 ret
30199 CFI_ENDPROC
30200 ENDPROC(__get_user_4)
30201 @@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30202 GET_THREAD_INFO(%_ASM_DX)
30203 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30204 jae bad_get_user
30205 +
30206 +#ifdef CONFIG_PAX_MEMORY_UDEREF
30207 + mov pax_user_shadow_base,%_ASM_DX
30208 + cmp %_ASM_DX,%_ASM_AX
30209 + jae 1234f
30210 + add %_ASM_DX,%_ASM_AX
30211 +1234:
30212 +#endif
30213 +
30214 ASM_STAC
30215 4: movq -7(%_ASM_AX),%rdx
30216 xor %eax,%eax
30217 ASM_CLAC
30218 + pax_force_retaddr
30219 ret
30220 #else
30221 add $7,%_ASM_AX
30222 @@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30223 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30224 jae bad_get_user_8
30225 ASM_STAC
30226 -4: movl -7(%_ASM_AX),%edx
30227 -5: movl -3(%_ASM_AX),%ecx
30228 +4: __copyuser_seg movl -7(%_ASM_AX),%edx
30229 +5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30230 xor %eax,%eax
30231 ASM_CLAC
30232 + pax_force_retaddr
30233 ret
30234 #endif
30235 CFI_ENDPROC
30236 @@ -113,6 +175,7 @@ bad_get_user:
30237 xor %edx,%edx
30238 mov $(-EFAULT),%_ASM_AX
30239 ASM_CLAC
30240 + pax_force_retaddr
30241 ret
30242 CFI_ENDPROC
30243 END(bad_get_user)
30244 @@ -124,6 +187,7 @@ bad_get_user_8:
30245 xor %ecx,%ecx
30246 mov $(-EFAULT),%_ASM_AX
30247 ASM_CLAC
30248 + pax_force_retaddr
30249 ret
30250 CFI_ENDPROC
30251 END(bad_get_user_8)
30252 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30253 index 54fcffe..7be149e 100644
30254 --- a/arch/x86/lib/insn.c
30255 +++ b/arch/x86/lib/insn.c
30256 @@ -20,8 +20,10 @@
30257
30258 #ifdef __KERNEL__
30259 #include <linux/string.h>
30260 +#include <asm/pgtable_types.h>
30261 #else
30262 #include <string.h>
30263 +#define ktla_ktva(addr) addr
30264 #endif
30265 #include <asm/inat.h>
30266 #include <asm/insn.h>
30267 @@ -53,8 +55,8 @@
30268 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30269 {
30270 memset(insn, 0, sizeof(*insn));
30271 - insn->kaddr = kaddr;
30272 - insn->next_byte = kaddr;
30273 + insn->kaddr = ktla_ktva(kaddr);
30274 + insn->next_byte = ktla_ktva(kaddr);
30275 insn->x86_64 = x86_64 ? 1 : 0;
30276 insn->opnd_bytes = 4;
30277 if (x86_64)
30278 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30279 index 05a95e7..326f2fa 100644
30280 --- a/arch/x86/lib/iomap_copy_64.S
30281 +++ b/arch/x86/lib/iomap_copy_64.S
30282 @@ -17,6 +17,7 @@
30283
30284 #include <linux/linkage.h>
30285 #include <asm/dwarf2.h>
30286 +#include <asm/alternative-asm.h>
30287
30288 /*
30289 * override generic version in lib/iomap_copy.c
30290 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30291 CFI_STARTPROC
30292 movl %edx,%ecx
30293 rep movsd
30294 + pax_force_retaddr
30295 ret
30296 CFI_ENDPROC
30297 ENDPROC(__iowrite32_copy)
30298 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30299 index 56313a3..0db417e 100644
30300 --- a/arch/x86/lib/memcpy_64.S
30301 +++ b/arch/x86/lib/memcpy_64.S
30302 @@ -24,7 +24,7 @@
30303 * This gets patched over the unrolled variant (below) via the
30304 * alternative instructions framework:
30305 */
30306 - .section .altinstr_replacement, "ax", @progbits
30307 + .section .altinstr_replacement, "a", @progbits
30308 .Lmemcpy_c:
30309 movq %rdi, %rax
30310 movq %rdx, %rcx
30311 @@ -33,6 +33,7 @@
30312 rep movsq
30313 movl %edx, %ecx
30314 rep movsb
30315 + pax_force_retaddr
30316 ret
30317 .Lmemcpy_e:
30318 .previous
30319 @@ -44,11 +45,12 @@
30320 * This gets patched over the unrolled variant (below) via the
30321 * alternative instructions framework:
30322 */
30323 - .section .altinstr_replacement, "ax", @progbits
30324 + .section .altinstr_replacement, "a", @progbits
30325 .Lmemcpy_c_e:
30326 movq %rdi, %rax
30327 movq %rdx, %rcx
30328 rep movsb
30329 + pax_force_retaddr
30330 ret
30331 .Lmemcpy_e_e:
30332 .previous
30333 @@ -136,6 +138,7 @@ ENTRY(memcpy)
30334 movq %r9, 1*8(%rdi)
30335 movq %r10, -2*8(%rdi, %rdx)
30336 movq %r11, -1*8(%rdi, %rdx)
30337 + pax_force_retaddr
30338 retq
30339 .p2align 4
30340 .Lless_16bytes:
30341 @@ -148,6 +151,7 @@ ENTRY(memcpy)
30342 movq -1*8(%rsi, %rdx), %r9
30343 movq %r8, 0*8(%rdi)
30344 movq %r9, -1*8(%rdi, %rdx)
30345 + pax_force_retaddr
30346 retq
30347 .p2align 4
30348 .Lless_8bytes:
30349 @@ -161,6 +165,7 @@ ENTRY(memcpy)
30350 movl -4(%rsi, %rdx), %r8d
30351 movl %ecx, (%rdi)
30352 movl %r8d, -4(%rdi, %rdx)
30353 + pax_force_retaddr
30354 retq
30355 .p2align 4
30356 .Lless_3bytes:
30357 @@ -179,6 +184,7 @@ ENTRY(memcpy)
30358 movb %cl, (%rdi)
30359
30360 .Lend:
30361 + pax_force_retaddr
30362 retq
30363 CFI_ENDPROC
30364 ENDPROC(memcpy)
30365 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30366 index 65268a6..dd1de11 100644
30367 --- a/arch/x86/lib/memmove_64.S
30368 +++ b/arch/x86/lib/memmove_64.S
30369 @@ -202,14 +202,16 @@ ENTRY(memmove)
30370 movb (%rsi), %r11b
30371 movb %r11b, (%rdi)
30372 13:
30373 + pax_force_retaddr
30374 retq
30375 CFI_ENDPROC
30376
30377 - .section .altinstr_replacement,"ax"
30378 + .section .altinstr_replacement,"a"
30379 .Lmemmove_begin_forward_efs:
30380 /* Forward moving data. */
30381 movq %rdx, %rcx
30382 rep movsb
30383 + pax_force_retaddr
30384 retq
30385 .Lmemmove_end_forward_efs:
30386 .previous
30387 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30388 index 2dcb380..2eb79fe 100644
30389 --- a/arch/x86/lib/memset_64.S
30390 +++ b/arch/x86/lib/memset_64.S
30391 @@ -16,7 +16,7 @@
30392 *
30393 * rax original destination
30394 */
30395 - .section .altinstr_replacement, "ax", @progbits
30396 + .section .altinstr_replacement, "a", @progbits
30397 .Lmemset_c:
30398 movq %rdi,%r9
30399 movq %rdx,%rcx
30400 @@ -30,6 +30,7 @@
30401 movl %edx,%ecx
30402 rep stosb
30403 movq %r9,%rax
30404 + pax_force_retaddr
30405 ret
30406 .Lmemset_e:
30407 .previous
30408 @@ -45,13 +46,14 @@
30409 *
30410 * rax original destination
30411 */
30412 - .section .altinstr_replacement, "ax", @progbits
30413 + .section .altinstr_replacement, "a", @progbits
30414 .Lmemset_c_e:
30415 movq %rdi,%r9
30416 movb %sil,%al
30417 movq %rdx,%rcx
30418 rep stosb
30419 movq %r9,%rax
30420 + pax_force_retaddr
30421 ret
30422 .Lmemset_e_e:
30423 .previous
30424 @@ -118,6 +120,7 @@ ENTRY(__memset)
30425
30426 .Lende:
30427 movq %r10,%rax
30428 + pax_force_retaddr
30429 ret
30430
30431 CFI_RESTORE_STATE
30432 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30433 index c9f2d9b..e7fd2c0 100644
30434 --- a/arch/x86/lib/mmx_32.c
30435 +++ b/arch/x86/lib/mmx_32.c
30436 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30437 {
30438 void *p;
30439 int i;
30440 + unsigned long cr0;
30441
30442 if (unlikely(in_interrupt()))
30443 return __memcpy(to, from, len);
30444 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30445 kernel_fpu_begin();
30446
30447 __asm__ __volatile__ (
30448 - "1: prefetch (%0)\n" /* This set is 28 bytes */
30449 - " prefetch 64(%0)\n"
30450 - " prefetch 128(%0)\n"
30451 - " prefetch 192(%0)\n"
30452 - " prefetch 256(%0)\n"
30453 + "1: prefetch (%1)\n" /* This set is 28 bytes */
30454 + " prefetch 64(%1)\n"
30455 + " prefetch 128(%1)\n"
30456 + " prefetch 192(%1)\n"
30457 + " prefetch 256(%1)\n"
30458 "2: \n"
30459 ".section .fixup, \"ax\"\n"
30460 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30461 + "3: \n"
30462 +
30463 +#ifdef CONFIG_PAX_KERNEXEC
30464 + " movl %%cr0, %0\n"
30465 + " movl %0, %%eax\n"
30466 + " andl $0xFFFEFFFF, %%eax\n"
30467 + " movl %%eax, %%cr0\n"
30468 +#endif
30469 +
30470 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30471 +
30472 +#ifdef CONFIG_PAX_KERNEXEC
30473 + " movl %0, %%cr0\n"
30474 +#endif
30475 +
30476 " jmp 2b\n"
30477 ".previous\n"
30478 _ASM_EXTABLE(1b, 3b)
30479 - : : "r" (from));
30480 + : "=&r" (cr0) : "r" (from) : "ax");
30481
30482 for ( ; i > 5; i--) {
30483 __asm__ __volatile__ (
30484 - "1: prefetch 320(%0)\n"
30485 - "2: movq (%0), %%mm0\n"
30486 - " movq 8(%0), %%mm1\n"
30487 - " movq 16(%0), %%mm2\n"
30488 - " movq 24(%0), %%mm3\n"
30489 - " movq %%mm0, (%1)\n"
30490 - " movq %%mm1, 8(%1)\n"
30491 - " movq %%mm2, 16(%1)\n"
30492 - " movq %%mm3, 24(%1)\n"
30493 - " movq 32(%0), %%mm0\n"
30494 - " movq 40(%0), %%mm1\n"
30495 - " movq 48(%0), %%mm2\n"
30496 - " movq 56(%0), %%mm3\n"
30497 - " movq %%mm0, 32(%1)\n"
30498 - " movq %%mm1, 40(%1)\n"
30499 - " movq %%mm2, 48(%1)\n"
30500 - " movq %%mm3, 56(%1)\n"
30501 + "1: prefetch 320(%1)\n"
30502 + "2: movq (%1), %%mm0\n"
30503 + " movq 8(%1), %%mm1\n"
30504 + " movq 16(%1), %%mm2\n"
30505 + " movq 24(%1), %%mm3\n"
30506 + " movq %%mm0, (%2)\n"
30507 + " movq %%mm1, 8(%2)\n"
30508 + " movq %%mm2, 16(%2)\n"
30509 + " movq %%mm3, 24(%2)\n"
30510 + " movq 32(%1), %%mm0\n"
30511 + " movq 40(%1), %%mm1\n"
30512 + " movq 48(%1), %%mm2\n"
30513 + " movq 56(%1), %%mm3\n"
30514 + " movq %%mm0, 32(%2)\n"
30515 + " movq %%mm1, 40(%2)\n"
30516 + " movq %%mm2, 48(%2)\n"
30517 + " movq %%mm3, 56(%2)\n"
30518 ".section .fixup, \"ax\"\n"
30519 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30520 + "3:\n"
30521 +
30522 +#ifdef CONFIG_PAX_KERNEXEC
30523 + " movl %%cr0, %0\n"
30524 + " movl %0, %%eax\n"
30525 + " andl $0xFFFEFFFF, %%eax\n"
30526 + " movl %%eax, %%cr0\n"
30527 +#endif
30528 +
30529 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30530 +
30531 +#ifdef CONFIG_PAX_KERNEXEC
30532 + " movl %0, %%cr0\n"
30533 +#endif
30534 +
30535 " jmp 2b\n"
30536 ".previous\n"
30537 _ASM_EXTABLE(1b, 3b)
30538 - : : "r" (from), "r" (to) : "memory");
30539 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30540
30541 from += 64;
30542 to += 64;
30543 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30544 static void fast_copy_page(void *to, void *from)
30545 {
30546 int i;
30547 + unsigned long cr0;
30548
30549 kernel_fpu_begin();
30550
30551 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30552 * but that is for later. -AV
30553 */
30554 __asm__ __volatile__(
30555 - "1: prefetch (%0)\n"
30556 - " prefetch 64(%0)\n"
30557 - " prefetch 128(%0)\n"
30558 - " prefetch 192(%0)\n"
30559 - " prefetch 256(%0)\n"
30560 + "1: prefetch (%1)\n"
30561 + " prefetch 64(%1)\n"
30562 + " prefetch 128(%1)\n"
30563 + " prefetch 192(%1)\n"
30564 + " prefetch 256(%1)\n"
30565 "2: \n"
30566 ".section .fixup, \"ax\"\n"
30567 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30568 + "3: \n"
30569 +
30570 +#ifdef CONFIG_PAX_KERNEXEC
30571 + " movl %%cr0, %0\n"
30572 + " movl %0, %%eax\n"
30573 + " andl $0xFFFEFFFF, %%eax\n"
30574 + " movl %%eax, %%cr0\n"
30575 +#endif
30576 +
30577 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30578 +
30579 +#ifdef CONFIG_PAX_KERNEXEC
30580 + " movl %0, %%cr0\n"
30581 +#endif
30582 +
30583 " jmp 2b\n"
30584 ".previous\n"
30585 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30586 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30587
30588 for (i = 0; i < (4096-320)/64; i++) {
30589 __asm__ __volatile__ (
30590 - "1: prefetch 320(%0)\n"
30591 - "2: movq (%0), %%mm0\n"
30592 - " movntq %%mm0, (%1)\n"
30593 - " movq 8(%0), %%mm1\n"
30594 - " movntq %%mm1, 8(%1)\n"
30595 - " movq 16(%0), %%mm2\n"
30596 - " movntq %%mm2, 16(%1)\n"
30597 - " movq 24(%0), %%mm3\n"
30598 - " movntq %%mm3, 24(%1)\n"
30599 - " movq 32(%0), %%mm4\n"
30600 - " movntq %%mm4, 32(%1)\n"
30601 - " movq 40(%0), %%mm5\n"
30602 - " movntq %%mm5, 40(%1)\n"
30603 - " movq 48(%0), %%mm6\n"
30604 - " movntq %%mm6, 48(%1)\n"
30605 - " movq 56(%0), %%mm7\n"
30606 - " movntq %%mm7, 56(%1)\n"
30607 + "1: prefetch 320(%1)\n"
30608 + "2: movq (%1), %%mm0\n"
30609 + " movntq %%mm0, (%2)\n"
30610 + " movq 8(%1), %%mm1\n"
30611 + " movntq %%mm1, 8(%2)\n"
30612 + " movq 16(%1), %%mm2\n"
30613 + " movntq %%mm2, 16(%2)\n"
30614 + " movq 24(%1), %%mm3\n"
30615 + " movntq %%mm3, 24(%2)\n"
30616 + " movq 32(%1), %%mm4\n"
30617 + " movntq %%mm4, 32(%2)\n"
30618 + " movq 40(%1), %%mm5\n"
30619 + " movntq %%mm5, 40(%2)\n"
30620 + " movq 48(%1), %%mm6\n"
30621 + " movntq %%mm6, 48(%2)\n"
30622 + " movq 56(%1), %%mm7\n"
30623 + " movntq %%mm7, 56(%2)\n"
30624 ".section .fixup, \"ax\"\n"
30625 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30626 + "3:\n"
30627 +
30628 +#ifdef CONFIG_PAX_KERNEXEC
30629 + " movl %%cr0, %0\n"
30630 + " movl %0, %%eax\n"
30631 + " andl $0xFFFEFFFF, %%eax\n"
30632 + " movl %%eax, %%cr0\n"
30633 +#endif
30634 +
30635 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30636 +
30637 +#ifdef CONFIG_PAX_KERNEXEC
30638 + " movl %0, %%cr0\n"
30639 +#endif
30640 +
30641 " jmp 2b\n"
30642 ".previous\n"
30643 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30644 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30645
30646 from += 64;
30647 to += 64;
30648 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30649 static void fast_copy_page(void *to, void *from)
30650 {
30651 int i;
30652 + unsigned long cr0;
30653
30654 kernel_fpu_begin();
30655
30656 __asm__ __volatile__ (
30657 - "1: prefetch (%0)\n"
30658 - " prefetch 64(%0)\n"
30659 - " prefetch 128(%0)\n"
30660 - " prefetch 192(%0)\n"
30661 - " prefetch 256(%0)\n"
30662 + "1: prefetch (%1)\n"
30663 + " prefetch 64(%1)\n"
30664 + " prefetch 128(%1)\n"
30665 + " prefetch 192(%1)\n"
30666 + " prefetch 256(%1)\n"
30667 "2: \n"
30668 ".section .fixup, \"ax\"\n"
30669 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30670 + "3: \n"
30671 +
30672 +#ifdef CONFIG_PAX_KERNEXEC
30673 + " movl %%cr0, %0\n"
30674 + " movl %0, %%eax\n"
30675 + " andl $0xFFFEFFFF, %%eax\n"
30676 + " movl %%eax, %%cr0\n"
30677 +#endif
30678 +
30679 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30680 +
30681 +#ifdef CONFIG_PAX_KERNEXEC
30682 + " movl %0, %%cr0\n"
30683 +#endif
30684 +
30685 " jmp 2b\n"
30686 ".previous\n"
30687 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
30688 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30689
30690 for (i = 0; i < 4096/64; i++) {
30691 __asm__ __volatile__ (
30692 - "1: prefetch 320(%0)\n"
30693 - "2: movq (%0), %%mm0\n"
30694 - " movq 8(%0), %%mm1\n"
30695 - " movq 16(%0), %%mm2\n"
30696 - " movq 24(%0), %%mm3\n"
30697 - " movq %%mm0, (%1)\n"
30698 - " movq %%mm1, 8(%1)\n"
30699 - " movq %%mm2, 16(%1)\n"
30700 - " movq %%mm3, 24(%1)\n"
30701 - " movq 32(%0), %%mm0\n"
30702 - " movq 40(%0), %%mm1\n"
30703 - " movq 48(%0), %%mm2\n"
30704 - " movq 56(%0), %%mm3\n"
30705 - " movq %%mm0, 32(%1)\n"
30706 - " movq %%mm1, 40(%1)\n"
30707 - " movq %%mm2, 48(%1)\n"
30708 - " movq %%mm3, 56(%1)\n"
30709 + "1: prefetch 320(%1)\n"
30710 + "2: movq (%1), %%mm0\n"
30711 + " movq 8(%1), %%mm1\n"
30712 + " movq 16(%1), %%mm2\n"
30713 + " movq 24(%1), %%mm3\n"
30714 + " movq %%mm0, (%2)\n"
30715 + " movq %%mm1, 8(%2)\n"
30716 + " movq %%mm2, 16(%2)\n"
30717 + " movq %%mm3, 24(%2)\n"
30718 + " movq 32(%1), %%mm0\n"
30719 + " movq 40(%1), %%mm1\n"
30720 + " movq 48(%1), %%mm2\n"
30721 + " movq 56(%1), %%mm3\n"
30722 + " movq %%mm0, 32(%2)\n"
30723 + " movq %%mm1, 40(%2)\n"
30724 + " movq %%mm2, 48(%2)\n"
30725 + " movq %%mm3, 56(%2)\n"
30726 ".section .fixup, \"ax\"\n"
30727 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30728 + "3:\n"
30729 +
30730 +#ifdef CONFIG_PAX_KERNEXEC
30731 + " movl %%cr0, %0\n"
30732 + " movl %0, %%eax\n"
30733 + " andl $0xFFFEFFFF, %%eax\n"
30734 + " movl %%eax, %%cr0\n"
30735 +#endif
30736 +
30737 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30738 +
30739 +#ifdef CONFIG_PAX_KERNEXEC
30740 + " movl %0, %%cr0\n"
30741 +#endif
30742 +
30743 " jmp 2b\n"
30744 ".previous\n"
30745 _ASM_EXTABLE(1b, 3b)
30746 - : : "r" (from), "r" (to) : "memory");
30747 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30748
30749 from += 64;
30750 to += 64;
30751 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30752 index f6d13ee..d789440 100644
30753 --- a/arch/x86/lib/msr-reg.S
30754 +++ b/arch/x86/lib/msr-reg.S
30755 @@ -3,6 +3,7 @@
30756 #include <asm/dwarf2.h>
30757 #include <asm/asm.h>
30758 #include <asm/msr.h>
30759 +#include <asm/alternative-asm.h>
30760
30761 #ifdef CONFIG_X86_64
30762 /*
30763 @@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30764 movl %edi, 28(%r10)
30765 popq_cfi %rbp
30766 popq_cfi %rbx
30767 + pax_force_retaddr
30768 ret
30769 3:
30770 CFI_RESTORE_STATE
30771 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30772 index fc6ba17..d4d989d 100644
30773 --- a/arch/x86/lib/putuser.S
30774 +++ b/arch/x86/lib/putuser.S
30775 @@ -16,7 +16,9 @@
30776 #include <asm/errno.h>
30777 #include <asm/asm.h>
30778 #include <asm/smap.h>
30779 -
30780 +#include <asm/segment.h>
30781 +#include <asm/pgtable.h>
30782 +#include <asm/alternative-asm.h>
30783
30784 /*
30785 * __put_user_X
30786 @@ -30,57 +32,125 @@
30787 * as they get called from within inline assembly.
30788 */
30789
30790 -#define ENTER CFI_STARTPROC ; \
30791 - GET_THREAD_INFO(%_ASM_BX)
30792 -#define EXIT ASM_CLAC ; \
30793 - ret ; \
30794 +#define ENTER CFI_STARTPROC
30795 +#define EXIT ASM_CLAC ; \
30796 + pax_force_retaddr ; \
30797 + ret ; \
30798 CFI_ENDPROC
30799
30800 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30801 +#define _DEST %_ASM_CX,%_ASM_BX
30802 +#else
30803 +#define _DEST %_ASM_CX
30804 +#endif
30805 +
30806 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30807 +#define __copyuser_seg gs;
30808 +#else
30809 +#define __copyuser_seg
30810 +#endif
30811 +
30812 .text
30813 ENTRY(__put_user_1)
30814 ENTER
30815 +
30816 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30817 + GET_THREAD_INFO(%_ASM_BX)
30818 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30819 jae bad_put_user
30820 ASM_STAC
30821 -1: movb %al,(%_ASM_CX)
30822 +
30823 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30824 + mov pax_user_shadow_base,%_ASM_BX
30825 + cmp %_ASM_BX,%_ASM_CX
30826 + jb 1234f
30827 + xor %ebx,%ebx
30828 +1234:
30829 +#endif
30830 +
30831 +#endif
30832 +
30833 +1: __copyuser_seg movb %al,(_DEST)
30834 xor %eax,%eax
30835 EXIT
30836 ENDPROC(__put_user_1)
30837
30838 ENTRY(__put_user_2)
30839 ENTER
30840 +
30841 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30842 + GET_THREAD_INFO(%_ASM_BX)
30843 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30844 sub $1,%_ASM_BX
30845 cmp %_ASM_BX,%_ASM_CX
30846 jae bad_put_user
30847 ASM_STAC
30848 -2: movw %ax,(%_ASM_CX)
30849 +
30850 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30851 + mov pax_user_shadow_base,%_ASM_BX
30852 + cmp %_ASM_BX,%_ASM_CX
30853 + jb 1234f
30854 + xor %ebx,%ebx
30855 +1234:
30856 +#endif
30857 +
30858 +#endif
30859 +
30860 +2: __copyuser_seg movw %ax,(_DEST)
30861 xor %eax,%eax
30862 EXIT
30863 ENDPROC(__put_user_2)
30864
30865 ENTRY(__put_user_4)
30866 ENTER
30867 +
30868 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30869 + GET_THREAD_INFO(%_ASM_BX)
30870 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30871 sub $3,%_ASM_BX
30872 cmp %_ASM_BX,%_ASM_CX
30873 jae bad_put_user
30874 ASM_STAC
30875 -3: movl %eax,(%_ASM_CX)
30876 +
30877 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30878 + mov pax_user_shadow_base,%_ASM_BX
30879 + cmp %_ASM_BX,%_ASM_CX
30880 + jb 1234f
30881 + xor %ebx,%ebx
30882 +1234:
30883 +#endif
30884 +
30885 +#endif
30886 +
30887 +3: __copyuser_seg movl %eax,(_DEST)
30888 xor %eax,%eax
30889 EXIT
30890 ENDPROC(__put_user_4)
30891
30892 ENTRY(__put_user_8)
30893 ENTER
30894 +
30895 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30896 + GET_THREAD_INFO(%_ASM_BX)
30897 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30898 sub $7,%_ASM_BX
30899 cmp %_ASM_BX,%_ASM_CX
30900 jae bad_put_user
30901 ASM_STAC
30902 -4: mov %_ASM_AX,(%_ASM_CX)
30903 +
30904 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30905 + mov pax_user_shadow_base,%_ASM_BX
30906 + cmp %_ASM_BX,%_ASM_CX
30907 + jb 1234f
30908 + xor %ebx,%ebx
30909 +1234:
30910 +#endif
30911 +
30912 +#endif
30913 +
30914 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
30915 #ifdef CONFIG_X86_32
30916 -5: movl %edx,4(%_ASM_CX)
30917 +5: __copyuser_seg movl %edx,4(_DEST)
30918 #endif
30919 xor %eax,%eax
30920 EXIT
30921 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30922 index 5dff5f0..cadebf4 100644
30923 --- a/arch/x86/lib/rwsem.S
30924 +++ b/arch/x86/lib/rwsem.S
30925 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30926 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30927 CFI_RESTORE __ASM_REG(dx)
30928 restore_common_regs
30929 + pax_force_retaddr
30930 ret
30931 CFI_ENDPROC
30932 ENDPROC(call_rwsem_down_read_failed)
30933 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30934 movq %rax,%rdi
30935 call rwsem_down_write_failed
30936 restore_common_regs
30937 + pax_force_retaddr
30938 ret
30939 CFI_ENDPROC
30940 ENDPROC(call_rwsem_down_write_failed)
30941 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30942 movq %rax,%rdi
30943 call rwsem_wake
30944 restore_common_regs
30945 -1: ret
30946 +1: pax_force_retaddr
30947 + ret
30948 CFI_ENDPROC
30949 ENDPROC(call_rwsem_wake)
30950
30951 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30952 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30953 CFI_RESTORE __ASM_REG(dx)
30954 restore_common_regs
30955 + pax_force_retaddr
30956 ret
30957 CFI_ENDPROC
30958 ENDPROC(call_rwsem_downgrade_wake)
30959 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30960 index b30b5eb..2b57052 100644
30961 --- a/arch/x86/lib/thunk_64.S
30962 +++ b/arch/x86/lib/thunk_64.S
30963 @@ -9,6 +9,7 @@
30964 #include <asm/dwarf2.h>
30965 #include <asm/calling.h>
30966 #include <asm/asm.h>
30967 +#include <asm/alternative-asm.h>
30968
30969 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30970 .macro THUNK name, func, put_ret_addr_in_rdi=0
30971 @@ -16,11 +17,11 @@
30972 \name:
30973 CFI_STARTPROC
30974
30975 - /* this one pushes 9 elems, the next one would be %rIP */
30976 - SAVE_ARGS
30977 + /* this one pushes 15+1 elems, the next one would be %rIP */
30978 + SAVE_ARGS 8
30979
30980 .if \put_ret_addr_in_rdi
30981 - movq_cfi_restore 9*8, rdi
30982 + movq_cfi_restore RIP, rdi
30983 .endif
30984
30985 call \func
30986 @@ -47,9 +48,10 @@
30987
30988 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30989 CFI_STARTPROC
30990 - SAVE_ARGS
30991 + SAVE_ARGS 8
30992 restore:
30993 - RESTORE_ARGS
30994 + RESTORE_ARGS 1,8
30995 + pax_force_retaddr
30996 ret
30997 CFI_ENDPROC
30998 _ASM_NOKPROBE(restore)
30999 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31000 index e2f5e21..4b22130 100644
31001 --- a/arch/x86/lib/usercopy_32.c
31002 +++ b/arch/x86/lib/usercopy_32.c
31003 @@ -42,11 +42,13 @@ do { \
31004 int __d0; \
31005 might_fault(); \
31006 __asm__ __volatile__( \
31007 + __COPYUSER_SET_ES \
31008 ASM_STAC "\n" \
31009 "0: rep; stosl\n" \
31010 " movl %2,%0\n" \
31011 "1: rep; stosb\n" \
31012 "2: " ASM_CLAC "\n" \
31013 + __COPYUSER_RESTORE_ES \
31014 ".section .fixup,\"ax\"\n" \
31015 "3: lea 0(%2,%0,4),%0\n" \
31016 " jmp 2b\n" \
31017 @@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31018
31019 #ifdef CONFIG_X86_INTEL_USERCOPY
31020 static unsigned long
31021 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
31022 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31023 {
31024 int d0, d1;
31025 __asm__ __volatile__(
31026 @@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31027 " .align 2,0x90\n"
31028 "3: movl 0(%4), %%eax\n"
31029 "4: movl 4(%4), %%edx\n"
31030 - "5: movl %%eax, 0(%3)\n"
31031 - "6: movl %%edx, 4(%3)\n"
31032 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31033 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31034 "7: movl 8(%4), %%eax\n"
31035 "8: movl 12(%4),%%edx\n"
31036 - "9: movl %%eax, 8(%3)\n"
31037 - "10: movl %%edx, 12(%3)\n"
31038 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31039 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31040 "11: movl 16(%4), %%eax\n"
31041 "12: movl 20(%4), %%edx\n"
31042 - "13: movl %%eax, 16(%3)\n"
31043 - "14: movl %%edx, 20(%3)\n"
31044 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31045 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31046 "15: movl 24(%4), %%eax\n"
31047 "16: movl 28(%4), %%edx\n"
31048 - "17: movl %%eax, 24(%3)\n"
31049 - "18: movl %%edx, 28(%3)\n"
31050 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31051 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31052 "19: movl 32(%4), %%eax\n"
31053 "20: movl 36(%4), %%edx\n"
31054 - "21: movl %%eax, 32(%3)\n"
31055 - "22: movl %%edx, 36(%3)\n"
31056 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31057 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31058 "23: movl 40(%4), %%eax\n"
31059 "24: movl 44(%4), %%edx\n"
31060 - "25: movl %%eax, 40(%3)\n"
31061 - "26: movl %%edx, 44(%3)\n"
31062 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31063 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31064 "27: movl 48(%4), %%eax\n"
31065 "28: movl 52(%4), %%edx\n"
31066 - "29: movl %%eax, 48(%3)\n"
31067 - "30: movl %%edx, 52(%3)\n"
31068 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31069 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31070 "31: movl 56(%4), %%eax\n"
31071 "32: movl 60(%4), %%edx\n"
31072 - "33: movl %%eax, 56(%3)\n"
31073 - "34: movl %%edx, 60(%3)\n"
31074 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31075 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31076 " addl $-64, %0\n"
31077 " addl $64, %4\n"
31078 " addl $64, %3\n"
31079 @@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31080 " shrl $2, %0\n"
31081 " andl $3, %%eax\n"
31082 " cld\n"
31083 + __COPYUSER_SET_ES
31084 "99: rep; movsl\n"
31085 "36: movl %%eax, %0\n"
31086 "37: rep; movsb\n"
31087 "100:\n"
31088 + __COPYUSER_RESTORE_ES
31089 + ".section .fixup,\"ax\"\n"
31090 + "101: lea 0(%%eax,%0,4),%0\n"
31091 + " jmp 100b\n"
31092 + ".previous\n"
31093 + _ASM_EXTABLE(1b,100b)
31094 + _ASM_EXTABLE(2b,100b)
31095 + _ASM_EXTABLE(3b,100b)
31096 + _ASM_EXTABLE(4b,100b)
31097 + _ASM_EXTABLE(5b,100b)
31098 + _ASM_EXTABLE(6b,100b)
31099 + _ASM_EXTABLE(7b,100b)
31100 + _ASM_EXTABLE(8b,100b)
31101 + _ASM_EXTABLE(9b,100b)
31102 + _ASM_EXTABLE(10b,100b)
31103 + _ASM_EXTABLE(11b,100b)
31104 + _ASM_EXTABLE(12b,100b)
31105 + _ASM_EXTABLE(13b,100b)
31106 + _ASM_EXTABLE(14b,100b)
31107 + _ASM_EXTABLE(15b,100b)
31108 + _ASM_EXTABLE(16b,100b)
31109 + _ASM_EXTABLE(17b,100b)
31110 + _ASM_EXTABLE(18b,100b)
31111 + _ASM_EXTABLE(19b,100b)
31112 + _ASM_EXTABLE(20b,100b)
31113 + _ASM_EXTABLE(21b,100b)
31114 + _ASM_EXTABLE(22b,100b)
31115 + _ASM_EXTABLE(23b,100b)
31116 + _ASM_EXTABLE(24b,100b)
31117 + _ASM_EXTABLE(25b,100b)
31118 + _ASM_EXTABLE(26b,100b)
31119 + _ASM_EXTABLE(27b,100b)
31120 + _ASM_EXTABLE(28b,100b)
31121 + _ASM_EXTABLE(29b,100b)
31122 + _ASM_EXTABLE(30b,100b)
31123 + _ASM_EXTABLE(31b,100b)
31124 + _ASM_EXTABLE(32b,100b)
31125 + _ASM_EXTABLE(33b,100b)
31126 + _ASM_EXTABLE(34b,100b)
31127 + _ASM_EXTABLE(35b,100b)
31128 + _ASM_EXTABLE(36b,100b)
31129 + _ASM_EXTABLE(37b,100b)
31130 + _ASM_EXTABLE(99b,101b)
31131 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
31132 + : "1"(to), "2"(from), "0"(size)
31133 + : "eax", "edx", "memory");
31134 + return size;
31135 +}
31136 +
31137 +static unsigned long
31138 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31139 +{
31140 + int d0, d1;
31141 + __asm__ __volatile__(
31142 + " .align 2,0x90\n"
31143 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31144 + " cmpl $67, %0\n"
31145 + " jbe 3f\n"
31146 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31147 + " .align 2,0x90\n"
31148 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31149 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31150 + "5: movl %%eax, 0(%3)\n"
31151 + "6: movl %%edx, 4(%3)\n"
31152 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31153 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31154 + "9: movl %%eax, 8(%3)\n"
31155 + "10: movl %%edx, 12(%3)\n"
31156 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31157 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31158 + "13: movl %%eax, 16(%3)\n"
31159 + "14: movl %%edx, 20(%3)\n"
31160 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31161 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31162 + "17: movl %%eax, 24(%3)\n"
31163 + "18: movl %%edx, 28(%3)\n"
31164 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31165 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31166 + "21: movl %%eax, 32(%3)\n"
31167 + "22: movl %%edx, 36(%3)\n"
31168 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31169 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31170 + "25: movl %%eax, 40(%3)\n"
31171 + "26: movl %%edx, 44(%3)\n"
31172 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31173 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31174 + "29: movl %%eax, 48(%3)\n"
31175 + "30: movl %%edx, 52(%3)\n"
31176 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31177 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31178 + "33: movl %%eax, 56(%3)\n"
31179 + "34: movl %%edx, 60(%3)\n"
31180 + " addl $-64, %0\n"
31181 + " addl $64, %4\n"
31182 + " addl $64, %3\n"
31183 + " cmpl $63, %0\n"
31184 + " ja 1b\n"
31185 + "35: movl %0, %%eax\n"
31186 + " shrl $2, %0\n"
31187 + " andl $3, %%eax\n"
31188 + " cld\n"
31189 + "99: rep; "__copyuser_seg" movsl\n"
31190 + "36: movl %%eax, %0\n"
31191 + "37: rep; "__copyuser_seg" movsb\n"
31192 + "100:\n"
31193 ".section .fixup,\"ax\"\n"
31194 "101: lea 0(%%eax,%0,4),%0\n"
31195 " jmp 100b\n"
31196 @@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31197 int d0, d1;
31198 __asm__ __volatile__(
31199 " .align 2,0x90\n"
31200 - "0: movl 32(%4), %%eax\n"
31201 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31202 " cmpl $67, %0\n"
31203 " jbe 2f\n"
31204 - "1: movl 64(%4), %%eax\n"
31205 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31206 " .align 2,0x90\n"
31207 - "2: movl 0(%4), %%eax\n"
31208 - "21: movl 4(%4), %%edx\n"
31209 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31210 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31211 " movl %%eax, 0(%3)\n"
31212 " movl %%edx, 4(%3)\n"
31213 - "3: movl 8(%4), %%eax\n"
31214 - "31: movl 12(%4),%%edx\n"
31215 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31216 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31217 " movl %%eax, 8(%3)\n"
31218 " movl %%edx, 12(%3)\n"
31219 - "4: movl 16(%4), %%eax\n"
31220 - "41: movl 20(%4), %%edx\n"
31221 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31222 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31223 " movl %%eax, 16(%3)\n"
31224 " movl %%edx, 20(%3)\n"
31225 - "10: movl 24(%4), %%eax\n"
31226 - "51: movl 28(%4), %%edx\n"
31227 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31228 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31229 " movl %%eax, 24(%3)\n"
31230 " movl %%edx, 28(%3)\n"
31231 - "11: movl 32(%4), %%eax\n"
31232 - "61: movl 36(%4), %%edx\n"
31233 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31234 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31235 " movl %%eax, 32(%3)\n"
31236 " movl %%edx, 36(%3)\n"
31237 - "12: movl 40(%4), %%eax\n"
31238 - "71: movl 44(%4), %%edx\n"
31239 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31240 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31241 " movl %%eax, 40(%3)\n"
31242 " movl %%edx, 44(%3)\n"
31243 - "13: movl 48(%4), %%eax\n"
31244 - "81: movl 52(%4), %%edx\n"
31245 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31246 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31247 " movl %%eax, 48(%3)\n"
31248 " movl %%edx, 52(%3)\n"
31249 - "14: movl 56(%4), %%eax\n"
31250 - "91: movl 60(%4), %%edx\n"
31251 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31252 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31253 " movl %%eax, 56(%3)\n"
31254 " movl %%edx, 60(%3)\n"
31255 " addl $-64, %0\n"
31256 @@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31257 " shrl $2, %0\n"
31258 " andl $3, %%eax\n"
31259 " cld\n"
31260 - "6: rep; movsl\n"
31261 + "6: rep; "__copyuser_seg" movsl\n"
31262 " movl %%eax,%0\n"
31263 - "7: rep; movsb\n"
31264 + "7: rep; "__copyuser_seg" movsb\n"
31265 "8:\n"
31266 ".section .fixup,\"ax\"\n"
31267 "9: lea 0(%%eax,%0,4),%0\n"
31268 @@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31269
31270 __asm__ __volatile__(
31271 " .align 2,0x90\n"
31272 - "0: movl 32(%4), %%eax\n"
31273 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31274 " cmpl $67, %0\n"
31275 " jbe 2f\n"
31276 - "1: movl 64(%4), %%eax\n"
31277 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31278 " .align 2,0x90\n"
31279 - "2: movl 0(%4), %%eax\n"
31280 - "21: movl 4(%4), %%edx\n"
31281 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31282 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31283 " movnti %%eax, 0(%3)\n"
31284 " movnti %%edx, 4(%3)\n"
31285 - "3: movl 8(%4), %%eax\n"
31286 - "31: movl 12(%4),%%edx\n"
31287 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31288 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31289 " movnti %%eax, 8(%3)\n"
31290 " movnti %%edx, 12(%3)\n"
31291 - "4: movl 16(%4), %%eax\n"
31292 - "41: movl 20(%4), %%edx\n"
31293 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31294 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31295 " movnti %%eax, 16(%3)\n"
31296 " movnti %%edx, 20(%3)\n"
31297 - "10: movl 24(%4), %%eax\n"
31298 - "51: movl 28(%4), %%edx\n"
31299 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31300 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31301 " movnti %%eax, 24(%3)\n"
31302 " movnti %%edx, 28(%3)\n"
31303 - "11: movl 32(%4), %%eax\n"
31304 - "61: movl 36(%4), %%edx\n"
31305 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31306 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31307 " movnti %%eax, 32(%3)\n"
31308 " movnti %%edx, 36(%3)\n"
31309 - "12: movl 40(%4), %%eax\n"
31310 - "71: movl 44(%4), %%edx\n"
31311 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31312 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31313 " movnti %%eax, 40(%3)\n"
31314 " movnti %%edx, 44(%3)\n"
31315 - "13: movl 48(%4), %%eax\n"
31316 - "81: movl 52(%4), %%edx\n"
31317 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31318 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31319 " movnti %%eax, 48(%3)\n"
31320 " movnti %%edx, 52(%3)\n"
31321 - "14: movl 56(%4), %%eax\n"
31322 - "91: movl 60(%4), %%edx\n"
31323 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31324 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31325 " movnti %%eax, 56(%3)\n"
31326 " movnti %%edx, 60(%3)\n"
31327 " addl $-64, %0\n"
31328 @@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31329 " shrl $2, %0\n"
31330 " andl $3, %%eax\n"
31331 " cld\n"
31332 - "6: rep; movsl\n"
31333 + "6: rep; "__copyuser_seg" movsl\n"
31334 " movl %%eax,%0\n"
31335 - "7: rep; movsb\n"
31336 + "7: rep; "__copyuser_seg" movsb\n"
31337 "8:\n"
31338 ".section .fixup,\"ax\"\n"
31339 "9: lea 0(%%eax,%0,4),%0\n"
31340 @@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31341
31342 __asm__ __volatile__(
31343 " .align 2,0x90\n"
31344 - "0: movl 32(%4), %%eax\n"
31345 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31346 " cmpl $67, %0\n"
31347 " jbe 2f\n"
31348 - "1: movl 64(%4), %%eax\n"
31349 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31350 " .align 2,0x90\n"
31351 - "2: movl 0(%4), %%eax\n"
31352 - "21: movl 4(%4), %%edx\n"
31353 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31354 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31355 " movnti %%eax, 0(%3)\n"
31356 " movnti %%edx, 4(%3)\n"
31357 - "3: movl 8(%4), %%eax\n"
31358 - "31: movl 12(%4),%%edx\n"
31359 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31360 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31361 " movnti %%eax, 8(%3)\n"
31362 " movnti %%edx, 12(%3)\n"
31363 - "4: movl 16(%4), %%eax\n"
31364 - "41: movl 20(%4), %%edx\n"
31365 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31366 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31367 " movnti %%eax, 16(%3)\n"
31368 " movnti %%edx, 20(%3)\n"
31369 - "10: movl 24(%4), %%eax\n"
31370 - "51: movl 28(%4), %%edx\n"
31371 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31372 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31373 " movnti %%eax, 24(%3)\n"
31374 " movnti %%edx, 28(%3)\n"
31375 - "11: movl 32(%4), %%eax\n"
31376 - "61: movl 36(%4), %%edx\n"
31377 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31378 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31379 " movnti %%eax, 32(%3)\n"
31380 " movnti %%edx, 36(%3)\n"
31381 - "12: movl 40(%4), %%eax\n"
31382 - "71: movl 44(%4), %%edx\n"
31383 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31384 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31385 " movnti %%eax, 40(%3)\n"
31386 " movnti %%edx, 44(%3)\n"
31387 - "13: movl 48(%4), %%eax\n"
31388 - "81: movl 52(%4), %%edx\n"
31389 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31390 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31391 " movnti %%eax, 48(%3)\n"
31392 " movnti %%edx, 52(%3)\n"
31393 - "14: movl 56(%4), %%eax\n"
31394 - "91: movl 60(%4), %%edx\n"
31395 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31396 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31397 " movnti %%eax, 56(%3)\n"
31398 " movnti %%edx, 60(%3)\n"
31399 " addl $-64, %0\n"
31400 @@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31401 " shrl $2, %0\n"
31402 " andl $3, %%eax\n"
31403 " cld\n"
31404 - "6: rep; movsl\n"
31405 + "6: rep; "__copyuser_seg" movsl\n"
31406 " movl %%eax,%0\n"
31407 - "7: rep; movsb\n"
31408 + "7: rep; "__copyuser_seg" movsb\n"
31409 "8:\n"
31410 ".section .fixup,\"ax\"\n"
31411 "9: lea 0(%%eax,%0,4),%0\n"
31412 @@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31413 */
31414 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31415 unsigned long size);
31416 -unsigned long __copy_user_intel(void __user *to, const void *from,
31417 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31418 + unsigned long size);
31419 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31420 unsigned long size);
31421 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31422 const void __user *from, unsigned long size);
31423 #endif /* CONFIG_X86_INTEL_USERCOPY */
31424
31425 /* Generic arbitrary sized copy. */
31426 -#define __copy_user(to, from, size) \
31427 +#define __copy_user(to, from, size, prefix, set, restore) \
31428 do { \
31429 int __d0, __d1, __d2; \
31430 __asm__ __volatile__( \
31431 + set \
31432 " cmp $7,%0\n" \
31433 " jbe 1f\n" \
31434 " movl %1,%0\n" \
31435 " negl %0\n" \
31436 " andl $7,%0\n" \
31437 " subl %0,%3\n" \
31438 - "4: rep; movsb\n" \
31439 + "4: rep; "prefix"movsb\n" \
31440 " movl %3,%0\n" \
31441 " shrl $2,%0\n" \
31442 " andl $3,%3\n" \
31443 " .align 2,0x90\n" \
31444 - "0: rep; movsl\n" \
31445 + "0: rep; "prefix"movsl\n" \
31446 " movl %3,%0\n" \
31447 - "1: rep; movsb\n" \
31448 + "1: rep; "prefix"movsb\n" \
31449 "2:\n" \
31450 + restore \
31451 ".section .fixup,\"ax\"\n" \
31452 "5: addl %3,%0\n" \
31453 " jmp 2b\n" \
31454 @@ -538,14 +650,14 @@ do { \
31455 " negl %0\n" \
31456 " andl $7,%0\n" \
31457 " subl %0,%3\n" \
31458 - "4: rep; movsb\n" \
31459 + "4: rep; "__copyuser_seg"movsb\n" \
31460 " movl %3,%0\n" \
31461 " shrl $2,%0\n" \
31462 " andl $3,%3\n" \
31463 " .align 2,0x90\n" \
31464 - "0: rep; movsl\n" \
31465 + "0: rep; "__copyuser_seg"movsl\n" \
31466 " movl %3,%0\n" \
31467 - "1: rep; movsb\n" \
31468 + "1: rep; "__copyuser_seg"movsb\n" \
31469 "2:\n" \
31470 ".section .fixup,\"ax\"\n" \
31471 "5: addl %3,%0\n" \
31472 @@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31473 {
31474 stac();
31475 if (movsl_is_ok(to, from, n))
31476 - __copy_user(to, from, n);
31477 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31478 else
31479 - n = __copy_user_intel(to, from, n);
31480 + n = __generic_copy_to_user_intel(to, from, n);
31481 clac();
31482 return n;
31483 }
31484 @@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31485 {
31486 stac();
31487 if (movsl_is_ok(to, from, n))
31488 - __copy_user(to, from, n);
31489 + __copy_user(to, from, n, __copyuser_seg, "", "");
31490 else
31491 - n = __copy_user_intel((void __user *)to,
31492 - (const void *)from, n);
31493 + n = __generic_copy_from_user_intel(to, from, n);
31494 clac();
31495 return n;
31496 }
31497 @@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31498 if (n > 64 && cpu_has_xmm2)
31499 n = __copy_user_intel_nocache(to, from, n);
31500 else
31501 - __copy_user(to, from, n);
31502 + __copy_user(to, from, n, __copyuser_seg, "", "");
31503 #else
31504 - __copy_user(to, from, n);
31505 + __copy_user(to, from, n, __copyuser_seg, "", "");
31506 #endif
31507 clac();
31508 return n;
31509 }
31510 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31511
31512 -/**
31513 - * copy_to_user: - Copy a block of data into user space.
31514 - * @to: Destination address, in user space.
31515 - * @from: Source address, in kernel space.
31516 - * @n: Number of bytes to copy.
31517 - *
31518 - * Context: User context only. This function may sleep.
31519 - *
31520 - * Copy data from kernel space to user space.
31521 - *
31522 - * Returns number of bytes that could not be copied.
31523 - * On success, this will be zero.
31524 - */
31525 -unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31526 +#ifdef CONFIG_PAX_MEMORY_UDEREF
31527 +void __set_fs(mm_segment_t x)
31528 {
31529 - if (access_ok(VERIFY_WRITE, to, n))
31530 - n = __copy_to_user(to, from, n);
31531 - return n;
31532 + switch (x.seg) {
31533 + case 0:
31534 + loadsegment(gs, 0);
31535 + break;
31536 + case TASK_SIZE_MAX:
31537 + loadsegment(gs, __USER_DS);
31538 + break;
31539 + case -1UL:
31540 + loadsegment(gs, __KERNEL_DS);
31541 + break;
31542 + default:
31543 + BUG();
31544 + }
31545 }
31546 -EXPORT_SYMBOL(_copy_to_user);
31547 +EXPORT_SYMBOL(__set_fs);
31548
31549 -/**
31550 - * copy_from_user: - Copy a block of data from user space.
31551 - * @to: Destination address, in kernel space.
31552 - * @from: Source address, in user space.
31553 - * @n: Number of bytes to copy.
31554 - *
31555 - * Context: User context only. This function may sleep.
31556 - *
31557 - * Copy data from user space to kernel space.
31558 - *
31559 - * Returns number of bytes that could not be copied.
31560 - * On success, this will be zero.
31561 - *
31562 - * If some data could not be copied, this function will pad the copied
31563 - * data to the requested size using zero bytes.
31564 - */
31565 -unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31566 +void set_fs(mm_segment_t x)
31567 {
31568 - if (access_ok(VERIFY_READ, from, n))
31569 - n = __copy_from_user(to, from, n);
31570 - else
31571 - memset(to, 0, n);
31572 - return n;
31573 + current_thread_info()->addr_limit = x;
31574 + __set_fs(x);
31575 }
31576 -EXPORT_SYMBOL(_copy_from_user);
31577 +EXPORT_SYMBOL(set_fs);
31578 +#endif
31579 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31580 index c905e89..01ab928 100644
31581 --- a/arch/x86/lib/usercopy_64.c
31582 +++ b/arch/x86/lib/usercopy_64.c
31583 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31584 might_fault();
31585 /* no memory constraint because it doesn't change any memory gcc knows
31586 about */
31587 + pax_open_userland();
31588 stac();
31589 asm volatile(
31590 " testq %[size8],%[size8]\n"
31591 @@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31592 _ASM_EXTABLE(0b,3b)
31593 _ASM_EXTABLE(1b,2b)
31594 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31595 - : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31596 + : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31597 [zero] "r" (0UL), [eight] "r" (8UL));
31598 clac();
31599 + pax_close_userland();
31600 return size;
31601 }
31602 EXPORT_SYMBOL(__clear_user);
31603 @@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31604 }
31605 EXPORT_SYMBOL(clear_user);
31606
31607 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31608 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31609 {
31610 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31611 - return copy_user_generic((__force void *)to, (__force void *)from, len);
31612 - }
31613 - return len;
31614 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31615 + return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31616 + return len;
31617 }
31618 EXPORT_SYMBOL(copy_in_user);
31619
31620 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31621 * it is not necessary to optimize tail handling.
31622 */
31623 __visible unsigned long
31624 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31625 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31626 {
31627 char c;
31628 unsigned zero_len;
31629
31630 + clac();
31631 + pax_close_userland();
31632 for (; len; --len, to++) {
31633 if (__get_user_nocheck(c, from++, sizeof(char)))
31634 break;
31635 @@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31636 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31637 if (__put_user_nocheck(c, to++, sizeof(char)))
31638 break;
31639 - clac();
31640 return len;
31641 }
31642 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31643 index 6a19ad9..1c48f9a 100644
31644 --- a/arch/x86/mm/Makefile
31645 +++ b/arch/x86/mm/Makefile
31646 @@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31647 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31648
31649 obj-$(CONFIG_MEMTEST) += memtest.o
31650 +
31651 +quote:="
31652 +obj-$(CONFIG_X86_64) += uderef_64.o
31653 +CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31654 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31655 index 903ec1e..c4166b2 100644
31656 --- a/arch/x86/mm/extable.c
31657 +++ b/arch/x86/mm/extable.c
31658 @@ -6,12 +6,24 @@
31659 static inline unsigned long
31660 ex_insn_addr(const struct exception_table_entry *x)
31661 {
31662 - return (unsigned long)&x->insn + x->insn;
31663 + unsigned long reloc = 0;
31664 +
31665 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31666 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31667 +#endif
31668 +
31669 + return (unsigned long)&x->insn + x->insn + reloc;
31670 }
31671 static inline unsigned long
31672 ex_fixup_addr(const struct exception_table_entry *x)
31673 {
31674 - return (unsigned long)&x->fixup + x->fixup;
31675 + unsigned long reloc = 0;
31676 +
31677 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31678 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31679 +#endif
31680 +
31681 + return (unsigned long)&x->fixup + x->fixup + reloc;
31682 }
31683
31684 int fixup_exception(struct pt_regs *regs)
31685 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31686 unsigned long new_ip;
31687
31688 #ifdef CONFIG_PNPBIOS
31689 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31690 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31691 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31692 extern u32 pnp_bios_is_utter_crap;
31693 pnp_bios_is_utter_crap = 1;
31694 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31695 i += 4;
31696 p->fixup -= i;
31697 i += 4;
31698 +
31699 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31700 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31701 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31702 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31703 +#endif
31704 +
31705 }
31706 }
31707
31708 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31709 index d973e61..fb868e9 100644
31710 --- a/arch/x86/mm/fault.c
31711 +++ b/arch/x86/mm/fault.c
31712 @@ -13,12 +13,19 @@
31713 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31714 #include <linux/prefetch.h> /* prefetchw */
31715 #include <linux/context_tracking.h> /* exception_enter(), ... */
31716 +#include <linux/unistd.h>
31717 +#include <linux/compiler.h>
31718
31719 #include <asm/traps.h> /* dotraplinkage, ... */
31720 #include <asm/pgalloc.h> /* pgd_*(), ... */
31721 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31722 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31723 #include <asm/vsyscall.h> /* emulate_vsyscall */
31724 +#include <asm/tlbflush.h>
31725 +
31726 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31727 +#include <asm/stacktrace.h>
31728 +#endif
31729
31730 #define CREATE_TRACE_POINTS
31731 #include <asm/trace/exceptions.h>
31732 @@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31733 int ret = 0;
31734
31735 /* kprobe_running() needs smp_processor_id() */
31736 - if (kprobes_built_in() && !user_mode_vm(regs)) {
31737 + if (kprobes_built_in() && !user_mode(regs)) {
31738 preempt_disable();
31739 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31740 ret = 1;
31741 @@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31742 return !instr_lo || (instr_lo>>1) == 1;
31743 case 0x00:
31744 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31745 - if (probe_kernel_address(instr, opcode))
31746 + if (user_mode(regs)) {
31747 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31748 + return 0;
31749 + } else if (probe_kernel_address(instr, opcode))
31750 return 0;
31751
31752 *prefetch = (instr_lo == 0xF) &&
31753 @@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31754 while (instr < max_instr) {
31755 unsigned char opcode;
31756
31757 - if (probe_kernel_address(instr, opcode))
31758 + if (user_mode(regs)) {
31759 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31760 + break;
31761 + } else if (probe_kernel_address(instr, opcode))
31762 break;
31763
31764 instr++;
31765 @@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31766 force_sig_info(si_signo, &info, tsk);
31767 }
31768
31769 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31770 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31771 +#endif
31772 +
31773 +#ifdef CONFIG_PAX_EMUTRAMP
31774 +static int pax_handle_fetch_fault(struct pt_regs *regs);
31775 +#endif
31776 +
31777 +#ifdef CONFIG_PAX_PAGEEXEC
31778 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31779 +{
31780 + pgd_t *pgd;
31781 + pud_t *pud;
31782 + pmd_t *pmd;
31783 +
31784 + pgd = pgd_offset(mm, address);
31785 + if (!pgd_present(*pgd))
31786 + return NULL;
31787 + pud = pud_offset(pgd, address);
31788 + if (!pud_present(*pud))
31789 + return NULL;
31790 + pmd = pmd_offset(pud, address);
31791 + if (!pmd_present(*pmd))
31792 + return NULL;
31793 + return pmd;
31794 +}
31795 +#endif
31796 +
31797 DEFINE_SPINLOCK(pgd_lock);
31798 LIST_HEAD(pgd_list);
31799
31800 @@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31801 for (address = VMALLOC_START & PMD_MASK;
31802 address >= TASK_SIZE && address < FIXADDR_TOP;
31803 address += PMD_SIZE) {
31804 +
31805 +#ifdef CONFIG_PAX_PER_CPU_PGD
31806 + unsigned long cpu;
31807 +#else
31808 struct page *page;
31809 +#endif
31810
31811 spin_lock(&pgd_lock);
31812 +
31813 +#ifdef CONFIG_PAX_PER_CPU_PGD
31814 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31815 + pgd_t *pgd = get_cpu_pgd(cpu, user);
31816 + pmd_t *ret;
31817 +
31818 + ret = vmalloc_sync_one(pgd, address);
31819 + if (!ret)
31820 + break;
31821 + pgd = get_cpu_pgd(cpu, kernel);
31822 +#else
31823 list_for_each_entry(page, &pgd_list, lru) {
31824 + pgd_t *pgd;
31825 spinlock_t *pgt_lock;
31826 pmd_t *ret;
31827
31828 @@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31829 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31830
31831 spin_lock(pgt_lock);
31832 - ret = vmalloc_sync_one(page_address(page), address);
31833 + pgd = page_address(page);
31834 +#endif
31835 +
31836 + ret = vmalloc_sync_one(pgd, address);
31837 +
31838 +#ifndef CONFIG_PAX_PER_CPU_PGD
31839 spin_unlock(pgt_lock);
31840 +#endif
31841
31842 if (!ret)
31843 break;
31844 @@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31845 * an interrupt in the middle of a task switch..
31846 */
31847 pgd_paddr = read_cr3();
31848 +
31849 +#ifdef CONFIG_PAX_PER_CPU_PGD
31850 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31851 + vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31852 +#endif
31853 +
31854 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31855 if (!pmd_k)
31856 return -1;
31857 @@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31858 * happen within a race in page table update. In the later
31859 * case just flush:
31860 */
31861 - pgd = pgd_offset(current->active_mm, address);
31862 +
31863 pgd_ref = pgd_offset_k(address);
31864 if (pgd_none(*pgd_ref))
31865 return -1;
31866
31867 +#ifdef CONFIG_PAX_PER_CPU_PGD
31868 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31869 + pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31870 + if (pgd_none(*pgd)) {
31871 + set_pgd(pgd, *pgd_ref);
31872 + arch_flush_lazy_mmu_mode();
31873 + } else {
31874 + BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31875 + }
31876 + pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31877 +#else
31878 + pgd = pgd_offset(current->active_mm, address);
31879 +#endif
31880 +
31881 if (pgd_none(*pgd)) {
31882 set_pgd(pgd, *pgd_ref);
31883 arch_flush_lazy_mmu_mode();
31884 @@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31885 static int is_errata100(struct pt_regs *regs, unsigned long address)
31886 {
31887 #ifdef CONFIG_X86_64
31888 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31889 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31890 return 1;
31891 #endif
31892 return 0;
31893 @@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31894 }
31895
31896 static const char nx_warning[] = KERN_CRIT
31897 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31898 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31899 static const char smep_warning[] = KERN_CRIT
31900 -"unable to execute userspace code (SMEP?) (uid: %d)\n";
31901 +"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31902
31903 static void
31904 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31905 @@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31906 if (!oops_may_print())
31907 return;
31908
31909 - if (error_code & PF_INSTR) {
31910 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31911 unsigned int level;
31912 pgd_t *pgd;
31913 pte_t *pte;
31914 @@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31915 pte = lookup_address_in_pgd(pgd, address, &level);
31916
31917 if (pte && pte_present(*pte) && !pte_exec(*pte))
31918 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31919 + printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31920 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31921 (pgd_flags(*pgd) & _PAGE_USER) &&
31922 (read_cr4() & X86_CR4_SMEP))
31923 - printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31924 + printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31925 }
31926
31927 +#ifdef CONFIG_PAX_KERNEXEC
31928 + if (init_mm.start_code <= address && address < init_mm.end_code) {
31929 + if (current->signal->curr_ip)
31930 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31931 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
31932 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31933 + else
31934 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31935 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31936 + }
31937 +#endif
31938 +
31939 printk(KERN_ALERT "BUG: unable to handle kernel ");
31940 if (address < PAGE_SIZE)
31941 printk(KERN_CONT "NULL pointer dereference");
31942 @@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31943 return;
31944 }
31945 #endif
31946 +
31947 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31948 + if (pax_is_fetch_fault(regs, error_code, address)) {
31949 +
31950 +#ifdef CONFIG_PAX_EMUTRAMP
31951 + switch (pax_handle_fetch_fault(regs)) {
31952 + case 2:
31953 + return;
31954 + }
31955 +#endif
31956 +
31957 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31958 + do_group_exit(SIGKILL);
31959 + }
31960 +#endif
31961 +
31962 /* Kernel addresses are always protection faults: */
31963 if (address >= TASK_SIZE)
31964 error_code |= PF_PROT;
31965 @@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31966 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31967 printk(KERN_ERR
31968 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31969 - tsk->comm, tsk->pid, address);
31970 + tsk->comm, task_pid_nr(tsk), address);
31971 code = BUS_MCEERR_AR;
31972 }
31973 #endif
31974 @@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31975 return 1;
31976 }
31977
31978 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31979 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31980 +{
31981 + pte_t *pte;
31982 + pmd_t *pmd;
31983 + spinlock_t *ptl;
31984 + unsigned char pte_mask;
31985 +
31986 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31987 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
31988 + return 0;
31989 +
31990 + /* PaX: it's our fault, let's handle it if we can */
31991 +
31992 + /* PaX: take a look at read faults before acquiring any locks */
31993 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31994 + /* instruction fetch attempt from a protected page in user mode */
31995 + up_read(&mm->mmap_sem);
31996 +
31997 +#ifdef CONFIG_PAX_EMUTRAMP
31998 + switch (pax_handle_fetch_fault(regs)) {
31999 + case 2:
32000 + return 1;
32001 + }
32002 +#endif
32003 +
32004 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32005 + do_group_exit(SIGKILL);
32006 + }
32007 +
32008 + pmd = pax_get_pmd(mm, address);
32009 + if (unlikely(!pmd))
32010 + return 0;
32011 +
32012 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32013 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32014 + pte_unmap_unlock(pte, ptl);
32015 + return 0;
32016 + }
32017 +
32018 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32019 + /* write attempt to a protected page in user mode */
32020 + pte_unmap_unlock(pte, ptl);
32021 + return 0;
32022 + }
32023 +
32024 +#ifdef CONFIG_SMP
32025 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32026 +#else
32027 + if (likely(address > get_limit(regs->cs)))
32028 +#endif
32029 + {
32030 + set_pte(pte, pte_mkread(*pte));
32031 + __flush_tlb_one(address);
32032 + pte_unmap_unlock(pte, ptl);
32033 + up_read(&mm->mmap_sem);
32034 + return 1;
32035 + }
32036 +
32037 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32038 +
32039 + /*
32040 + * PaX: fill DTLB with user rights and retry
32041 + */
32042 + __asm__ __volatile__ (
32043 + "orb %2,(%1)\n"
32044 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32045 +/*
32046 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32047 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32048 + * page fault when examined during a TLB load attempt. this is true not only
32049 + * for PTEs holding a non-present entry but also present entries that will
32050 + * raise a page fault (such as those set up by PaX, or the copy-on-write
32051 + * mechanism). in effect it means that we do *not* need to flush the TLBs
32052 + * for our target pages since their PTEs are simply not in the TLBs at all.
32053 +
32054 + * the best thing in omitting it is that we gain around 15-20% speed in the
32055 + * fast path of the page fault handler and can get rid of tracing since we
32056 + * can no longer flush unintended entries.
32057 + */
32058 + "invlpg (%0)\n"
32059 +#endif
32060 + __copyuser_seg"testb $0,(%0)\n"
32061 + "xorb %3,(%1)\n"
32062 + :
32063 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32064 + : "memory", "cc");
32065 + pte_unmap_unlock(pte, ptl);
32066 + up_read(&mm->mmap_sem);
32067 + return 1;
32068 +}
32069 +#endif
32070 +
32071 /*
32072 * Handle a spurious fault caused by a stale TLB entry.
32073 *
32074 @@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32075 static inline int
32076 access_error(unsigned long error_code, struct vm_area_struct *vma)
32077 {
32078 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32079 + return 1;
32080 +
32081 if (error_code & PF_WRITE) {
32082 /* write, present and write, not present: */
32083 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32084 @@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32085 if (error_code & PF_USER)
32086 return false;
32087
32088 - if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32089 + if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32090 return false;
32091
32092 return true;
32093 @@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32094 tsk = current;
32095 mm = tsk->mm;
32096
32097 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32098 + if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32099 + if (!search_exception_tables(regs->ip)) {
32100 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32101 + bad_area_nosemaphore(regs, error_code, address);
32102 + return;
32103 + }
32104 + if (address < pax_user_shadow_base) {
32105 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32106 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32107 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32108 + } else
32109 + address -= pax_user_shadow_base;
32110 + }
32111 +#endif
32112 +
32113 /*
32114 * Detect and handle instructions that would cause a page fault for
32115 * both a tracked kernel page and a userspace page.
32116 @@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32117 * User-mode registers count as a user access even for any
32118 * potential system fault or CPU buglet:
32119 */
32120 - if (user_mode_vm(regs)) {
32121 + if (user_mode(regs)) {
32122 local_irq_enable();
32123 error_code |= PF_USER;
32124 flags |= FAULT_FLAG_USER;
32125 @@ -1192,6 +1416,11 @@ retry:
32126 might_sleep();
32127 }
32128
32129 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32130 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32131 + return;
32132 +#endif
32133 +
32134 vma = find_vma(mm, address);
32135 if (unlikely(!vma)) {
32136 bad_area(regs, error_code, address);
32137 @@ -1203,18 +1432,24 @@ retry:
32138 bad_area(regs, error_code, address);
32139 return;
32140 }
32141 - if (error_code & PF_USER) {
32142 - /*
32143 - * Accessing the stack below %sp is always a bug.
32144 - * The large cushion allows instructions like enter
32145 - * and pusha to work. ("enter $65535, $31" pushes
32146 - * 32 pointers and then decrements %sp by 65535.)
32147 - */
32148 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32149 - bad_area(regs, error_code, address);
32150 - return;
32151 - }
32152 + /*
32153 + * Accessing the stack below %sp is always a bug.
32154 + * The large cushion allows instructions like enter
32155 + * and pusha to work. ("enter $65535, $31" pushes
32156 + * 32 pointers and then decrements %sp by 65535.)
32157 + */
32158 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32159 + bad_area(regs, error_code, address);
32160 + return;
32161 }
32162 +
32163 +#ifdef CONFIG_PAX_SEGMEXEC
32164 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32165 + bad_area(regs, error_code, address);
32166 + return;
32167 + }
32168 +#endif
32169 +
32170 if (unlikely(expand_stack(vma, address))) {
32171 bad_area(regs, error_code, address);
32172 return;
32173 @@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32174 }
32175 NOKPROBE_SYMBOL(trace_do_page_fault);
32176 #endif /* CONFIG_TRACING */
32177 +
32178 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32179 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32180 +{
32181 + struct mm_struct *mm = current->mm;
32182 + unsigned long ip = regs->ip;
32183 +
32184 + if (v8086_mode(regs))
32185 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32186 +
32187 +#ifdef CONFIG_PAX_PAGEEXEC
32188 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32189 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32190 + return true;
32191 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32192 + return true;
32193 + return false;
32194 + }
32195 +#endif
32196 +
32197 +#ifdef CONFIG_PAX_SEGMEXEC
32198 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32199 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32200 + return true;
32201 + return false;
32202 + }
32203 +#endif
32204 +
32205 + return false;
32206 +}
32207 +#endif
32208 +
32209 +#ifdef CONFIG_PAX_EMUTRAMP
32210 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32211 +{
32212 + int err;
32213 +
32214 + do { /* PaX: libffi trampoline emulation */
32215 + unsigned char mov, jmp;
32216 + unsigned int addr1, addr2;
32217 +
32218 +#ifdef CONFIG_X86_64
32219 + if ((regs->ip + 9) >> 32)
32220 + break;
32221 +#endif
32222 +
32223 + err = get_user(mov, (unsigned char __user *)regs->ip);
32224 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32225 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32226 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32227 +
32228 + if (err)
32229 + break;
32230 +
32231 + if (mov == 0xB8 && jmp == 0xE9) {
32232 + regs->ax = addr1;
32233 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32234 + return 2;
32235 + }
32236 + } while (0);
32237 +
32238 + do { /* PaX: gcc trampoline emulation #1 */
32239 + unsigned char mov1, mov2;
32240 + unsigned short jmp;
32241 + unsigned int addr1, addr2;
32242 +
32243 +#ifdef CONFIG_X86_64
32244 + if ((regs->ip + 11) >> 32)
32245 + break;
32246 +#endif
32247 +
32248 + err = get_user(mov1, (unsigned char __user *)regs->ip);
32249 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32250 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32251 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32252 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32253 +
32254 + if (err)
32255 + break;
32256 +
32257 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32258 + regs->cx = addr1;
32259 + regs->ax = addr2;
32260 + regs->ip = addr2;
32261 + return 2;
32262 + }
32263 + } while (0);
32264 +
32265 + do { /* PaX: gcc trampoline emulation #2 */
32266 + unsigned char mov, jmp;
32267 + unsigned int addr1, addr2;
32268 +
32269 +#ifdef CONFIG_X86_64
32270 + if ((regs->ip + 9) >> 32)
32271 + break;
32272 +#endif
32273 +
32274 + err = get_user(mov, (unsigned char __user *)regs->ip);
32275 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32276 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32277 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32278 +
32279 + if (err)
32280 + break;
32281 +
32282 + if (mov == 0xB9 && jmp == 0xE9) {
32283 + regs->cx = addr1;
32284 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32285 + return 2;
32286 + }
32287 + } while (0);
32288 +
32289 + return 1; /* PaX in action */
32290 +}
32291 +
32292 +#ifdef CONFIG_X86_64
32293 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32294 +{
32295 + int err;
32296 +
32297 + do { /* PaX: libffi trampoline emulation */
32298 + unsigned short mov1, mov2, jmp1;
32299 + unsigned char stcclc, jmp2;
32300 + unsigned long addr1, addr2;
32301 +
32302 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32303 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32304 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32305 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32306 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32307 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32308 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32309 +
32310 + if (err)
32311 + break;
32312 +
32313 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32314 + regs->r11 = addr1;
32315 + regs->r10 = addr2;
32316 + if (stcclc == 0xF8)
32317 + regs->flags &= ~X86_EFLAGS_CF;
32318 + else
32319 + regs->flags |= X86_EFLAGS_CF;
32320 + regs->ip = addr1;
32321 + return 2;
32322 + }
32323 + } while (0);
32324 +
32325 + do { /* PaX: gcc trampoline emulation #1 */
32326 + unsigned short mov1, mov2, jmp1;
32327 + unsigned char jmp2;
32328 + unsigned int addr1;
32329 + unsigned long addr2;
32330 +
32331 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32332 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32333 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32334 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32335 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32336 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32337 +
32338 + if (err)
32339 + break;
32340 +
32341 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32342 + regs->r11 = addr1;
32343 + regs->r10 = addr2;
32344 + regs->ip = addr1;
32345 + return 2;
32346 + }
32347 + } while (0);
32348 +
32349 + do { /* PaX: gcc trampoline emulation #2 */
32350 + unsigned short mov1, mov2, jmp1;
32351 + unsigned char jmp2;
32352 + unsigned long addr1, addr2;
32353 +
32354 + err = get_user(mov1, (unsigned short __user *)regs->ip);
32355 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32356 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32357 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32358 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32359 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32360 +
32361 + if (err)
32362 + break;
32363 +
32364 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32365 + regs->r11 = addr1;
32366 + regs->r10 = addr2;
32367 + regs->ip = addr1;
32368 + return 2;
32369 + }
32370 + } while (0);
32371 +
32372 + return 1; /* PaX in action */
32373 +}
32374 +#endif
32375 +
32376 +/*
32377 + * PaX: decide what to do with offenders (regs->ip = fault address)
32378 + *
32379 + * returns 1 when task should be killed
32380 + * 2 when gcc trampoline was detected
32381 + */
32382 +static int pax_handle_fetch_fault(struct pt_regs *regs)
32383 +{
32384 + if (v8086_mode(regs))
32385 + return 1;
32386 +
32387 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32388 + return 1;
32389 +
32390 +#ifdef CONFIG_X86_32
32391 + return pax_handle_fetch_fault_32(regs);
32392 +#else
32393 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32394 + return pax_handle_fetch_fault_32(regs);
32395 + else
32396 + return pax_handle_fetch_fault_64(regs);
32397 +#endif
32398 +}
32399 +#endif
32400 +
32401 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32402 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32403 +{
32404 + long i;
32405 +
32406 + printk(KERN_ERR "PAX: bytes at PC: ");
32407 + for (i = 0; i < 20; i++) {
32408 + unsigned char c;
32409 + if (get_user(c, (unsigned char __force_user *)pc+i))
32410 + printk(KERN_CONT "?? ");
32411 + else
32412 + printk(KERN_CONT "%02x ", c);
32413 + }
32414 + printk("\n");
32415 +
32416 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32417 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
32418 + unsigned long c;
32419 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
32420 +#ifdef CONFIG_X86_32
32421 + printk(KERN_CONT "???????? ");
32422 +#else
32423 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32424 + printk(KERN_CONT "???????? ???????? ");
32425 + else
32426 + printk(KERN_CONT "???????????????? ");
32427 +#endif
32428 + } else {
32429 +#ifdef CONFIG_X86_64
32430 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32431 + printk(KERN_CONT "%08x ", (unsigned int)c);
32432 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32433 + } else
32434 +#endif
32435 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32436 + }
32437 + }
32438 + printk("\n");
32439 +}
32440 +#endif
32441 +
32442 +/**
32443 + * probe_kernel_write(): safely attempt to write to a location
32444 + * @dst: address to write to
32445 + * @src: pointer to the data that shall be written
32446 + * @size: size of the data chunk
32447 + *
32448 + * Safely write to address @dst from the buffer at @src. If a kernel fault
32449 + * happens, handle that and return -EFAULT.
32450 + */
32451 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32452 +{
32453 + long ret;
32454 + mm_segment_t old_fs = get_fs();
32455 +
32456 + set_fs(KERNEL_DS);
32457 + pagefault_disable();
32458 + pax_open_kernel();
32459 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32460 + pax_close_kernel();
32461 + pagefault_enable();
32462 + set_fs(old_fs);
32463 +
32464 + return ret ? -EFAULT : 0;
32465 +}
32466 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32467 index 207d9aef..69030980 100644
32468 --- a/arch/x86/mm/gup.c
32469 +++ b/arch/x86/mm/gup.c
32470 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32471 addr = start;
32472 len = (unsigned long) nr_pages << PAGE_SHIFT;
32473 end = start + len;
32474 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32475 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32476 (void __user *)start, len)))
32477 return 0;
32478
32479 @@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32480 goto slow_irqon;
32481 #endif
32482
32483 + if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32484 + (void __user *)start, len)))
32485 + return 0;
32486 +
32487 /*
32488 * XXX: batch / limit 'nr', to avoid large irq off latency
32489 * needs some instrumenting to determine the common sizes used by
32490 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32491 index 4500142..53a363c 100644
32492 --- a/arch/x86/mm/highmem_32.c
32493 +++ b/arch/x86/mm/highmem_32.c
32494 @@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32495 idx = type + KM_TYPE_NR*smp_processor_id();
32496 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32497 BUG_ON(!pte_none(*(kmap_pte-idx)));
32498 +
32499 + pax_open_kernel();
32500 set_pte(kmap_pte-idx, mk_pte(page, prot));
32501 + pax_close_kernel();
32502 +
32503 arch_flush_lazy_mmu_mode();
32504
32505 return (void *)vaddr;
32506 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32507 index 8b977eb..4732c33 100644
32508 --- a/arch/x86/mm/hugetlbpage.c
32509 +++ b/arch/x86/mm/hugetlbpage.c
32510 @@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32511 #ifdef CONFIG_HUGETLB_PAGE
32512 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32513 unsigned long addr, unsigned long len,
32514 - unsigned long pgoff, unsigned long flags)
32515 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32516 {
32517 struct hstate *h = hstate_file(file);
32518 struct vm_unmapped_area_info info;
32519 -
32520 +
32521 info.flags = 0;
32522 info.length = len;
32523 info.low_limit = current->mm->mmap_legacy_base;
32524 info.high_limit = TASK_SIZE;
32525 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32526 info.align_offset = 0;
32527 + info.threadstack_offset = offset;
32528 return vm_unmapped_area(&info);
32529 }
32530
32531 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32532 unsigned long addr0, unsigned long len,
32533 - unsigned long pgoff, unsigned long flags)
32534 + unsigned long pgoff, unsigned long flags, unsigned long offset)
32535 {
32536 struct hstate *h = hstate_file(file);
32537 struct vm_unmapped_area_info info;
32538 @@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32539 info.high_limit = current->mm->mmap_base;
32540 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32541 info.align_offset = 0;
32542 + info.threadstack_offset = offset;
32543 addr = vm_unmapped_area(&info);
32544
32545 /*
32546 @@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32547 VM_BUG_ON(addr != -ENOMEM);
32548 info.flags = 0;
32549 info.low_limit = TASK_UNMAPPED_BASE;
32550 +
32551 +#ifdef CONFIG_PAX_RANDMMAP
32552 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32553 + info.low_limit += current->mm->delta_mmap;
32554 +#endif
32555 +
32556 info.high_limit = TASK_SIZE;
32557 addr = vm_unmapped_area(&info);
32558 }
32559 @@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32560 struct hstate *h = hstate_file(file);
32561 struct mm_struct *mm = current->mm;
32562 struct vm_area_struct *vma;
32563 + unsigned long pax_task_size = TASK_SIZE;
32564 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32565
32566 if (len & ~huge_page_mask(h))
32567 return -EINVAL;
32568 - if (len > TASK_SIZE)
32569 +
32570 +#ifdef CONFIG_PAX_SEGMEXEC
32571 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
32572 + pax_task_size = SEGMEXEC_TASK_SIZE;
32573 +#endif
32574 +
32575 + pax_task_size -= PAGE_SIZE;
32576 +
32577 + if (len > pax_task_size)
32578 return -ENOMEM;
32579
32580 if (flags & MAP_FIXED) {
32581 @@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32582 return addr;
32583 }
32584
32585 +#ifdef CONFIG_PAX_RANDMMAP
32586 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32587 +#endif
32588 +
32589 if (addr) {
32590 addr = ALIGN(addr, huge_page_size(h));
32591 vma = find_vma(mm, addr);
32592 - if (TASK_SIZE - len >= addr &&
32593 - (!vma || addr + len <= vma->vm_start))
32594 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32595 return addr;
32596 }
32597 if (mm->get_unmapped_area == arch_get_unmapped_area)
32598 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32599 - pgoff, flags);
32600 + pgoff, flags, offset);
32601 else
32602 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32603 - pgoff, flags);
32604 + pgoff, flags, offset);
32605 }
32606 #endif /* CONFIG_HUGETLB_PAGE */
32607
32608 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32609 index 66dba36..f8082ec 100644
32610 --- a/arch/x86/mm/init.c
32611 +++ b/arch/x86/mm/init.c
32612 @@ -4,6 +4,7 @@
32613 #include <linux/swap.h>
32614 #include <linux/memblock.h>
32615 #include <linux/bootmem.h> /* for max_low_pfn */
32616 +#include <linux/tboot.h>
32617
32618 #include <asm/cacheflush.h>
32619 #include <asm/e820.h>
32620 @@ -17,6 +18,8 @@
32621 #include <asm/proto.h>
32622 #include <asm/dma.h> /* for MAX_DMA_PFN */
32623 #include <asm/microcode.h>
32624 +#include <asm/desc.h>
32625 +#include <asm/bios_ebda.h>
32626
32627 /*
32628 * We need to define the tracepoints somewhere, and tlb.c
32629 @@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32630 early_ioremap_page_table_range_init();
32631 #endif
32632
32633 +#ifdef CONFIG_PAX_PER_CPU_PGD
32634 + clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32635 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32636 + KERNEL_PGD_PTRS);
32637 + clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32638 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32639 + KERNEL_PGD_PTRS);
32640 + load_cr3(get_cpu_pgd(0, kernel));
32641 +#else
32642 load_cr3(swapper_pg_dir);
32643 +#endif
32644 +
32645 __flush_tlb_all();
32646
32647 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32648 @@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32649 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32650 * mmio resources as well as potential bios/acpi data regions.
32651 */
32652 +
32653 +#ifdef CONFIG_GRKERNSEC_KMEM
32654 +static unsigned int ebda_start __read_only;
32655 +static unsigned int ebda_end __read_only;
32656 +#endif
32657 +
32658 int devmem_is_allowed(unsigned long pagenr)
32659 {
32660 - if (pagenr < 256)
32661 +#ifdef CONFIG_GRKERNSEC_KMEM
32662 + /* allow BDA */
32663 + if (!pagenr)
32664 return 1;
32665 + /* allow EBDA */
32666 + if (pagenr >= ebda_start && pagenr < ebda_end)
32667 + return 1;
32668 + /* if tboot is in use, allow access to its hardcoded serial log range */
32669 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32670 + return 1;
32671 +#else
32672 + if (!pagenr)
32673 + return 1;
32674 +#ifdef CONFIG_VM86
32675 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32676 + return 1;
32677 +#endif
32678 +#endif
32679 +
32680 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32681 + return 1;
32682 +#ifdef CONFIG_GRKERNSEC_KMEM
32683 + /* throw out everything else below 1MB */
32684 + if (pagenr <= 256)
32685 + return 0;
32686 +#endif
32687 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32688 return 0;
32689 if (!page_is_ram(pagenr))
32690 @@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32691 #endif
32692 }
32693
32694 +#ifdef CONFIG_GRKERNSEC_KMEM
32695 +static inline void gr_init_ebda(void)
32696 +{
32697 + unsigned int ebda_addr;
32698 + unsigned int ebda_size = 0;
32699 +
32700 + ebda_addr = get_bios_ebda();
32701 + if (ebda_addr) {
32702 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32703 + ebda_size <<= 10;
32704 + }
32705 + if (ebda_addr && ebda_size) {
32706 + ebda_start = ebda_addr >> PAGE_SHIFT;
32707 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32708 + } else {
32709 + ebda_start = 0x9f000 >> PAGE_SHIFT;
32710 + ebda_end = 0xa0000 >> PAGE_SHIFT;
32711 + }
32712 +}
32713 +#else
32714 +static inline void gr_init_ebda(void) { }
32715 +#endif
32716 +
32717 void free_initmem(void)
32718 {
32719 +#ifdef CONFIG_PAX_KERNEXEC
32720 +#ifdef CONFIG_X86_32
32721 + /* PaX: limit KERNEL_CS to actual size */
32722 + unsigned long addr, limit;
32723 + struct desc_struct d;
32724 + int cpu;
32725 +#else
32726 + pgd_t *pgd;
32727 + pud_t *pud;
32728 + pmd_t *pmd;
32729 + unsigned long addr, end;
32730 +#endif
32731 +#endif
32732 +
32733 + gr_init_ebda();
32734 +
32735 +#ifdef CONFIG_PAX_KERNEXEC
32736 +#ifdef CONFIG_X86_32
32737 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32738 + limit = (limit - 1UL) >> PAGE_SHIFT;
32739 +
32740 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32741 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32742 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32743 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32744 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32745 + }
32746 +
32747 + /* PaX: make KERNEL_CS read-only */
32748 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32749 + if (!paravirt_enabled())
32750 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32751 +/*
32752 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32753 + pgd = pgd_offset_k(addr);
32754 + pud = pud_offset(pgd, addr);
32755 + pmd = pmd_offset(pud, addr);
32756 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32757 + }
32758 +*/
32759 +#ifdef CONFIG_X86_PAE
32760 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32761 +/*
32762 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32763 + pgd = pgd_offset_k(addr);
32764 + pud = pud_offset(pgd, addr);
32765 + pmd = pmd_offset(pud, addr);
32766 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32767 + }
32768 +*/
32769 +#endif
32770 +
32771 +#ifdef CONFIG_MODULES
32772 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32773 +#endif
32774 +
32775 +#else
32776 + /* PaX: make kernel code/rodata read-only, rest non-executable */
32777 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32778 + pgd = pgd_offset_k(addr);
32779 + pud = pud_offset(pgd, addr);
32780 + pmd = pmd_offset(pud, addr);
32781 + if (!pmd_present(*pmd))
32782 + continue;
32783 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32784 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32785 + else
32786 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32787 + }
32788 +
32789 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32790 + end = addr + KERNEL_IMAGE_SIZE;
32791 + for (; addr < end; addr += PMD_SIZE) {
32792 + pgd = pgd_offset_k(addr);
32793 + pud = pud_offset(pgd, addr);
32794 + pmd = pmd_offset(pud, addr);
32795 + if (!pmd_present(*pmd))
32796 + continue;
32797 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32798 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32799 + }
32800 +#endif
32801 +
32802 + flush_tlb_all();
32803 +#endif
32804 +
32805 free_init_pages("unused kernel",
32806 (unsigned long)(&__init_begin),
32807 (unsigned long)(&__init_end));
32808 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32809 index c8140e1..59257fc 100644
32810 --- a/arch/x86/mm/init_32.c
32811 +++ b/arch/x86/mm/init_32.c
32812 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32813 bool __read_mostly __vmalloc_start_set = false;
32814
32815 /*
32816 - * Creates a middle page table and puts a pointer to it in the
32817 - * given global directory entry. This only returns the gd entry
32818 - * in non-PAE compilation mode, since the middle layer is folded.
32819 - */
32820 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
32821 -{
32822 - pud_t *pud;
32823 - pmd_t *pmd_table;
32824 -
32825 -#ifdef CONFIG_X86_PAE
32826 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32827 - pmd_table = (pmd_t *)alloc_low_page();
32828 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32829 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32830 - pud = pud_offset(pgd, 0);
32831 - BUG_ON(pmd_table != pmd_offset(pud, 0));
32832 -
32833 - return pmd_table;
32834 - }
32835 -#endif
32836 - pud = pud_offset(pgd, 0);
32837 - pmd_table = pmd_offset(pud, 0);
32838 -
32839 - return pmd_table;
32840 -}
32841 -
32842 -/*
32843 * Create a page table and place a pointer to it in a middle page
32844 * directory entry:
32845 */
32846 @@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32847 pte_t *page_table = (pte_t *)alloc_low_page();
32848
32849 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32850 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32851 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32852 +#else
32853 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32854 +#endif
32855 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32856 }
32857
32858 return pte_offset_kernel(pmd, 0);
32859 }
32860
32861 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
32862 +{
32863 + pud_t *pud;
32864 + pmd_t *pmd_table;
32865 +
32866 + pud = pud_offset(pgd, 0);
32867 + pmd_table = pmd_offset(pud, 0);
32868 +
32869 + return pmd_table;
32870 +}
32871 +
32872 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32873 {
32874 int pgd_idx = pgd_index(vaddr);
32875 @@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32876 int pgd_idx, pmd_idx;
32877 unsigned long vaddr;
32878 pgd_t *pgd;
32879 + pud_t *pud;
32880 pmd_t *pmd;
32881 pte_t *pte = NULL;
32882 unsigned long count = page_table_range_init_count(start, end);
32883 @@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32884 pgd = pgd_base + pgd_idx;
32885
32886 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32887 - pmd = one_md_table_init(pgd);
32888 - pmd = pmd + pmd_index(vaddr);
32889 + pud = pud_offset(pgd, vaddr);
32890 + pmd = pmd_offset(pud, vaddr);
32891 +
32892 +#ifdef CONFIG_X86_PAE
32893 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32894 +#endif
32895 +
32896 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32897 pmd++, pmd_idx++) {
32898 pte = page_table_kmap_check(one_page_table_init(pmd),
32899 @@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32900 }
32901 }
32902
32903 -static inline int is_kernel_text(unsigned long addr)
32904 +static inline int is_kernel_text(unsigned long start, unsigned long end)
32905 {
32906 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32907 - return 1;
32908 - return 0;
32909 + if ((start >= ktla_ktva((unsigned long)_etext) ||
32910 + end <= ktla_ktva((unsigned long)_stext)) &&
32911 + (start >= ktla_ktva((unsigned long)_einittext) ||
32912 + end <= ktla_ktva((unsigned long)_sinittext)) &&
32913 +
32914 +#ifdef CONFIG_ACPI_SLEEP
32915 + (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32916 +#endif
32917 +
32918 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32919 + return 0;
32920 + return 1;
32921 }
32922
32923 /*
32924 @@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32925 unsigned long last_map_addr = end;
32926 unsigned long start_pfn, end_pfn;
32927 pgd_t *pgd_base = swapper_pg_dir;
32928 - int pgd_idx, pmd_idx, pte_ofs;
32929 + unsigned int pgd_idx, pmd_idx, pte_ofs;
32930 unsigned long pfn;
32931 pgd_t *pgd;
32932 + pud_t *pud;
32933 pmd_t *pmd;
32934 pte_t *pte;
32935 unsigned pages_2m, pages_4k;
32936 @@ -291,8 +295,13 @@ repeat:
32937 pfn = start_pfn;
32938 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32939 pgd = pgd_base + pgd_idx;
32940 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32941 - pmd = one_md_table_init(pgd);
32942 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32943 + pud = pud_offset(pgd, 0);
32944 + pmd = pmd_offset(pud, 0);
32945 +
32946 +#ifdef CONFIG_X86_PAE
32947 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32948 +#endif
32949
32950 if (pfn >= end_pfn)
32951 continue;
32952 @@ -304,14 +313,13 @@ repeat:
32953 #endif
32954 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32955 pmd++, pmd_idx++) {
32956 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32957 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32958
32959 /*
32960 * Map with big pages if possible, otherwise
32961 * create normal page tables:
32962 */
32963 if (use_pse) {
32964 - unsigned int addr2;
32965 pgprot_t prot = PAGE_KERNEL_LARGE;
32966 /*
32967 * first pass will use the same initial
32968 @@ -322,11 +330,7 @@ repeat:
32969 _PAGE_PSE);
32970
32971 pfn &= PMD_MASK >> PAGE_SHIFT;
32972 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32973 - PAGE_OFFSET + PAGE_SIZE-1;
32974 -
32975 - if (is_kernel_text(addr) ||
32976 - is_kernel_text(addr2))
32977 + if (is_kernel_text(address, address + PMD_SIZE))
32978 prot = PAGE_KERNEL_LARGE_EXEC;
32979
32980 pages_2m++;
32981 @@ -343,7 +347,7 @@ repeat:
32982 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32983 pte += pte_ofs;
32984 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32985 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32986 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32987 pgprot_t prot = PAGE_KERNEL;
32988 /*
32989 * first pass will use the same initial
32990 @@ -351,7 +355,7 @@ repeat:
32991 */
32992 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32993
32994 - if (is_kernel_text(addr))
32995 + if (is_kernel_text(address, address + PAGE_SIZE))
32996 prot = PAGE_KERNEL_EXEC;
32997
32998 pages_4k++;
32999 @@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33000
33001 pud = pud_offset(pgd, va);
33002 pmd = pmd_offset(pud, va);
33003 - if (!pmd_present(*pmd))
33004 + if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33005 break;
33006
33007 /* should not be large page here */
33008 @@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33009
33010 static void __init pagetable_init(void)
33011 {
33012 - pgd_t *pgd_base = swapper_pg_dir;
33013 -
33014 - permanent_kmaps_init(pgd_base);
33015 + permanent_kmaps_init(swapper_pg_dir);
33016 }
33017
33018 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33019 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33020 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33021
33022 /* user-defined highmem size */
33023 @@ -787,10 +789,10 @@ void __init mem_init(void)
33024 ((unsigned long)&__init_end -
33025 (unsigned long)&__init_begin) >> 10,
33026
33027 - (unsigned long)&_etext, (unsigned long)&_edata,
33028 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33029 + (unsigned long)&_sdata, (unsigned long)&_edata,
33030 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33031
33032 - (unsigned long)&_text, (unsigned long)&_etext,
33033 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33034 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33035
33036 /*
33037 @@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33038 if (!kernel_set_to_readonly)
33039 return;
33040
33041 + start = ktla_ktva(start);
33042 pr_debug("Set kernel text: %lx - %lx for read write\n",
33043 start, start+size);
33044
33045 @@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33046 if (!kernel_set_to_readonly)
33047 return;
33048
33049 + start = ktla_ktva(start);
33050 pr_debug("Set kernel text: %lx - %lx for read only\n",
33051 start, start+size);
33052
33053 @@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33054 unsigned long start = PFN_ALIGN(_text);
33055 unsigned long size = PFN_ALIGN(_etext) - start;
33056
33057 + start = ktla_ktva(start);
33058 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33059 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33060 size >> 10);
33061 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33062 index 4e5dfec..6fd6dc5 100644
33063 --- a/arch/x86/mm/init_64.c
33064 +++ b/arch/x86/mm/init_64.c
33065 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33066 * around without checking the pgd every time.
33067 */
33068
33069 -pteval_t __supported_pte_mask __read_mostly = ~0;
33070 +pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33071 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33072
33073 int force_personality32;
33074 @@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33075
33076 for (address = start; address <= end; address += PGDIR_SIZE) {
33077 const pgd_t *pgd_ref = pgd_offset_k(address);
33078 +
33079 +#ifdef CONFIG_PAX_PER_CPU_PGD
33080 + unsigned long cpu;
33081 +#else
33082 struct page *page;
33083 +#endif
33084
33085 /*
33086 * When it is called after memory hot remove, pgd_none()
33087 @@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33088 continue;
33089
33090 spin_lock(&pgd_lock);
33091 +
33092 +#ifdef CONFIG_PAX_PER_CPU_PGD
33093 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33094 + pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33095 +
33096 + if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33097 + BUG_ON(pgd_page_vaddr(*pgd)
33098 + != pgd_page_vaddr(*pgd_ref));
33099 +
33100 + if (removed) {
33101 + if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33102 + pgd_clear(pgd);
33103 + } else {
33104 + if (pgd_none(*pgd))
33105 + set_pgd(pgd, *pgd_ref);
33106 + }
33107 +
33108 + pgd = pgd_offset_cpu(cpu, kernel, address);
33109 +#else
33110 list_for_each_entry(page, &pgd_list, lru) {
33111 pgd_t *pgd;
33112 spinlock_t *pgt_lock;
33113 @@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33114 /* the pgt_lock only for Xen */
33115 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33116 spin_lock(pgt_lock);
33117 +#endif
33118
33119 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33120 BUG_ON(pgd_page_vaddr(*pgd)
33121 @@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33122 set_pgd(pgd, *pgd_ref);
33123 }
33124
33125 +#ifndef CONFIG_PAX_PER_CPU_PGD
33126 spin_unlock(pgt_lock);
33127 +#endif
33128 +
33129 }
33130 spin_unlock(&pgd_lock);
33131 }
33132 @@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33133 {
33134 if (pgd_none(*pgd)) {
33135 pud_t *pud = (pud_t *)spp_getpage();
33136 - pgd_populate(&init_mm, pgd, pud);
33137 + pgd_populate_kernel(&init_mm, pgd, pud);
33138 if (pud != pud_offset(pgd, 0))
33139 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33140 pud, pud_offset(pgd, 0));
33141 @@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33142 {
33143 if (pud_none(*pud)) {
33144 pmd_t *pmd = (pmd_t *) spp_getpage();
33145 - pud_populate(&init_mm, pud, pmd);
33146 + pud_populate_kernel(&init_mm, pud, pmd);
33147 if (pmd != pmd_offset(pud, 0))
33148 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33149 pmd, pmd_offset(pud, 0));
33150 @@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33151 pmd = fill_pmd(pud, vaddr);
33152 pte = fill_pte(pmd, vaddr);
33153
33154 + pax_open_kernel();
33155 set_pte(pte, new_pte);
33156 + pax_close_kernel();
33157
33158 /*
33159 * It's enough to flush this one mapping.
33160 @@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33161 pgd = pgd_offset_k((unsigned long)__va(phys));
33162 if (pgd_none(*pgd)) {
33163 pud = (pud_t *) spp_getpage();
33164 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33165 - _PAGE_USER));
33166 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33167 }
33168 pud = pud_offset(pgd, (unsigned long)__va(phys));
33169 if (pud_none(*pud)) {
33170 pmd = (pmd_t *) spp_getpage();
33171 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33172 - _PAGE_USER));
33173 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33174 }
33175 pmd = pmd_offset(pud, phys);
33176 BUG_ON(!pmd_none(*pmd));
33177 @@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33178 prot);
33179
33180 spin_lock(&init_mm.page_table_lock);
33181 - pud_populate(&init_mm, pud, pmd);
33182 + pud_populate_kernel(&init_mm, pud, pmd);
33183 spin_unlock(&init_mm.page_table_lock);
33184 }
33185 __flush_tlb_all();
33186 @@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33187 page_size_mask);
33188
33189 spin_lock(&init_mm.page_table_lock);
33190 - pgd_populate(&init_mm, pgd, pud);
33191 + pgd_populate_kernel(&init_mm, pgd, pud);
33192 spin_unlock(&init_mm.page_table_lock);
33193 pgd_changed = true;
33194 }
33195 @@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33196 static struct vm_area_struct gate_vma = {
33197 .vm_start = VSYSCALL_ADDR,
33198 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33199 - .vm_page_prot = PAGE_READONLY_EXEC,
33200 - .vm_flags = VM_READ | VM_EXEC,
33201 + .vm_page_prot = PAGE_READONLY,
33202 + .vm_flags = VM_READ,
33203 .vm_ops = &gate_vma_ops,
33204 };
33205
33206 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33207 index 7b179b49..6bd17777 100644
33208 --- a/arch/x86/mm/iomap_32.c
33209 +++ b/arch/x86/mm/iomap_32.c
33210 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33211 type = kmap_atomic_idx_push();
33212 idx = type + KM_TYPE_NR * smp_processor_id();
33213 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33214 +
33215 + pax_open_kernel();
33216 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33217 + pax_close_kernel();
33218 +
33219 arch_flush_lazy_mmu_mode();
33220
33221 return (void *)vaddr;
33222 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33223 index af78e50..0790b03 100644
33224 --- a/arch/x86/mm/ioremap.c
33225 +++ b/arch/x86/mm/ioremap.c
33226 @@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33227 unsigned long i;
33228
33229 for (i = 0; i < nr_pages; ++i)
33230 - if (pfn_valid(start_pfn + i) &&
33231 - !PageReserved(pfn_to_page(start_pfn + i)))
33232 + if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33233 + !PageReserved(pfn_to_page(start_pfn + i))))
33234 return 1;
33235
33236 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33237 @@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33238 *
33239 * Caller must ensure there is only one unmapping for the same pointer.
33240 */
33241 -void iounmap(volatile void __iomem *addr)
33242 +void iounmap(const volatile void __iomem *addr)
33243 {
33244 struct vm_struct *p, *o;
33245
33246 @@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33247
33248 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33249 if (page_is_ram(start >> PAGE_SHIFT))
33250 +#ifdef CONFIG_HIGHMEM
33251 + if ((start >> PAGE_SHIFT) < max_low_pfn)
33252 +#endif
33253 return __va(phys);
33254
33255 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33256 @@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33257 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33258 {
33259 if (page_is_ram(phys >> PAGE_SHIFT))
33260 +#ifdef CONFIG_HIGHMEM
33261 + if ((phys >> PAGE_SHIFT) < max_low_pfn)
33262 +#endif
33263 return;
33264
33265 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33266 return;
33267 }
33268
33269 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33270 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33271
33272 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33273 {
33274 @@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33275 early_ioremap_setup();
33276
33277 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33278 - memset(bm_pte, 0, sizeof(bm_pte));
33279 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
33280 + pmd_populate_user(&init_mm, pmd, bm_pte);
33281
33282 /*
33283 * The boot-ioremap range spans multiple pmds, for which
33284 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33285 index b4f2e7e..96c9c3e 100644
33286 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
33287 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33288 @@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33289 * memory (e.g. tracked pages)? For now, we need this to avoid
33290 * invoking kmemcheck for PnP BIOS calls.
33291 */
33292 - if (regs->flags & X86_VM_MASK)
33293 + if (v8086_mode(regs))
33294 return false;
33295 - if (regs->cs != __KERNEL_CS)
33296 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33297 return false;
33298
33299 pte = kmemcheck_pte_lookup(address);
33300 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33301 index 919b912..9267313 100644
33302 --- a/arch/x86/mm/mmap.c
33303 +++ b/arch/x86/mm/mmap.c
33304 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33305 * Leave an at least ~128 MB hole with possible stack randomization.
33306 */
33307 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33308 -#define MAX_GAP (TASK_SIZE/6*5)
33309 +#define MAX_GAP (pax_task_size/6*5)
33310
33311 static int mmap_is_legacy(void)
33312 {
33313 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33314 return rnd << PAGE_SHIFT;
33315 }
33316
33317 -static unsigned long mmap_base(void)
33318 +static unsigned long mmap_base(struct mm_struct *mm)
33319 {
33320 unsigned long gap = rlimit(RLIMIT_STACK);
33321 + unsigned long pax_task_size = TASK_SIZE;
33322 +
33323 +#ifdef CONFIG_PAX_SEGMEXEC
33324 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33325 + pax_task_size = SEGMEXEC_TASK_SIZE;
33326 +#endif
33327
33328 if (gap < MIN_GAP)
33329 gap = MIN_GAP;
33330 else if (gap > MAX_GAP)
33331 gap = MAX_GAP;
33332
33333 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33334 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33335 }
33336
33337 /*
33338 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33339 * does, but not when emulating X86_32
33340 */
33341 -static unsigned long mmap_legacy_base(void)
33342 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
33343 {
33344 - if (mmap_is_ia32())
33345 + if (mmap_is_ia32()) {
33346 +
33347 +#ifdef CONFIG_PAX_SEGMEXEC
33348 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
33349 + return SEGMEXEC_TASK_UNMAPPED_BASE;
33350 + else
33351 +#endif
33352 +
33353 return TASK_UNMAPPED_BASE;
33354 - else
33355 + } else
33356 return TASK_UNMAPPED_BASE + mmap_rnd();
33357 }
33358
33359 @@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33360 */
33361 void arch_pick_mmap_layout(struct mm_struct *mm)
33362 {
33363 - mm->mmap_legacy_base = mmap_legacy_base();
33364 - mm->mmap_base = mmap_base();
33365 + mm->mmap_legacy_base = mmap_legacy_base(mm);
33366 + mm->mmap_base = mmap_base(mm);
33367 +
33368 +#ifdef CONFIG_PAX_RANDMMAP
33369 + if (mm->pax_flags & MF_PAX_RANDMMAP) {
33370 + mm->mmap_legacy_base += mm->delta_mmap;
33371 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33372 + }
33373 +#endif
33374
33375 if (mmap_is_legacy()) {
33376 mm->mmap_base = mm->mmap_legacy_base;
33377 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33378 index 0057a7a..95c7edd 100644
33379 --- a/arch/x86/mm/mmio-mod.c
33380 +++ b/arch/x86/mm/mmio-mod.c
33381 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33382 break;
33383 default:
33384 {
33385 - unsigned char *ip = (unsigned char *)instptr;
33386 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33387 my_trace->opcode = MMIO_UNKNOWN_OP;
33388 my_trace->width = 0;
33389 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33390 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33391 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33392 void __iomem *addr)
33393 {
33394 - static atomic_t next_id;
33395 + static atomic_unchecked_t next_id;
33396 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33397 /* These are page-unaligned. */
33398 struct mmiotrace_map map = {
33399 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33400 .private = trace
33401 },
33402 .phys = offset,
33403 - .id = atomic_inc_return(&next_id)
33404 + .id = atomic_inc_return_unchecked(&next_id)
33405 };
33406 map.map_id = trace->id;
33407
33408 @@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33409 ioremap_trace_core(offset, size, addr);
33410 }
33411
33412 -static void iounmap_trace_core(volatile void __iomem *addr)
33413 +static void iounmap_trace_core(const volatile void __iomem *addr)
33414 {
33415 struct mmiotrace_map map = {
33416 .phys = 0,
33417 @@ -328,7 +328,7 @@ not_enabled:
33418 }
33419 }
33420
33421 -void mmiotrace_iounmap(volatile void __iomem *addr)
33422 +void mmiotrace_iounmap(const volatile void __iomem *addr)
33423 {
33424 might_sleep();
33425 if (is_enabled()) /* recheck and proper locking in *_core() */
33426 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33427 index 1a88370..3f598b5 100644
33428 --- a/arch/x86/mm/numa.c
33429 +++ b/arch/x86/mm/numa.c
33430 @@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33431 }
33432 }
33433
33434 -static int __init numa_register_memblks(struct numa_meminfo *mi)
33435 +static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33436 {
33437 unsigned long uninitialized_var(pfn_align);
33438 int i, nid;
33439 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33440 index 36de293..b820ddc 100644
33441 --- a/arch/x86/mm/pageattr.c
33442 +++ b/arch/x86/mm/pageattr.c
33443 @@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33444 */
33445 #ifdef CONFIG_PCI_BIOS
33446 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33447 - pgprot_val(forbidden) |= _PAGE_NX;
33448 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33449 #endif
33450
33451 /*
33452 @@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33453 * Does not cover __inittext since that is gone later on. On
33454 * 64bit we do not enforce !NX on the low mapping
33455 */
33456 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
33457 - pgprot_val(forbidden) |= _PAGE_NX;
33458 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33459 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33460
33461 +#ifdef CONFIG_DEBUG_RODATA
33462 /*
33463 * The .rodata section needs to be read-only. Using the pfn
33464 * catches all aliases.
33465 @@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33466 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33467 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33468 pgprot_val(forbidden) |= _PAGE_RW;
33469 +#endif
33470
33471 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33472 /*
33473 @@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33474 }
33475 #endif
33476
33477 +#ifdef CONFIG_PAX_KERNEXEC
33478 + if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33479 + pgprot_val(forbidden) |= _PAGE_RW;
33480 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33481 + }
33482 +#endif
33483 +
33484 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33485
33486 return prot;
33487 @@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33488 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33489 {
33490 /* change init_mm */
33491 + pax_open_kernel();
33492 set_pte_atomic(kpte, pte);
33493 +
33494 #ifdef CONFIG_X86_32
33495 if (!SHARED_KERNEL_PMD) {
33496 +
33497 +#ifdef CONFIG_PAX_PER_CPU_PGD
33498 + unsigned long cpu;
33499 +#else
33500 struct page *page;
33501 +#endif
33502
33503 +#ifdef CONFIG_PAX_PER_CPU_PGD
33504 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33505 + pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33506 +#else
33507 list_for_each_entry(page, &pgd_list, lru) {
33508 - pgd_t *pgd;
33509 + pgd_t *pgd = (pgd_t *)page_address(page);
33510 +#endif
33511 +
33512 pud_t *pud;
33513 pmd_t *pmd;
33514
33515 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
33516 + pgd += pgd_index(address);
33517 pud = pud_offset(pgd, address);
33518 pmd = pmd_offset(pud, address);
33519 set_pte_atomic((pte_t *)pmd, pte);
33520 }
33521 }
33522 #endif
33523 + pax_close_kernel();
33524 }
33525
33526 static int
33527 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33528 index 6574388..87e9bef 100644
33529 --- a/arch/x86/mm/pat.c
33530 +++ b/arch/x86/mm/pat.c
33531 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33532
33533 if (!entry) {
33534 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33535 - current->comm, current->pid, start, end - 1);
33536 + current->comm, task_pid_nr(current), start, end - 1);
33537 return -EINVAL;
33538 }
33539
33540 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33541
33542 while (cursor < to) {
33543 if (!devmem_is_allowed(pfn)) {
33544 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33545 - current->comm, from, to - 1);
33546 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33547 + current->comm, from, to - 1, cursor);
33548 return 0;
33549 }
33550 cursor += PAGE_SIZE;
33551 @@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33552 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33553 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33554 "for [mem %#010Lx-%#010Lx]\n",
33555 - current->comm, current->pid,
33556 + current->comm, task_pid_nr(current),
33557 cattr_name(flags),
33558 base, (unsigned long long)(base + size-1));
33559 return -EINVAL;
33560 @@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33561 flags = lookup_memtype(paddr);
33562 if (want_flags != flags) {
33563 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33564 - current->comm, current->pid,
33565 + current->comm, task_pid_nr(current),
33566 cattr_name(want_flags),
33567 (unsigned long long)paddr,
33568 (unsigned long long)(paddr + size - 1),
33569 @@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33570 free_memtype(paddr, paddr + size);
33571 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33572 " for [mem %#010Lx-%#010Lx], got %s\n",
33573 - current->comm, current->pid,
33574 + current->comm, task_pid_nr(current),
33575 cattr_name(want_flags),
33576 (unsigned long long)paddr,
33577 (unsigned long long)(paddr + size - 1),
33578 diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33579 index 415f6c4..d319983 100644
33580 --- a/arch/x86/mm/pat_rbtree.c
33581 +++ b/arch/x86/mm/pat_rbtree.c
33582 @@ -160,7 +160,7 @@ success:
33583
33584 failure:
33585 printk(KERN_INFO "%s:%d conflicting memory types "
33586 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33587 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33588 end, cattr_name(found_type), cattr_name(match->type));
33589 return -EBUSY;
33590 }
33591 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33592 index 9f0614d..92ae64a 100644
33593 --- a/arch/x86/mm/pf_in.c
33594 +++ b/arch/x86/mm/pf_in.c
33595 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33596 int i;
33597 enum reason_type rv = OTHERS;
33598
33599 - p = (unsigned char *)ins_addr;
33600 + p = (unsigned char *)ktla_ktva(ins_addr);
33601 p += skip_prefix(p, &prf);
33602 p += get_opcode(p, &opcode);
33603
33604 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33605 struct prefix_bits prf;
33606 int i;
33607
33608 - p = (unsigned char *)ins_addr;
33609 + p = (unsigned char *)ktla_ktva(ins_addr);
33610 p += skip_prefix(p, &prf);
33611 p += get_opcode(p, &opcode);
33612
33613 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33614 struct prefix_bits prf;
33615 int i;
33616
33617 - p = (unsigned char *)ins_addr;
33618 + p = (unsigned char *)ktla_ktva(ins_addr);
33619 p += skip_prefix(p, &prf);
33620 p += get_opcode(p, &opcode);
33621
33622 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33623 struct prefix_bits prf;
33624 int i;
33625
33626 - p = (unsigned char *)ins_addr;
33627 + p = (unsigned char *)ktla_ktva(ins_addr);
33628 p += skip_prefix(p, &prf);
33629 p += get_opcode(p, &opcode);
33630 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33631 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33632 struct prefix_bits prf;
33633 int i;
33634
33635 - p = (unsigned char *)ins_addr;
33636 + p = (unsigned char *)ktla_ktva(ins_addr);
33637 p += skip_prefix(p, &prf);
33638 p += get_opcode(p, &opcode);
33639 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33640 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33641 index 6fb6927..4fc13c0 100644
33642 --- a/arch/x86/mm/pgtable.c
33643 +++ b/arch/x86/mm/pgtable.c
33644 @@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33645 list_del(&page->lru);
33646 }
33647
33648 -#define UNSHARED_PTRS_PER_PGD \
33649 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33650 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33651 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33652
33653 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33654 +{
33655 + unsigned int count = USER_PGD_PTRS;
33656
33657 + if (!pax_user_shadow_base)
33658 + return;
33659 +
33660 + while (count--)
33661 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33662 +}
33663 +#endif
33664 +
33665 +#ifdef CONFIG_PAX_PER_CPU_PGD
33666 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33667 +{
33668 + unsigned int count = USER_PGD_PTRS;
33669 +
33670 + while (count--) {
33671 + pgd_t pgd;
33672 +
33673 +#ifdef CONFIG_X86_64
33674 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33675 +#else
33676 + pgd = *src++;
33677 +#endif
33678 +
33679 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33680 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33681 +#endif
33682 +
33683 + *dst++ = pgd;
33684 + }
33685 +
33686 +}
33687 +#endif
33688 +
33689 +#ifdef CONFIG_X86_64
33690 +#define pxd_t pud_t
33691 +#define pyd_t pgd_t
33692 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33693 +#define pgtable_pxd_page_ctor(page) true
33694 +#define pgtable_pxd_page_dtor(page)
33695 +#define pxd_free(mm, pud) pud_free((mm), (pud))
33696 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33697 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
33698 +#define PYD_SIZE PGDIR_SIZE
33699 +#else
33700 +#define pxd_t pmd_t
33701 +#define pyd_t pud_t
33702 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33703 +#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33704 +#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33705 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
33706 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33707 +#define pyd_offset(mm, address) pud_offset((mm), (address))
33708 +#define PYD_SIZE PUD_SIZE
33709 +#endif
33710 +
33711 +#ifdef CONFIG_PAX_PER_CPU_PGD
33712 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33713 +static inline void pgd_dtor(pgd_t *pgd) {}
33714 +#else
33715 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33716 {
33717 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33718 @@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33719 pgd_list_del(pgd);
33720 spin_unlock(&pgd_lock);
33721 }
33722 +#endif
33723
33724 /*
33725 * List of all pgd's needed for non-PAE so it can invalidate entries
33726 @@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33727 * -- nyc
33728 */
33729
33730 -#ifdef CONFIG_X86_PAE
33731 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33732 /*
33733 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33734 * updating the top-level pagetable entries to guarantee the
33735 @@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33736 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33737 * and initialize the kernel pmds here.
33738 */
33739 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33740 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33741
33742 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33743 {
33744 @@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33745 */
33746 flush_tlb_mm(mm);
33747 }
33748 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33749 +#define PREALLOCATED_PXDS USER_PGD_PTRS
33750 #else /* !CONFIG_X86_PAE */
33751
33752 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33753 -#define PREALLOCATED_PMDS 0
33754 +#define PREALLOCATED_PXDS 0
33755
33756 #endif /* CONFIG_X86_PAE */
33757
33758 -static void free_pmds(pmd_t *pmds[])
33759 +static void free_pxds(pxd_t *pxds[])
33760 {
33761 int i;
33762
33763 - for(i = 0; i < PREALLOCATED_PMDS; i++)
33764 - if (pmds[i]) {
33765 - pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33766 - free_page((unsigned long)pmds[i]);
33767 + for(i = 0; i < PREALLOCATED_PXDS; i++)
33768 + if (pxds[i]) {
33769 + pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33770 + free_page((unsigned long)pxds[i]);
33771 }
33772 }
33773
33774 -static int preallocate_pmds(pmd_t *pmds[])
33775 +static int preallocate_pxds(pxd_t *pxds[])
33776 {
33777 int i;
33778 bool failed = false;
33779
33780 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33781 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33782 - if (!pmd)
33783 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33784 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33785 + if (!pxd)
33786 failed = true;
33787 - if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33788 - free_page((unsigned long)pmd);
33789 - pmd = NULL;
33790 + if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33791 + free_page((unsigned long)pxd);
33792 + pxd = NULL;
33793 failed = true;
33794 }
33795 - pmds[i] = pmd;
33796 + pxds[i] = pxd;
33797 }
33798
33799 if (failed) {
33800 - free_pmds(pmds);
33801 + free_pxds(pxds);
33802 return -ENOMEM;
33803 }
33804
33805 @@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33806 * preallocate which never got a corresponding vma will need to be
33807 * freed manually.
33808 */
33809 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33810 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33811 {
33812 int i;
33813
33814 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
33815 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
33816 pgd_t pgd = pgdp[i];
33817
33818 if (pgd_val(pgd) != 0) {
33819 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33820 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33821
33822 - pgdp[i] = native_make_pgd(0);
33823 + set_pgd(pgdp + i, native_make_pgd(0));
33824
33825 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33826 - pmd_free(mm, pmd);
33827 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33828 + pxd_free(mm, pxd);
33829 }
33830 }
33831 }
33832
33833 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33834 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33835 {
33836 - pud_t *pud;
33837 + pyd_t *pyd;
33838 int i;
33839
33840 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33841 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33842 return;
33843
33844 - pud = pud_offset(pgd, 0);
33845 -
33846 - for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33847 - pmd_t *pmd = pmds[i];
33848 +#ifdef CONFIG_X86_64
33849 + pyd = pyd_offset(mm, 0L);
33850 +#else
33851 + pyd = pyd_offset(pgd, 0L);
33852 +#endif
33853
33854 + for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33855 + pxd_t *pxd = pxds[i];
33856 if (i >= KERNEL_PGD_BOUNDARY)
33857 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33858 - sizeof(pmd_t) * PTRS_PER_PMD);
33859 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33860 + sizeof(pxd_t) * PTRS_PER_PMD);
33861
33862 - pud_populate(mm, pud, pmd);
33863 + pyd_populate(mm, pyd, pxd);
33864 }
33865 }
33866
33867 pgd_t *pgd_alloc(struct mm_struct *mm)
33868 {
33869 pgd_t *pgd;
33870 - pmd_t *pmds[PREALLOCATED_PMDS];
33871 + pxd_t *pxds[PREALLOCATED_PXDS];
33872
33873 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33874
33875 @@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33876
33877 mm->pgd = pgd;
33878
33879 - if (preallocate_pmds(pmds) != 0)
33880 + if (preallocate_pxds(pxds) != 0)
33881 goto out_free_pgd;
33882
33883 if (paravirt_pgd_alloc(mm) != 0)
33884 - goto out_free_pmds;
33885 + goto out_free_pxds;
33886
33887 /*
33888 * Make sure that pre-populating the pmds is atomic with
33889 @@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33890 spin_lock(&pgd_lock);
33891
33892 pgd_ctor(mm, pgd);
33893 - pgd_prepopulate_pmd(mm, pgd, pmds);
33894 + pgd_prepopulate_pxd(mm, pgd, pxds);
33895
33896 spin_unlock(&pgd_lock);
33897
33898 return pgd;
33899
33900 -out_free_pmds:
33901 - free_pmds(pmds);
33902 +out_free_pxds:
33903 + free_pxds(pxds);
33904 out_free_pgd:
33905 free_page((unsigned long)pgd);
33906 out:
33907 @@ -313,7 +380,7 @@ out:
33908
33909 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33910 {
33911 - pgd_mop_up_pmds(mm, pgd);
33912 + pgd_mop_up_pxds(mm, pgd);
33913 pgd_dtor(pgd);
33914 paravirt_pgd_free(mm, pgd);
33915 free_page((unsigned long)pgd);
33916 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33917 index 75cc097..79a097f 100644
33918 --- a/arch/x86/mm/pgtable_32.c
33919 +++ b/arch/x86/mm/pgtable_32.c
33920 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33921 return;
33922 }
33923 pte = pte_offset_kernel(pmd, vaddr);
33924 +
33925 + pax_open_kernel();
33926 if (pte_val(pteval))
33927 set_pte_at(&init_mm, vaddr, pte, pteval);
33928 else
33929 pte_clear(&init_mm, vaddr, pte);
33930 + pax_close_kernel();
33931
33932 /*
33933 * It's enough to flush this one mapping.
33934 diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33935 index e666cbb..61788c45 100644
33936 --- a/arch/x86/mm/physaddr.c
33937 +++ b/arch/x86/mm/physaddr.c
33938 @@ -10,7 +10,7 @@
33939 #ifdef CONFIG_X86_64
33940
33941 #ifdef CONFIG_DEBUG_VIRTUAL
33942 -unsigned long __phys_addr(unsigned long x)
33943 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33944 {
33945 unsigned long y = x - __START_KERNEL_map;
33946
33947 @@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33948 #else
33949
33950 #ifdef CONFIG_DEBUG_VIRTUAL
33951 -unsigned long __phys_addr(unsigned long x)
33952 +unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33953 {
33954 unsigned long phys_addr = x - PAGE_OFFSET;
33955 /* VMALLOC_* aren't constants */
33956 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33957 index 90555bf..f5f1828 100644
33958 --- a/arch/x86/mm/setup_nx.c
33959 +++ b/arch/x86/mm/setup_nx.c
33960 @@ -5,8 +5,10 @@
33961 #include <asm/pgtable.h>
33962 #include <asm/proto.h>
33963
33964 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33965 static int disable_nx;
33966
33967 +#ifndef CONFIG_PAX_PAGEEXEC
33968 /*
33969 * noexec = on|off
33970 *
33971 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33972 return 0;
33973 }
33974 early_param("noexec", noexec_setup);
33975 +#endif
33976 +
33977 +#endif
33978
33979 void x86_configure_nx(void)
33980 {
33981 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33982 if (cpu_has_nx && !disable_nx)
33983 __supported_pte_mask |= _PAGE_NX;
33984 else
33985 +#endif
33986 __supported_pte_mask &= ~_PAGE_NX;
33987 }
33988
33989 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33990 index ee61c36..e6fedeb 100644
33991 --- a/arch/x86/mm/tlb.c
33992 +++ b/arch/x86/mm/tlb.c
33993 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
33994 BUG();
33995 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33996 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33997 +
33998 +#ifndef CONFIG_PAX_PER_CPU_PGD
33999 load_cr3(swapper_pg_dir);
34000 +#endif
34001 +
34002 /*
34003 * This gets called in the idle path where RCU
34004 * functions differently. Tracing normally
34005 diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34006 new file mode 100644
34007 index 0000000..dace51c
34008 --- /dev/null
34009 +++ b/arch/x86/mm/uderef_64.c
34010 @@ -0,0 +1,37 @@
34011 +#include <linux/mm.h>
34012 +#include <asm/pgtable.h>
34013 +#include <asm/uaccess.h>
34014 +
34015 +#ifdef CONFIG_PAX_MEMORY_UDEREF
34016 +/* PaX: due to the special call convention these functions must
34017 + * - remain leaf functions under all configurations,
34018 + * - never be called directly, only dereferenced from the wrappers.
34019 + */
34020 +void __pax_open_userland(void)
34021 +{
34022 + unsigned int cpu;
34023 +
34024 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34025 + return;
34026 +
34027 + cpu = raw_get_cpu();
34028 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34029 + write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34030 + raw_put_cpu_no_resched();
34031 +}
34032 +EXPORT_SYMBOL(__pax_open_userland);
34033 +
34034 +void __pax_close_userland(void)
34035 +{
34036 + unsigned int cpu;
34037 +
34038 + if (unlikely(!segment_eq(get_fs(), USER_DS)))
34039 + return;
34040 +
34041 + cpu = raw_get_cpu();
34042 + BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34043 + write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34044 + raw_put_cpu_no_resched();
34045 +}
34046 +EXPORT_SYMBOL(__pax_close_userland);
34047 +#endif
34048 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34049 index 6440221..f84b5c7 100644
34050 --- a/arch/x86/net/bpf_jit.S
34051 +++ b/arch/x86/net/bpf_jit.S
34052 @@ -9,6 +9,7 @@
34053 */
34054 #include <linux/linkage.h>
34055 #include <asm/dwarf2.h>
34056 +#include <asm/alternative-asm.h>
34057
34058 /*
34059 * Calling convention :
34060 @@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34061 jle bpf_slow_path_word
34062 mov (SKBDATA,%rsi),%eax
34063 bswap %eax /* ntohl() */
34064 + pax_force_retaddr
34065 ret
34066
34067 sk_load_half:
34068 @@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34069 jle bpf_slow_path_half
34070 movzwl (SKBDATA,%rsi),%eax
34071 rol $8,%ax # ntohs()
34072 + pax_force_retaddr
34073 ret
34074
34075 sk_load_byte:
34076 @@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34077 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34078 jle bpf_slow_path_byte
34079 movzbl (SKBDATA,%rsi),%eax
34080 + pax_force_retaddr
34081 ret
34082
34083 /* rsi contains offset and can be scratched */
34084 @@ -90,6 +94,7 @@ bpf_slow_path_word:
34085 js bpf_error
34086 mov - MAX_BPF_STACK + 32(%rbp),%eax
34087 bswap %eax
34088 + pax_force_retaddr
34089 ret
34090
34091 bpf_slow_path_half:
34092 @@ -98,12 +103,14 @@ bpf_slow_path_half:
34093 mov - MAX_BPF_STACK + 32(%rbp),%ax
34094 rol $8,%ax
34095 movzwl %ax,%eax
34096 + pax_force_retaddr
34097 ret
34098
34099 bpf_slow_path_byte:
34100 bpf_slow_path_common(1)
34101 js bpf_error
34102 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34103 + pax_force_retaddr
34104 ret
34105
34106 #define sk_negative_common(SIZE) \
34107 @@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34108 sk_negative_common(4)
34109 mov (%rax), %eax
34110 bswap %eax
34111 + pax_force_retaddr
34112 ret
34113
34114 bpf_slow_path_half_neg:
34115 @@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34116 mov (%rax),%ax
34117 rol $8,%ax
34118 movzwl %ax,%eax
34119 + pax_force_retaddr
34120 ret
34121
34122 bpf_slow_path_byte_neg:
34123 @@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34124 .globl sk_load_byte_negative_offset
34125 sk_negative_common(1)
34126 movzbl (%rax), %eax
34127 + pax_force_retaddr
34128 ret
34129
34130 bpf_error:
34131 @@ -156,4 +166,5 @@ bpf_error:
34132 mov - MAX_BPF_STACK + 16(%rbp),%r14
34133 mov - MAX_BPF_STACK + 24(%rbp),%r15
34134 leaveq
34135 + pax_force_retaddr
34136 ret
34137 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34138 index 3f62734..a57894f 100644
34139 --- a/arch/x86/net/bpf_jit_comp.c
34140 +++ b/arch/x86/net/bpf_jit_comp.c
34141 @@ -13,7 +13,11 @@
34142 #include <linux/if_vlan.h>
34143 #include <asm/cacheflush.h>
34144
34145 +#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34146 +int bpf_jit_enable __read_only;
34147 +#else
34148 int bpf_jit_enable __read_mostly;
34149 +#endif
34150
34151 /*
34152 * assembly code in arch/x86/net/bpf_jit.S
34153 @@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34154 static void jit_fill_hole(void *area, unsigned int size)
34155 {
34156 /* fill whole space with int3 instructions */
34157 + pax_open_kernel();
34158 memset(area, 0xcc, size);
34159 + pax_close_kernel();
34160 }
34161
34162 struct jit_context {
34163 @@ -894,7 +900,9 @@ common_load:
34164 pr_err("bpf_jit_compile fatal error\n");
34165 return -EFAULT;
34166 }
34167 + pax_open_kernel();
34168 memcpy(image + proglen, temp, ilen);
34169 + pax_close_kernel();
34170 }
34171 proglen += ilen;
34172 addrs[i] = proglen;
34173 @@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34174
34175 if (image) {
34176 bpf_flush_icache(header, image + proglen);
34177 - set_memory_ro((unsigned long)header, header->pages);
34178 prog->bpf_func = (void *)image;
34179 prog->jited = true;
34180 }
34181 @@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34182 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34183 struct bpf_binary_header *header = (void *)addr;
34184
34185 - if (!fp->jited)
34186 - goto free_filter;
34187 + if (fp->jited)
34188 + bpf_jit_binary_free(header);
34189
34190 - set_memory_rw(addr, header->pages);
34191 - bpf_jit_binary_free(header);
34192 -
34193 -free_filter:
34194 bpf_prog_unlock_free(fp);
34195 }
34196 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34197 index 5d04be5..2beeaa2 100644
34198 --- a/arch/x86/oprofile/backtrace.c
34199 +++ b/arch/x86/oprofile/backtrace.c
34200 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34201 struct stack_frame_ia32 *fp;
34202 unsigned long bytes;
34203
34204 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34205 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34206 if (bytes != 0)
34207 return NULL;
34208
34209 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34210 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34211
34212 oprofile_add_trace(bufhead[0].return_address);
34213
34214 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34215 struct stack_frame bufhead[2];
34216 unsigned long bytes;
34217
34218 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34219 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34220 if (bytes != 0)
34221 return NULL;
34222
34223 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34224 {
34225 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34226
34227 - if (!user_mode_vm(regs)) {
34228 + if (!user_mode(regs)) {
34229 unsigned long stack = kernel_stack_pointer(regs);
34230 if (depth)
34231 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34232 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34233 index 1d2e639..f6ef82a 100644
34234 --- a/arch/x86/oprofile/nmi_int.c
34235 +++ b/arch/x86/oprofile/nmi_int.c
34236 @@ -23,6 +23,7 @@
34237 #include <asm/nmi.h>
34238 #include <asm/msr.h>
34239 #include <asm/apic.h>
34240 +#include <asm/pgtable.h>
34241
34242 #include "op_counter.h"
34243 #include "op_x86_model.h"
34244 @@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34245 if (ret)
34246 return ret;
34247
34248 - if (!model->num_virt_counters)
34249 - model->num_virt_counters = model->num_counters;
34250 + if (!model->num_virt_counters) {
34251 + pax_open_kernel();
34252 + *(unsigned int *)&model->num_virt_counters = model->num_counters;
34253 + pax_close_kernel();
34254 + }
34255
34256 mux_init(ops);
34257
34258 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34259 index 50d86c0..7985318 100644
34260 --- a/arch/x86/oprofile/op_model_amd.c
34261 +++ b/arch/x86/oprofile/op_model_amd.c
34262 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34263 num_counters = AMD64_NUM_COUNTERS;
34264 }
34265
34266 - op_amd_spec.num_counters = num_counters;
34267 - op_amd_spec.num_controls = num_counters;
34268 - op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34269 + pax_open_kernel();
34270 + *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34271 + *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34272 + *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34273 + pax_close_kernel();
34274
34275 return 0;
34276 }
34277 diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34278 index d90528e..0127e2b 100644
34279 --- a/arch/x86/oprofile/op_model_ppro.c
34280 +++ b/arch/x86/oprofile/op_model_ppro.c
34281 @@ -19,6 +19,7 @@
34282 #include <asm/msr.h>
34283 #include <asm/apic.h>
34284 #include <asm/nmi.h>
34285 +#include <asm/pgtable.h>
34286
34287 #include "op_x86_model.h"
34288 #include "op_counter.h"
34289 @@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34290
34291 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34292
34293 - op_arch_perfmon_spec.num_counters = num_counters;
34294 - op_arch_perfmon_spec.num_controls = num_counters;
34295 + pax_open_kernel();
34296 + *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34297 + *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34298 + pax_close_kernel();
34299 }
34300
34301 static int arch_perfmon_init(struct oprofile_operations *ignore)
34302 diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34303 index 71e8a67..6a313bb 100644
34304 --- a/arch/x86/oprofile/op_x86_model.h
34305 +++ b/arch/x86/oprofile/op_x86_model.h
34306 @@ -52,7 +52,7 @@ struct op_x86_model_spec {
34307 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34308 struct op_msrs const * const msrs);
34309 #endif
34310 -};
34311 +} __do_const;
34312
34313 struct op_counter_config;
34314
34315 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34316 index b9958c3..24229ab 100644
34317 --- a/arch/x86/pci/intel_mid_pci.c
34318 +++ b/arch/x86/pci/intel_mid_pci.c
34319 @@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34320 pci_mmcfg_late_init();
34321 pcibios_enable_irq = intel_mid_pci_irq_enable;
34322 pcibios_disable_irq = intel_mid_pci_irq_disable;
34323 - pci_root_ops = intel_mid_pci_ops;
34324 + memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34325 pci_soc_mode = 1;
34326 /* Continue with standard init */
34327 return 1;
34328 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34329 index eb500c2..eab9e70 100644
34330 --- a/arch/x86/pci/irq.c
34331 +++ b/arch/x86/pci/irq.c
34332 @@ -51,7 +51,7 @@ struct irq_router {
34333 struct irq_router_handler {
34334 u16 vendor;
34335 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34336 -};
34337 +} __do_const;
34338
34339 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34340 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34341 @@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34342 return 0;
34343 }
34344
34345 -static __initdata struct irq_router_handler pirq_routers[] = {
34346 +static __initconst const struct irq_router_handler pirq_routers[] = {
34347 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34348 { PCI_VENDOR_ID_AL, ali_router_probe },
34349 { PCI_VENDOR_ID_ITE, ite_router_probe },
34350 @@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34351 static void __init pirq_find_router(struct irq_router *r)
34352 {
34353 struct irq_routing_table *rt = pirq_table;
34354 - struct irq_router_handler *h;
34355 + const struct irq_router_handler *h;
34356
34357 #ifdef CONFIG_PCI_BIOS
34358 if (!rt->signature) {
34359 @@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34360 return 0;
34361 }
34362
34363 -static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34364 +static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34365 {
34366 .callback = fix_broken_hp_bios_irq9,
34367 .ident = "HP Pavilion N5400 Series Laptop",
34368 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34369 index 9b83b90..4112152 100644
34370 --- a/arch/x86/pci/pcbios.c
34371 +++ b/arch/x86/pci/pcbios.c
34372 @@ -79,7 +79,7 @@ union bios32 {
34373 static struct {
34374 unsigned long address;
34375 unsigned short segment;
34376 -} bios32_indirect __initdata = { 0, __KERNEL_CS };
34377 +} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34378
34379 /*
34380 * Returns the entry point for the given service, NULL on error
34381 @@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34382 unsigned long length; /* %ecx */
34383 unsigned long entry; /* %edx */
34384 unsigned long flags;
34385 + struct desc_struct d, *gdt;
34386
34387 local_irq_save(flags);
34388 - __asm__("lcall *(%%edi); cld"
34389 +
34390 + gdt = get_cpu_gdt_table(smp_processor_id());
34391 +
34392 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34393 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34394 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34395 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34396 +
34397 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34398 : "=a" (return_code),
34399 "=b" (address),
34400 "=c" (length),
34401 "=d" (entry)
34402 : "0" (service),
34403 "1" (0),
34404 - "D" (&bios32_indirect));
34405 + "D" (&bios32_indirect),
34406 + "r"(__PCIBIOS_DS)
34407 + : "memory");
34408 +
34409 + pax_open_kernel();
34410 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34411 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34412 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34413 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34414 + pax_close_kernel();
34415 +
34416 local_irq_restore(flags);
34417
34418 switch (return_code) {
34419 - case 0:
34420 - return address + entry;
34421 - case 0x80: /* Not present */
34422 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34423 - return 0;
34424 - default: /* Shouldn't happen */
34425 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34426 - service, return_code);
34427 + case 0: {
34428 + int cpu;
34429 + unsigned char flags;
34430 +
34431 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34432 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34433 + printk(KERN_WARNING "bios32_service: not valid\n");
34434 return 0;
34435 + }
34436 + address = address + PAGE_OFFSET;
34437 + length += 16UL; /* some BIOSs underreport this... */
34438 + flags = 4;
34439 + if (length >= 64*1024*1024) {
34440 + length >>= PAGE_SHIFT;
34441 + flags |= 8;
34442 + }
34443 +
34444 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34445 + gdt = get_cpu_gdt_table(cpu);
34446 + pack_descriptor(&d, address, length, 0x9b, flags);
34447 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34448 + pack_descriptor(&d, address, length, 0x93, flags);
34449 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34450 + }
34451 + return entry;
34452 + }
34453 + case 0x80: /* Not present */
34454 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34455 + return 0;
34456 + default: /* Shouldn't happen */
34457 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34458 + service, return_code);
34459 + return 0;
34460 }
34461 }
34462
34463 static struct {
34464 unsigned long address;
34465 unsigned short segment;
34466 -} pci_indirect = { 0, __KERNEL_CS };
34467 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34468
34469 -static int pci_bios_present;
34470 +static int pci_bios_present __read_only;
34471
34472 static int __init check_pcibios(void)
34473 {
34474 @@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34475 unsigned long flags, pcibios_entry;
34476
34477 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34478 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34479 + pci_indirect.address = pcibios_entry;
34480
34481 local_irq_save(flags);
34482 - __asm__(
34483 - "lcall *(%%edi); cld\n\t"
34484 + __asm__("movw %w6, %%ds\n\t"
34485 + "lcall *%%ss:(%%edi); cld\n\t"
34486 + "push %%ss\n\t"
34487 + "pop %%ds\n\t"
34488 "jc 1f\n\t"
34489 "xor %%ah, %%ah\n"
34490 "1:"
34491 @@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34492 "=b" (ebx),
34493 "=c" (ecx)
34494 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34495 - "D" (&pci_indirect)
34496 + "D" (&pci_indirect),
34497 + "r" (__PCIBIOS_DS)
34498 : "memory");
34499 local_irq_restore(flags);
34500
34501 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34502
34503 switch (len) {
34504 case 1:
34505 - __asm__("lcall *(%%esi); cld\n\t"
34506 + __asm__("movw %w6, %%ds\n\t"
34507 + "lcall *%%ss:(%%esi); cld\n\t"
34508 + "push %%ss\n\t"
34509 + "pop %%ds\n\t"
34510 "jc 1f\n\t"
34511 "xor %%ah, %%ah\n"
34512 "1:"
34513 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34514 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34515 "b" (bx),
34516 "D" ((long)reg),
34517 - "S" (&pci_indirect));
34518 + "S" (&pci_indirect),
34519 + "r" (__PCIBIOS_DS));
34520 /*
34521 * Zero-extend the result beyond 8 bits, do not trust the
34522 * BIOS having done it:
34523 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34524 *value &= 0xff;
34525 break;
34526 case 2:
34527 - __asm__("lcall *(%%esi); cld\n\t"
34528 + __asm__("movw %w6, %%ds\n\t"
34529 + "lcall *%%ss:(%%esi); cld\n\t"
34530 + "push %%ss\n\t"
34531 + "pop %%ds\n\t"
34532 "jc 1f\n\t"
34533 "xor %%ah, %%ah\n"
34534 "1:"
34535 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34536 : "1" (PCIBIOS_READ_CONFIG_WORD),
34537 "b" (bx),
34538 "D" ((long)reg),
34539 - "S" (&pci_indirect));
34540 + "S" (&pci_indirect),
34541 + "r" (__PCIBIOS_DS));
34542 /*
34543 * Zero-extend the result beyond 16 bits, do not trust the
34544 * BIOS having done it:
34545 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34546 *value &= 0xffff;
34547 break;
34548 case 4:
34549 - __asm__("lcall *(%%esi); cld\n\t"
34550 + __asm__("movw %w6, %%ds\n\t"
34551 + "lcall *%%ss:(%%esi); cld\n\t"
34552 + "push %%ss\n\t"
34553 + "pop %%ds\n\t"
34554 "jc 1f\n\t"
34555 "xor %%ah, %%ah\n"
34556 "1:"
34557 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34558 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34559 "b" (bx),
34560 "D" ((long)reg),
34561 - "S" (&pci_indirect));
34562 + "S" (&pci_indirect),
34563 + "r" (__PCIBIOS_DS));
34564 break;
34565 }
34566
34567 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34568
34569 switch (len) {
34570 case 1:
34571 - __asm__("lcall *(%%esi); cld\n\t"
34572 + __asm__("movw %w6, %%ds\n\t"
34573 + "lcall *%%ss:(%%esi); cld\n\t"
34574 + "push %%ss\n\t"
34575 + "pop %%ds\n\t"
34576 "jc 1f\n\t"
34577 "xor %%ah, %%ah\n"
34578 "1:"
34579 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34580 "c" (value),
34581 "b" (bx),
34582 "D" ((long)reg),
34583 - "S" (&pci_indirect));
34584 + "S" (&pci_indirect),
34585 + "r" (__PCIBIOS_DS));
34586 break;
34587 case 2:
34588 - __asm__("lcall *(%%esi); cld\n\t"
34589 + __asm__("movw %w6, %%ds\n\t"
34590 + "lcall *%%ss:(%%esi); cld\n\t"
34591 + "push %%ss\n\t"
34592 + "pop %%ds\n\t"
34593 "jc 1f\n\t"
34594 "xor %%ah, %%ah\n"
34595 "1:"
34596 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34597 "c" (value),
34598 "b" (bx),
34599 "D" ((long)reg),
34600 - "S" (&pci_indirect));
34601 + "S" (&pci_indirect),
34602 + "r" (__PCIBIOS_DS));
34603 break;
34604 case 4:
34605 - __asm__("lcall *(%%esi); cld\n\t"
34606 + __asm__("movw %w6, %%ds\n\t"
34607 + "lcall *%%ss:(%%esi); cld\n\t"
34608 + "push %%ss\n\t"
34609 + "pop %%ds\n\t"
34610 "jc 1f\n\t"
34611 "xor %%ah, %%ah\n"
34612 "1:"
34613 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34614 "c" (value),
34615 "b" (bx),
34616 "D" ((long)reg),
34617 - "S" (&pci_indirect));
34618 + "S" (&pci_indirect),
34619 + "r" (__PCIBIOS_DS));
34620 break;
34621 }
34622
34623 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34624
34625 DBG("PCI: Fetching IRQ routing table... ");
34626 __asm__("push %%es\n\t"
34627 + "movw %w8, %%ds\n\t"
34628 "push %%ds\n\t"
34629 "pop %%es\n\t"
34630 - "lcall *(%%esi); cld\n\t"
34631 + "lcall *%%ss:(%%esi); cld\n\t"
34632 "pop %%es\n\t"
34633 + "push %%ss\n\t"
34634 + "pop %%ds\n"
34635 "jc 1f\n\t"
34636 "xor %%ah, %%ah\n"
34637 "1:"
34638 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34639 "1" (0),
34640 "D" ((long) &opt),
34641 "S" (&pci_indirect),
34642 - "m" (opt)
34643 + "m" (opt),
34644 + "r" (__PCIBIOS_DS)
34645 : "memory");
34646 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34647 if (ret & 0xff00)
34648 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34649 {
34650 int ret;
34651
34652 - __asm__("lcall *(%%esi); cld\n\t"
34653 + __asm__("movw %w5, %%ds\n\t"
34654 + "lcall *%%ss:(%%esi); cld\n\t"
34655 + "push %%ss\n\t"
34656 + "pop %%ds\n"
34657 "jc 1f\n\t"
34658 "xor %%ah, %%ah\n"
34659 "1:"
34660 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34661 : "0" (PCIBIOS_SET_PCI_HW_INT),
34662 "b" ((dev->bus->number << 8) | dev->devfn),
34663 "c" ((irq << 8) | (pin + 10)),
34664 - "S" (&pci_indirect));
34665 + "S" (&pci_indirect),
34666 + "r" (__PCIBIOS_DS));
34667 return !(ret & 0xff00);
34668 }
34669 EXPORT_SYMBOL(pcibios_set_irq_routing);
34670 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34671 index 40e7cda..c7e6672 100644
34672 --- a/arch/x86/platform/efi/efi_32.c
34673 +++ b/arch/x86/platform/efi/efi_32.c
34674 @@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34675 {
34676 struct desc_ptr gdt_descr;
34677
34678 +#ifdef CONFIG_PAX_KERNEXEC
34679 + struct desc_struct d;
34680 +#endif
34681 +
34682 local_irq_save(efi_rt_eflags);
34683
34684 load_cr3(initial_page_table);
34685 __flush_tlb_all();
34686
34687 +#ifdef CONFIG_PAX_KERNEXEC
34688 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34689 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34690 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34691 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34692 +#endif
34693 +
34694 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34695 gdt_descr.size = GDT_SIZE - 1;
34696 load_gdt(&gdt_descr);
34697 @@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34698 {
34699 struct desc_ptr gdt_descr;
34700
34701 +#ifdef CONFIG_PAX_KERNEXEC
34702 + struct desc_struct d;
34703 +
34704 + memset(&d, 0, sizeof d);
34705 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34706 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34707 +#endif
34708 +
34709 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34710 gdt_descr.size = GDT_SIZE - 1;
34711 load_gdt(&gdt_descr);
34712
34713 +#ifdef CONFIG_PAX_PER_CPU_PGD
34714 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34715 +#else
34716 load_cr3(swapper_pg_dir);
34717 +#endif
34718 +
34719 __flush_tlb_all();
34720
34721 local_irq_restore(efi_rt_eflags);
34722 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34723 index 35aecb6..46177db 100644
34724 --- a/arch/x86/platform/efi/efi_64.c
34725 +++ b/arch/x86/platform/efi/efi_64.c
34726 @@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34727 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34728 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34729 }
34730 +
34731 +#ifdef CONFIG_PAX_PER_CPU_PGD
34732 + load_cr3(swapper_pg_dir);
34733 +#endif
34734 +
34735 __flush_tlb_all();
34736 }
34737
34738 @@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34739 for (pgd = 0; pgd < n_pgds; pgd++)
34740 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34741 kfree(save_pgd);
34742 +
34743 +#ifdef CONFIG_PAX_PER_CPU_PGD
34744 + load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34745 +#endif
34746 +
34747 __flush_tlb_all();
34748 local_irq_restore(efi_flags);
34749 early_code_mapping_set_exec(0);
34750 @@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34751 unsigned npages;
34752 pgd_t *pgd;
34753
34754 - if (efi_enabled(EFI_OLD_MEMMAP))
34755 + if (efi_enabled(EFI_OLD_MEMMAP)) {
34756 + /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34757 + * able to execute the EFI services.
34758 + */
34759 + if (__supported_pte_mask & _PAGE_NX) {
34760 + unsigned long addr = (unsigned long) __va(0);
34761 + pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34762 +
34763 + pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34764 +#ifdef CONFIG_PAX_PER_CPU_PGD
34765 + set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34766 +#endif
34767 + set_pgd(pgd_offset_k(addr), pe);
34768 + }
34769 +
34770 return 0;
34771 + }
34772
34773 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34774 pgd = __va(efi_scratch.efi_pgt);
34775 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34776 index 040192b..7d3300f 100644
34777 --- a/arch/x86/platform/efi/efi_stub_32.S
34778 +++ b/arch/x86/platform/efi/efi_stub_32.S
34779 @@ -6,7 +6,9 @@
34780 */
34781
34782 #include <linux/linkage.h>
34783 +#include <linux/init.h>
34784 #include <asm/page_types.h>
34785 +#include <asm/segment.h>
34786
34787 /*
34788 * efi_call_phys(void *, ...) is a function with variable parameters.
34789 @@ -20,7 +22,7 @@
34790 * service functions will comply with gcc calling convention, too.
34791 */
34792
34793 -.text
34794 +__INIT
34795 ENTRY(efi_call_phys)
34796 /*
34797 * 0. The function can only be called in Linux kernel. So CS has been
34798 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34799 * The mapping of lower virtual memory has been created in prolog and
34800 * epilog.
34801 */
34802 - movl $1f, %edx
34803 - subl $__PAGE_OFFSET, %edx
34804 - jmp *%edx
34805 +#ifdef CONFIG_PAX_KERNEXEC
34806 + movl $(__KERNEXEC_EFI_DS), %edx
34807 + mov %edx, %ds
34808 + mov %edx, %es
34809 + mov %edx, %ss
34810 + addl $2f,(1f)
34811 + ljmp *(1f)
34812 +
34813 +__INITDATA
34814 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34815 +.previous
34816 +
34817 +2:
34818 + subl $2b,(1b)
34819 +#else
34820 + jmp 1f-__PAGE_OFFSET
34821 1:
34822 +#endif
34823
34824 /*
34825 * 2. Now on the top of stack is the return
34826 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34827 * parameter 2, ..., param n. To make things easy, we save the return
34828 * address of efi_call_phys in a global variable.
34829 */
34830 - popl %edx
34831 - movl %edx, saved_return_addr
34832 - /* get the function pointer into ECX*/
34833 - popl %ecx
34834 - movl %ecx, efi_rt_function_ptr
34835 - movl $2f, %edx
34836 - subl $__PAGE_OFFSET, %edx
34837 - pushl %edx
34838 + popl (saved_return_addr)
34839 + popl (efi_rt_function_ptr)
34840
34841 /*
34842 * 3. Clear PG bit in %CR0.
34843 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34844 /*
34845 * 5. Call the physical function.
34846 */
34847 - jmp *%ecx
34848 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
34849
34850 -2:
34851 /*
34852 * 6. After EFI runtime service returns, control will return to
34853 * following instruction. We'd better readjust stack pointer first.
34854 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34855 movl %cr0, %edx
34856 orl $0x80000000, %edx
34857 movl %edx, %cr0
34858 - jmp 1f
34859 -1:
34860 +
34861 /*
34862 * 8. Now restore the virtual mode from flat mode by
34863 * adding EIP with PAGE_OFFSET.
34864 */
34865 - movl $1f, %edx
34866 - jmp *%edx
34867 +#ifdef CONFIG_PAX_KERNEXEC
34868 + movl $(__KERNEL_DS), %edx
34869 + mov %edx, %ds
34870 + mov %edx, %es
34871 + mov %edx, %ss
34872 + ljmp $(__KERNEL_CS),$1f
34873 +#else
34874 + jmp 1f+__PAGE_OFFSET
34875 +#endif
34876 1:
34877
34878 /*
34879 * 9. Balance the stack. And because EAX contain the return value,
34880 * we'd better not clobber it.
34881 */
34882 - leal efi_rt_function_ptr, %edx
34883 - movl (%edx), %ecx
34884 - pushl %ecx
34885 + pushl (efi_rt_function_ptr)
34886
34887 /*
34888 - * 10. Push the saved return address onto the stack and return.
34889 + * 10. Return to the saved return address.
34890 */
34891 - leal saved_return_addr, %edx
34892 - movl (%edx), %ecx
34893 - pushl %ecx
34894 - ret
34895 + jmpl *(saved_return_addr)
34896 ENDPROC(efi_call_phys)
34897 .previous
34898
34899 -.data
34900 +__INITDATA
34901 saved_return_addr:
34902 .long 0
34903 efi_rt_function_ptr:
34904 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34905 index 5fcda72..cd4dc41 100644
34906 --- a/arch/x86/platform/efi/efi_stub_64.S
34907 +++ b/arch/x86/platform/efi/efi_stub_64.S
34908 @@ -11,6 +11,7 @@
34909 #include <asm/msr.h>
34910 #include <asm/processor-flags.h>
34911 #include <asm/page_types.h>
34912 +#include <asm/alternative-asm.h>
34913
34914 #define SAVE_XMM \
34915 mov %rsp, %rax; \
34916 @@ -88,6 +89,7 @@ ENTRY(efi_call)
34917 RESTORE_PGT
34918 addq $48, %rsp
34919 RESTORE_XMM
34920 + pax_force_retaddr 0, 1
34921 ret
34922 ENDPROC(efi_call)
34923
34924 @@ -245,8 +247,8 @@ efi_gdt64:
34925 .long 0 /* Filled out by user */
34926 .word 0
34927 .quad 0x0000000000000000 /* NULL descriptor */
34928 - .quad 0x00af9a000000ffff /* __KERNEL_CS */
34929 - .quad 0x00cf92000000ffff /* __KERNEL_DS */
34930 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
34931 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
34932 .quad 0x0080890000000000 /* TS descriptor */
34933 .quad 0x0000000000000000 /* TS continued */
34934 efi_gdt64_end:
34935 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34936 index 1bbedc4..eb795b5 100644
34937 --- a/arch/x86/platform/intel-mid/intel-mid.c
34938 +++ b/arch/x86/platform/intel-mid/intel-mid.c
34939 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34940 {
34941 };
34942
34943 -static void intel_mid_reboot(void)
34944 +static void __noreturn intel_mid_reboot(void)
34945 {
34946 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34947 + BUG();
34948 }
34949
34950 static unsigned long __init intel_mid_calibrate_tsc(void)
34951 diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34952 index 3c1c386..59a68ed 100644
34953 --- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34954 +++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34955 @@ -13,6 +13,6 @@
34956 /* For every CPU addition a new get_<cpuname>_ops interface needs
34957 * to be added.
34958 */
34959 -extern void *get_penwell_ops(void);
34960 -extern void *get_cloverview_ops(void);
34961 -extern void *get_tangier_ops(void);
34962 +extern const void *get_penwell_ops(void);
34963 +extern const void *get_cloverview_ops(void);
34964 +extern const void *get_tangier_ops(void);
34965 diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34966 index 23381d2..8ddc10e 100644
34967 --- a/arch/x86/platform/intel-mid/mfld.c
34968 +++ b/arch/x86/platform/intel-mid/mfld.c
34969 @@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34970 pm_power_off = mfld_power_off;
34971 }
34972
34973 -void *get_penwell_ops(void)
34974 +const void *get_penwell_ops(void)
34975 {
34976 return &penwell_ops;
34977 }
34978
34979 -void *get_cloverview_ops(void)
34980 +const void *get_cloverview_ops(void)
34981 {
34982 return &penwell_ops;
34983 }
34984 diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
34985 index aaca917..66eadbc 100644
34986 --- a/arch/x86/platform/intel-mid/mrfl.c
34987 +++ b/arch/x86/platform/intel-mid/mrfl.c
34988 @@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
34989 .arch_setup = tangier_arch_setup,
34990 };
34991
34992 -void *get_tangier_ops(void)
34993 +const void *get_tangier_ops(void)
34994 {
34995 return &tangier_ops;
34996 }
34997 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34998 index d6ee929..3637cb5 100644
34999 --- a/arch/x86/platform/olpc/olpc_dt.c
35000 +++ b/arch/x86/platform/olpc/olpc_dt.c
35001 @@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35002 return res;
35003 }
35004
35005 -static struct of_pdt_ops prom_olpc_ops __initdata = {
35006 +static struct of_pdt_ops prom_olpc_ops __initconst = {
35007 .nextprop = olpc_dt_nextprop,
35008 .getproplen = olpc_dt_getproplen,
35009 .getproperty = olpc_dt_getproperty,
35010 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35011 index 6ec7910..ecdbb11 100644
35012 --- a/arch/x86/power/cpu.c
35013 +++ b/arch/x86/power/cpu.c
35014 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
35015 static void fix_processor_context(void)
35016 {
35017 int cpu = smp_processor_id();
35018 - struct tss_struct *t = &per_cpu(init_tss, cpu);
35019 -#ifdef CONFIG_X86_64
35020 - struct desc_struct *desc = get_cpu_gdt_table(cpu);
35021 - tss_desc tss;
35022 -#endif
35023 + struct tss_struct *t = init_tss + cpu;
35024 +
35025 set_tss_desc(cpu, t); /*
35026 * This just modifies memory; should not be
35027 * necessary. But... This is necessary, because
35028 @@ -150,10 +147,6 @@ static void fix_processor_context(void)
35029 */
35030
35031 #ifdef CONFIG_X86_64
35032 - memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35033 - tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35034 - write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35035 -
35036 syscall_init(); /* This sets MSR_*STAR and related */
35037 #endif
35038 load_TR_desc(); /* This does ltr */
35039 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35040 index bad628a..a102610 100644
35041 --- a/arch/x86/realmode/init.c
35042 +++ b/arch/x86/realmode/init.c
35043 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35044 __va(real_mode_header->trampoline_header);
35045
35046 #ifdef CONFIG_X86_32
35047 - trampoline_header->start = __pa_symbol(startup_32_smp);
35048 + trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35049 +
35050 +#ifdef CONFIG_PAX_KERNEXEC
35051 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35052 +#endif
35053 +
35054 + trampoline_header->boot_cs = __BOOT_CS;
35055 trampoline_header->gdt_limit = __BOOT_DS + 7;
35056 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35057 #else
35058 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35059 *trampoline_cr4_features = read_cr4();
35060
35061 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35062 - trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35063 + trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35064 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35065 #endif
35066 }
35067 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35068 index 7c0d7be..d24dc88 100644
35069 --- a/arch/x86/realmode/rm/Makefile
35070 +++ b/arch/x86/realmode/rm/Makefile
35071 @@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35072
35073 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35074 -I$(srctree)/arch/x86/boot
35075 +ifdef CONSTIFY_PLUGIN
35076 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35077 +endif
35078 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35079 GCOV_PROFILE := n
35080 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35081 index a28221d..93c40f1 100644
35082 --- a/arch/x86/realmode/rm/header.S
35083 +++ b/arch/x86/realmode/rm/header.S
35084 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35085 #endif
35086 /* APM/BIOS reboot */
35087 .long pa_machine_real_restart_asm
35088 -#ifdef CONFIG_X86_64
35089 +#ifdef CONFIG_X86_32
35090 + .long __KERNEL_CS
35091 +#else
35092 .long __KERNEL32_CS
35093 #endif
35094 END(real_mode_header)
35095 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35096 index 48ddd76..c26749f 100644
35097 --- a/arch/x86/realmode/rm/trampoline_32.S
35098 +++ b/arch/x86/realmode/rm/trampoline_32.S
35099 @@ -24,6 +24,12 @@
35100 #include <asm/page_types.h>
35101 #include "realmode.h"
35102
35103 +#ifdef CONFIG_PAX_KERNEXEC
35104 +#define ta(X) (X)
35105 +#else
35106 +#define ta(X) (pa_ ## X)
35107 +#endif
35108 +
35109 .text
35110 .code16
35111
35112 @@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35113
35114 cli # We should be safe anyway
35115
35116 - movl tr_start, %eax # where we need to go
35117 -
35118 movl $0xA5A5A5A5, trampoline_status
35119 # write marker for master knows we're running
35120
35121 @@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35122 movw $1, %dx # protected mode (PE) bit
35123 lmsw %dx # into protected mode
35124
35125 - ljmpl $__BOOT_CS, $pa_startup_32
35126 + ljmpl *(trampoline_header)
35127
35128 .section ".text32","ax"
35129 .code32
35130 @@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35131 .balign 8
35132 GLOBAL(trampoline_header)
35133 tr_start: .space 4
35134 - tr_gdt_pad: .space 2
35135 + tr_boot_cs: .space 2
35136 tr_gdt: .space 6
35137 END(trampoline_header)
35138
35139 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35140 index dac7b20..72dbaca 100644
35141 --- a/arch/x86/realmode/rm/trampoline_64.S
35142 +++ b/arch/x86/realmode/rm/trampoline_64.S
35143 @@ -93,6 +93,7 @@ ENTRY(startup_32)
35144 movl %edx, %gs
35145
35146 movl pa_tr_cr4, %eax
35147 + andl $~X86_CR4_PCIDE, %eax
35148 movl %eax, %cr4 # Enable PAE mode
35149
35150 # Setup trampoline 4 level pagetables
35151 @@ -106,7 +107,7 @@ ENTRY(startup_32)
35152 wrmsr
35153
35154 # Enable paging and in turn activate Long Mode
35155 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35156 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
35157 movl %eax, %cr0
35158
35159 /*
35160 diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35161 index 9e7e147..25a4158 100644
35162 --- a/arch/x86/realmode/rm/wakeup_asm.S
35163 +++ b/arch/x86/realmode/rm/wakeup_asm.S
35164 @@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35165 lgdtl pmode_gdt
35166
35167 /* This really couldn't... */
35168 - movl pmode_entry, %eax
35169 movl pmode_cr0, %ecx
35170 movl %ecx, %cr0
35171 - ljmpl $__KERNEL_CS, $pa_startup_32
35172 - /* -> jmp *%eax in trampoline_32.S */
35173 +
35174 + ljmpl *pmode_entry
35175 #else
35176 jmp trampoline_start
35177 #endif
35178 diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35179 index 604a37e..e49702a 100644
35180 --- a/arch/x86/tools/Makefile
35181 +++ b/arch/x86/tools/Makefile
35182 @@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35183
35184 $(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
35185
35186 -HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35187 +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35188 hostprogs-y += relocs
35189 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35190 PHONY += relocs
35191 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35192 index a5efb21..97490e9 100644
35193 --- a/arch/x86/tools/relocs.c
35194 +++ b/arch/x86/tools/relocs.c
35195 @@ -1,5 +1,7 @@
35196 /* This is included from relocs_32/64.c */
35197
35198 +#include "../../../include/generated/autoconf.h"
35199 +
35200 #define ElfW(type) _ElfW(ELF_BITS, type)
35201 #define _ElfW(bits, type) __ElfW(bits, type)
35202 #define __ElfW(bits, type) Elf##bits##_##type
35203 @@ -11,6 +13,7 @@
35204 #define Elf_Sym ElfW(Sym)
35205
35206 static Elf_Ehdr ehdr;
35207 +static Elf_Phdr *phdr;
35208
35209 struct relocs {
35210 uint32_t *offset;
35211 @@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35212 }
35213 }
35214
35215 +static void read_phdrs(FILE *fp)
35216 +{
35217 + unsigned int i;
35218 +
35219 + phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35220 + if (!phdr) {
35221 + die("Unable to allocate %d program headers\n",
35222 + ehdr.e_phnum);
35223 + }
35224 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35225 + die("Seek to %d failed: %s\n",
35226 + ehdr.e_phoff, strerror(errno));
35227 + }
35228 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35229 + die("Cannot read ELF program headers: %s\n",
35230 + strerror(errno));
35231 + }
35232 + for(i = 0; i < ehdr.e_phnum; i++) {
35233 + phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35234 + phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35235 + phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35236 + phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35237 + phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35238 + phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35239 + phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35240 + phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35241 + }
35242 +
35243 +}
35244 +
35245 static void read_shdrs(FILE *fp)
35246 {
35247 - int i;
35248 + unsigned int i;
35249 Elf_Shdr shdr;
35250
35251 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35252 @@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35253
35254 static void read_strtabs(FILE *fp)
35255 {
35256 - int i;
35257 + unsigned int i;
35258 for (i = 0; i < ehdr.e_shnum; i++) {
35259 struct section *sec = &secs[i];
35260 if (sec->shdr.sh_type != SHT_STRTAB) {
35261 @@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35262
35263 static void read_symtabs(FILE *fp)
35264 {
35265 - int i,j;
35266 + unsigned int i,j;
35267 for (i = 0; i < ehdr.e_shnum; i++) {
35268 struct section *sec = &secs[i];
35269 if (sec->shdr.sh_type != SHT_SYMTAB) {
35270 @@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35271 }
35272
35273
35274 -static void read_relocs(FILE *fp)
35275 +static void read_relocs(FILE *fp, int use_real_mode)
35276 {
35277 - int i,j;
35278 + unsigned int i,j;
35279 + uint32_t base;
35280 +
35281 for (i = 0; i < ehdr.e_shnum; i++) {
35282 struct section *sec = &secs[i];
35283 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35284 @@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35285 die("Cannot read symbol table: %s\n",
35286 strerror(errno));
35287 }
35288 + base = 0;
35289 +
35290 +#ifdef CONFIG_X86_32
35291 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35292 + if (phdr[j].p_type != PT_LOAD )
35293 + continue;
35294 + 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)
35295 + continue;
35296 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35297 + break;
35298 + }
35299 +#endif
35300 +
35301 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35302 Elf_Rel *rel = &sec->reltab[j];
35303 - rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35304 + rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35305 rel->r_info = elf_xword_to_cpu(rel->r_info);
35306 #if (SHT_REL_TYPE == SHT_RELA)
35307 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35308 @@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35309
35310 static void print_absolute_symbols(void)
35311 {
35312 - int i;
35313 + unsigned int i;
35314 const char *format;
35315
35316 if (ELF_BITS == 64)
35317 @@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35318 for (i = 0; i < ehdr.e_shnum; i++) {
35319 struct section *sec = &secs[i];
35320 char *sym_strtab;
35321 - int j;
35322 + unsigned int j;
35323
35324 if (sec->shdr.sh_type != SHT_SYMTAB) {
35325 continue;
35326 @@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35327
35328 static void print_absolute_relocs(void)
35329 {
35330 - int i, printed = 0;
35331 + unsigned int i, printed = 0;
35332 const char *format;
35333
35334 if (ELF_BITS == 64)
35335 @@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35336 struct section *sec_applies, *sec_symtab;
35337 char *sym_strtab;
35338 Elf_Sym *sh_symtab;
35339 - int j;
35340 + unsigned int j;
35341 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35342 continue;
35343 }
35344 @@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35345 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35346 Elf_Sym *sym, const char *symname))
35347 {
35348 - int i;
35349 + unsigned int i;
35350 /* Walk through the relocations */
35351 for (i = 0; i < ehdr.e_shnum; i++) {
35352 char *sym_strtab;
35353 Elf_Sym *sh_symtab;
35354 struct section *sec_applies, *sec_symtab;
35355 - int j;
35356 + unsigned int j;
35357 struct section *sec = &secs[i];
35358
35359 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35360 @@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35361 {
35362 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35363 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35364 + char *sym_strtab = sec->link->link->strtab;
35365 +
35366 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35367 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35368 + return 0;
35369 +
35370 +#ifdef CONFIG_PAX_KERNEXEC
35371 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35372 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35373 + return 0;
35374 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35375 + return 0;
35376 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35377 + return 0;
35378 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35379 + return 0;
35380 +#endif
35381
35382 switch (r_type) {
35383 case R_386_NONE:
35384 @@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35385
35386 static void emit_relocs(int as_text, int use_real_mode)
35387 {
35388 - int i;
35389 + unsigned int i;
35390 int (*write_reloc)(uint32_t, FILE *) = write32;
35391 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35392 const char *symname);
35393 @@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35394 {
35395 regex_init(use_real_mode);
35396 read_ehdr(fp);
35397 + read_phdrs(fp);
35398 read_shdrs(fp);
35399 read_strtabs(fp);
35400 read_symtabs(fp);
35401 - read_relocs(fp);
35402 + read_relocs(fp, use_real_mode);
35403 if (ELF_BITS == 64)
35404 percpu_init();
35405 if (show_absolute_syms) {
35406 diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35407 index f40281e..92728c9 100644
35408 --- a/arch/x86/um/mem_32.c
35409 +++ b/arch/x86/um/mem_32.c
35410 @@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35411 gate_vma.vm_start = FIXADDR_USER_START;
35412 gate_vma.vm_end = FIXADDR_USER_END;
35413 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35414 - gate_vma.vm_page_prot = __P101;
35415 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35416
35417 return 0;
35418 }
35419 diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35420 index 80ffa5b..a33bd15 100644
35421 --- a/arch/x86/um/tls_32.c
35422 +++ b/arch/x86/um/tls_32.c
35423 @@ -260,7 +260,7 @@ out:
35424 if (unlikely(task == current &&
35425 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35426 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35427 - "without flushed TLS.", current->pid);
35428 + "without flushed TLS.", task_pid_nr(current));
35429 }
35430
35431 return 0;
35432 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35433 index 5a4affe..9e2d522 100644
35434 --- a/arch/x86/vdso/Makefile
35435 +++ b/arch/x86/vdso/Makefile
35436 @@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35437 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35438 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35439
35440 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35441 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35442 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35443 GCOV_PROFILE := n
35444
35445 diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35446 index 0224987..c7d65a5 100644
35447 --- a/arch/x86/vdso/vdso2c.h
35448 +++ b/arch/x86/vdso/vdso2c.h
35449 @@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35450 unsigned long load_size = -1; /* Work around bogus warning */
35451 unsigned long mapping_size;
35452 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35453 - int i;
35454 + unsigned int i;
35455 unsigned long j;
35456 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35457 *alt_sec = NULL;
35458 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35459 index e904c27..b9eaa03 100644
35460 --- a/arch/x86/vdso/vdso32-setup.c
35461 +++ b/arch/x86/vdso/vdso32-setup.c
35462 @@ -14,6 +14,7 @@
35463 #include <asm/cpufeature.h>
35464 #include <asm/processor.h>
35465 #include <asm/vdso.h>
35466 +#include <asm/mman.h>
35467
35468 #ifdef CONFIG_COMPAT_VDSO
35469 #define VDSO_DEFAULT 0
35470 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35471 index 208c220..54f1447 100644
35472 --- a/arch/x86/vdso/vma.c
35473 +++ b/arch/x86/vdso/vma.c
35474 @@ -16,10 +16,9 @@
35475 #include <asm/vdso.h>
35476 #include <asm/page.h>
35477 #include <asm/hpet.h>
35478 +#include <asm/mman.h>
35479
35480 #if defined(CONFIG_X86_64)
35481 -unsigned int __read_mostly vdso64_enabled = 1;
35482 -
35483 extern unsigned short vdso_sync_cpuid;
35484 #endif
35485
35486 @@ -114,6 +113,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35487 .pages = no_pages,
35488 };
35489
35490 +#ifdef CONFIG_PAX_RANDMMAP
35491 + if (mm->pax_flags & MF_PAX_RANDMMAP)
35492 + calculate_addr = false;
35493 +#endif
35494 +
35495 if (calculate_addr) {
35496 addr = vdso_addr(current->mm->start_stack,
35497 image->size - image->sym_vvar_start);
35498 @@ -124,14 +128,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35499 down_write(&mm->mmap_sem);
35500
35501 addr = get_unmapped_area(NULL, addr,
35502 - image->size - image->sym_vvar_start, 0, 0);
35503 + image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35504 if (IS_ERR_VALUE(addr)) {
35505 ret = addr;
35506 goto up_fail;
35507 }
35508
35509 text_start = addr - image->sym_vvar_start;
35510 - current->mm->context.vdso = (void __user *)text_start;
35511 + mm->context.vdso = text_start;
35512
35513 /*
35514 * MAYWRITE to allow gdb to COW and set breakpoints
35515 @@ -176,15 +180,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35516 hpet_address >> PAGE_SHIFT,
35517 PAGE_SIZE,
35518 pgprot_noncached(PAGE_READONLY));
35519 -
35520 - if (ret)
35521 - goto up_fail;
35522 }
35523 #endif
35524
35525 up_fail:
35526 if (ret)
35527 - current->mm->context.vdso = NULL;
35528 + current->mm->context.vdso = 0;
35529
35530 up_write(&mm->mmap_sem);
35531 return ret;
35532 @@ -204,8 +205,8 @@ static int load_vdso32(void)
35533
35534 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35535 current_thread_info()->sysenter_return =
35536 - current->mm->context.vdso +
35537 - selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35538 + (void __force_user *)(current->mm->context.vdso +
35539 + selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35540
35541 return 0;
35542 }
35543 @@ -214,9 +215,6 @@ static int load_vdso32(void)
35544 #ifdef CONFIG_X86_64
35545 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35546 {
35547 - if (!vdso64_enabled)
35548 - return 0;
35549 -
35550 return map_vdso(&vdso_image_64, true);
35551 }
35552
35553 @@ -225,12 +223,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35554 int uses_interp)
35555 {
35556 #ifdef CONFIG_X86_X32_ABI
35557 - if (test_thread_flag(TIF_X32)) {
35558 - if (!vdso64_enabled)
35559 - return 0;
35560 -
35561 + if (test_thread_flag(TIF_X32))
35562 return map_vdso(&vdso_image_x32, true);
35563 - }
35564 #endif
35565
35566 return load_vdso32();
35567 @@ -242,12 +236,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35568 return load_vdso32();
35569 }
35570 #endif
35571 -
35572 -#ifdef CONFIG_X86_64
35573 -static __init int vdso_setup(char *s)
35574 -{
35575 - vdso64_enabled = simple_strtoul(s, NULL, 0);
35576 - return 0;
35577 -}
35578 -__setup("vdso=", vdso_setup);
35579 -#endif
35580 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35581 index e88fda8..76ce7ce 100644
35582 --- a/arch/x86/xen/Kconfig
35583 +++ b/arch/x86/xen/Kconfig
35584 @@ -9,6 +9,7 @@ config XEN
35585 select XEN_HAVE_PVMMU
35586 depends on X86_64 || (X86_32 && X86_PAE)
35587 depends on X86_TSC
35588 + depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35589 help
35590 This is the Linux Xen port. Enabling this will allow the
35591 kernel to boot in a paravirtualized environment under the
35592 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35593 index fac5e4f..e421c18 100644
35594 --- a/arch/x86/xen/enlighten.c
35595 +++ b/arch/x86/xen/enlighten.c
35596 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35597
35598 struct shared_info xen_dummy_shared_info;
35599
35600 -void *xen_initial_gdt;
35601 -
35602 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35603 __read_mostly int xen_have_vector_callback;
35604 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35605 @@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35606 {
35607 unsigned long va = dtr->address;
35608 unsigned int size = dtr->size + 1;
35609 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35610 - unsigned long frames[pages];
35611 + unsigned long frames[65536 / PAGE_SIZE];
35612 int f;
35613
35614 /*
35615 @@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35616 {
35617 unsigned long va = dtr->address;
35618 unsigned int size = dtr->size + 1;
35619 - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35620 - unsigned long frames[pages];
35621 + unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35622 int f;
35623
35624 /*
35625 @@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35626 * 8-byte entries, or 16 4k pages..
35627 */
35628
35629 - BUG_ON(size > 65536);
35630 + BUG_ON(size > GDT_SIZE);
35631 BUG_ON(va & ~PAGE_MASK);
35632
35633 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35634 @@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35635 return 0;
35636 }
35637
35638 -static void set_xen_basic_apic_ops(void)
35639 +static void __init set_xen_basic_apic_ops(void)
35640 {
35641 apic->read = xen_apic_read;
35642 apic->write = xen_apic_write;
35643 @@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35644 #endif
35645 };
35646
35647 -static void xen_reboot(int reason)
35648 +static __noreturn void xen_reboot(int reason)
35649 {
35650 struct sched_shutdown r = { .reason = reason };
35651
35652 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35653 - BUG();
35654 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35655 + BUG();
35656 }
35657
35658 -static void xen_restart(char *msg)
35659 +static __noreturn void xen_restart(char *msg)
35660 {
35661 xen_reboot(SHUTDOWN_reboot);
35662 }
35663
35664 -static void xen_emergency_restart(void)
35665 +static __noreturn void xen_emergency_restart(void)
35666 {
35667 xen_reboot(SHUTDOWN_reboot);
35668 }
35669
35670 -static void xen_machine_halt(void)
35671 +static __noreturn void xen_machine_halt(void)
35672 {
35673 xen_reboot(SHUTDOWN_poweroff);
35674 }
35675
35676 -static void xen_machine_power_off(void)
35677 +static __noreturn void xen_machine_power_off(void)
35678 {
35679 if (pm_power_off)
35680 pm_power_off();
35681 @@ -1456,8 +1452,9 @@ static void __ref xen_setup_gdt(int cpu)
35682 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35683 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35684
35685 - setup_stack_canary_segment(0);
35686 - switch_to_new_gdt(0);
35687 + setup_stack_canary_segment(cpu);
35688 + load_percpu_segment(cpu);
35689 + switch_to_new_gdt(cpu);
35690
35691 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35692 pv_cpu_ops.load_gdt = xen_load_gdt;
35693 @@ -1573,7 +1570,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35694 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35695
35696 /* Work out if we support NX */
35697 - x86_configure_nx();
35698 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35699 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35700 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35701 + unsigned l, h;
35702 +
35703 + __supported_pte_mask |= _PAGE_NX;
35704 + rdmsr(MSR_EFER, l, h);
35705 + l |= EFER_NX;
35706 + wrmsr(MSR_EFER, l, h);
35707 + }
35708 +#endif
35709
35710 /* Get mfn list */
35711 xen_build_dynamic_phys_to_machine();
35712 @@ -1601,13 +1608,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35713
35714 machine_ops = xen_machine_ops;
35715
35716 - /*
35717 - * The only reliable way to retain the initial address of the
35718 - * percpu gdt_page is to remember it here, so we can go and
35719 - * mark it RW later, when the initial percpu area is freed.
35720 - */
35721 - xen_initial_gdt = &per_cpu(gdt_page, 0);
35722 -
35723 xen_smp_init();
35724
35725 #ifdef CONFIG_ACPI_NUMA
35726 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35727 index a8a1a3d..8216142 100644
35728 --- a/arch/x86/xen/mmu.c
35729 +++ b/arch/x86/xen/mmu.c
35730 @@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35731 return val;
35732 }
35733
35734 -static pteval_t pte_pfn_to_mfn(pteval_t val)
35735 +static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35736 {
35737 if (val & _PAGE_PRESENT) {
35738 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35739 @@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35740 * L3_k[511] -> level2_fixmap_pgt */
35741 convert_pfn_mfn(level3_kernel_pgt);
35742
35743 + convert_pfn_mfn(level3_vmalloc_start_pgt);
35744 + convert_pfn_mfn(level3_vmalloc_end_pgt);
35745 + convert_pfn_mfn(level3_vmemmap_pgt);
35746 /* L3_k[511][506] -> level1_fixmap_pgt */
35747 + /* L3_k[511][507] -> level1_vsyscall_pgt */
35748 convert_pfn_mfn(level2_fixmap_pgt);
35749 }
35750 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35751 @@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35752 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35753 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35754 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35755 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35756 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35757 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35758 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35759 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35760 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35761 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35762 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35763 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35764 + set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35765
35766 /* Pin down new L4 */
35767 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35768 @@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
35769 pv_mmu_ops.set_pud = xen_set_pud;
35770 #if PAGETABLE_LEVELS == 4
35771 pv_mmu_ops.set_pgd = xen_set_pgd;
35772 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35773 #endif
35774
35775 /* This will work as long as patching hasn't happened yet
35776 @@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35777 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35778 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35779 .set_pgd = xen_set_pgd_hyper,
35780 + .set_pgd_batched = xen_set_pgd_hyper,
35781
35782 .alloc_pud = xen_alloc_pmd_init,
35783 .release_pud = xen_release_pmd_init,
35784 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35785 index 4c071ae..00e7049 100644
35786 --- a/arch/x86/xen/smp.c
35787 +++ b/arch/x86/xen/smp.c
35788 @@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35789
35790 if (xen_pv_domain()) {
35791 if (!xen_feature(XENFEAT_writable_page_tables))
35792 - /* We've switched to the "real" per-cpu gdt, so make
35793 - * sure the old memory can be recycled. */
35794 - make_lowmem_page_readwrite(xen_initial_gdt);
35795 -
35796 #ifdef CONFIG_X86_32
35797 /*
35798 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35799 * expects __USER_DS
35800 */
35801 - loadsegment(ds, __USER_DS);
35802 - loadsegment(es, __USER_DS);
35803 + loadsegment(ds, __KERNEL_DS);
35804 + loadsegment(es, __KERNEL_DS);
35805 #endif
35806
35807 xen_filter_cpu_maps();
35808 @@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35809 #ifdef CONFIG_X86_32
35810 /* Note: PVH is not yet supported on x86_32. */
35811 ctxt->user_regs.fs = __KERNEL_PERCPU;
35812 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35813 + savesegment(gs, ctxt->user_regs.gs);
35814 #endif
35815 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35816
35817 @@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35818 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35819 ctxt->flags = VGCF_IN_KERNEL;
35820 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35821 - ctxt->user_regs.ds = __USER_DS;
35822 - ctxt->user_regs.es = __USER_DS;
35823 + ctxt->user_regs.ds = __KERNEL_DS;
35824 + ctxt->user_regs.es = __KERNEL_DS;
35825 ctxt->user_regs.ss = __KERNEL_DS;
35826
35827 xen_copy_trap_info(ctxt->trap_ctxt);
35828 @@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35829 int rc;
35830
35831 per_cpu(current_task, cpu) = idle;
35832 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
35833 #ifdef CONFIG_X86_32
35834 irq_ctx_init(cpu);
35835 #else
35836 clear_tsk_thread_flag(idle, TIF_FORK);
35837 #endif
35838 - per_cpu(kernel_stack, cpu) =
35839 - (unsigned long)task_stack_page(idle) -
35840 - KERNEL_STACK_OFFSET + THREAD_SIZE;
35841 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35842
35843 xen_setup_runstate_info(cpu);
35844 xen_setup_timer(cpu);
35845 @@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35846
35847 void __init xen_smp_init(void)
35848 {
35849 - smp_ops = xen_smp_ops;
35850 + memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35851 xen_fill_possible_map();
35852 }
35853
35854 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35855 index fd92a64..1f72641 100644
35856 --- a/arch/x86/xen/xen-asm_32.S
35857 +++ b/arch/x86/xen/xen-asm_32.S
35858 @@ -99,7 +99,7 @@ ENTRY(xen_iret)
35859 pushw %fs
35860 movl $(__KERNEL_PERCPU), %eax
35861 movl %eax, %fs
35862 - movl %fs:xen_vcpu, %eax
35863 + mov PER_CPU_VAR(xen_vcpu), %eax
35864 POP_FS
35865 #else
35866 movl %ss:xen_vcpu, %eax
35867 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35868 index 674b2225..f1f5dc1 100644
35869 --- a/arch/x86/xen/xen-head.S
35870 +++ b/arch/x86/xen/xen-head.S
35871 @@ -39,6 +39,17 @@ ENTRY(startup_xen)
35872 #ifdef CONFIG_X86_32
35873 mov %esi,xen_start_info
35874 mov $init_thread_union+THREAD_SIZE,%esp
35875 +#ifdef CONFIG_SMP
35876 + movl $cpu_gdt_table,%edi
35877 + movl $__per_cpu_load,%eax
35878 + movw %ax,__KERNEL_PERCPU + 2(%edi)
35879 + rorl $16,%eax
35880 + movb %al,__KERNEL_PERCPU + 4(%edi)
35881 + movb %ah,__KERNEL_PERCPU + 7(%edi)
35882 + movl $__per_cpu_end - 1,%eax
35883 + subl $__per_cpu_start,%eax
35884 + movw %ax,__KERNEL_PERCPU + 0(%edi)
35885 +#endif
35886 #else
35887 mov %rsi,xen_start_info
35888 mov $init_thread_union+THREAD_SIZE,%rsp
35889 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35890 index 28c7e0b..2acfec7 100644
35891 --- a/arch/x86/xen/xen-ops.h
35892 +++ b/arch/x86/xen/xen-ops.h
35893 @@ -10,8 +10,6 @@
35894 extern const char xen_hypervisor_callback[];
35895 extern const char xen_failsafe_callback[];
35896
35897 -extern void *xen_initial_gdt;
35898 -
35899 struct trap_info;
35900 void xen_copy_trap_info(struct trap_info *traps);
35901
35902 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35903 index 525bd3d..ef888b1 100644
35904 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
35905 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35906 @@ -119,9 +119,9 @@
35907 ----------------------------------------------------------------------*/
35908
35909 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35910 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35911 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35912 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35913 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35914
35915 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35916 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35917 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35918 index 2f33760..835e50a 100644
35919 --- a/arch/xtensa/variants/fsf/include/variant/core.h
35920 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
35921 @@ -11,6 +11,7 @@
35922 #ifndef _XTENSA_CORE_H
35923 #define _XTENSA_CORE_H
35924
35925 +#include <linux/const.h>
35926
35927 /****************************************************************************
35928 Parameters Useful for Any Code, USER or PRIVILEGED
35929 @@ -112,9 +113,9 @@
35930 ----------------------------------------------------------------------*/
35931
35932 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35933 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35934 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35935 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35936 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35937
35938 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35939 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35940 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35941 index af00795..2bb8105 100644
35942 --- a/arch/xtensa/variants/s6000/include/variant/core.h
35943 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
35944 @@ -11,6 +11,7 @@
35945 #ifndef _XTENSA_CORE_CONFIGURATION_H
35946 #define _XTENSA_CORE_CONFIGURATION_H
35947
35948 +#include <linux/const.h>
35949
35950 /****************************************************************************
35951 Parameters Useful for Any Code, USER or PRIVILEGED
35952 @@ -118,9 +119,9 @@
35953 ----------------------------------------------------------------------*/
35954
35955 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35956 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35957 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35958 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35959 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35960
35961 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35962 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35963 diff --git a/block/bio.c b/block/bio.c
35964 index 3e6e198..5c65199 100644
35965 --- a/block/bio.c
35966 +++ b/block/bio.c
35967 @@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
35968 /*
35969 * Overflow, abort
35970 */
35971 - if (end < start)
35972 + if (end < start || end - start > INT_MAX - nr_pages)
35973 return ERR_PTR(-EINVAL);
35974
35975 nr_pages += end - start;
35976 @@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
35977 /*
35978 * Overflow, abort
35979 */
35980 - if (end < start)
35981 + if (end < start || end - start > INT_MAX - nr_pages)
35982 return ERR_PTR(-EINVAL);
35983
35984 nr_pages += end - start;
35985 @@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
35986 const int read = bio_data_dir(bio) == READ;
35987 struct bio_map_data *bmd = bio->bi_private;
35988 int i;
35989 - char *p = bmd->sgvecs[0].iov_base;
35990 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
35991
35992 bio_for_each_segment_all(bvec, bio, i) {
35993 char *addr = page_address(bvec->bv_page);
35994 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35995 index 0736729..2ec3b48 100644
35996 --- a/block/blk-iopoll.c
35997 +++ b/block/blk-iopoll.c
35998 @@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
35999 }
36000 EXPORT_SYMBOL(blk_iopoll_complete);
36001
36002 -static void blk_iopoll_softirq(struct softirq_action *h)
36003 +static __latent_entropy void blk_iopoll_softirq(void)
36004 {
36005 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36006 int rearm = 0, budget = blk_iopoll_budget;
36007 diff --git a/block/blk-map.c b/block/blk-map.c
36008 index f890d43..97b0482 100644
36009 --- a/block/blk-map.c
36010 +++ b/block/blk-map.c
36011 @@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36012 if (!len || !kbuf)
36013 return -EINVAL;
36014
36015 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36016 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36017 if (do_copy)
36018 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36019 else
36020 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36021 index 53b1737..08177d2e 100644
36022 --- a/block/blk-softirq.c
36023 +++ b/block/blk-softirq.c
36024 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36025 * Softirq action handler - move entries to local list and loop over them
36026 * while passing them to the queue registered handler.
36027 */
36028 -static void blk_done_softirq(struct softirq_action *h)
36029 +static __latent_entropy void blk_done_softirq(void)
36030 {
36031 struct list_head *cpu_list, local_list;
36032
36033 diff --git a/block/bsg.c b/block/bsg.c
36034 index 276e869..6fe4c61 100644
36035 --- a/block/bsg.c
36036 +++ b/block/bsg.c
36037 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36038 struct sg_io_v4 *hdr, struct bsg_device *bd,
36039 fmode_t has_write_perm)
36040 {
36041 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36042 + unsigned char *cmdptr;
36043 +
36044 if (hdr->request_len > BLK_MAX_CDB) {
36045 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36046 if (!rq->cmd)
36047 return -ENOMEM;
36048 - }
36049 + cmdptr = rq->cmd;
36050 + } else
36051 + cmdptr = tmpcmd;
36052
36053 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36054 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36055 hdr->request_len))
36056 return -EFAULT;
36057
36058 + if (cmdptr != rq->cmd)
36059 + memcpy(rq->cmd, cmdptr, hdr->request_len);
36060 +
36061 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36062 if (blk_verify_command(rq->cmd, has_write_perm))
36063 return -EPERM;
36064 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36065 index f678c73..f35aa18 100644
36066 --- a/block/compat_ioctl.c
36067 +++ b/block/compat_ioctl.c
36068 @@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36069 cgc = compat_alloc_user_space(sizeof(*cgc));
36070 cgc32 = compat_ptr(arg);
36071
36072 - if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36073 + if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36074 get_user(data, &cgc32->buffer) ||
36075 put_user(compat_ptr(data), &cgc->buffer) ||
36076 copy_in_user(&cgc->buflen, &cgc32->buflen,
36077 @@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36078 err |= __get_user(f->spec1, &uf->spec1);
36079 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36080 err |= __get_user(name, &uf->name);
36081 - f->name = compat_ptr(name);
36082 + f->name = (void __force_kernel *)compat_ptr(name);
36083 if (err) {
36084 err = -EFAULT;
36085 goto out;
36086 diff --git a/block/genhd.c b/block/genhd.c
36087 index 0a536dc..b8f7aca 100644
36088 --- a/block/genhd.c
36089 +++ b/block/genhd.c
36090 @@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36091
36092 /*
36093 * Register device numbers dev..(dev+range-1)
36094 - * range must be nonzero
36095 + * Noop if @range is zero.
36096 * The hash chain is sorted on range, so that subranges can override.
36097 */
36098 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36099 struct kobject *(*probe)(dev_t, int *, void *),
36100 int (*lock)(dev_t, void *), void *data)
36101 {
36102 - kobj_map(bdev_map, devt, range, module, probe, lock, data);
36103 + if (range)
36104 + kobj_map(bdev_map, devt, range, module, probe, lock, data);
36105 }
36106
36107 EXPORT_SYMBOL(blk_register_region);
36108
36109 +/* undo blk_register_region(), noop if @range is zero */
36110 void blk_unregister_region(dev_t devt, unsigned long range)
36111 {
36112 - kobj_unmap(bdev_map, devt, range);
36113 + if (range)
36114 + kobj_unmap(bdev_map, devt, range);
36115 }
36116
36117 EXPORT_SYMBOL(blk_unregister_region);
36118 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36119 index 56d08fd..2e07090 100644
36120 --- a/block/partitions/efi.c
36121 +++ b/block/partitions/efi.c
36122 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36123 if (!gpt)
36124 return NULL;
36125
36126 + if (!le32_to_cpu(gpt->num_partition_entries))
36127 + return NULL;
36128 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36129 + if (!pte)
36130 + return NULL;
36131 +
36132 count = le32_to_cpu(gpt->num_partition_entries) *
36133 le32_to_cpu(gpt->sizeof_partition_entry);
36134 - if (!count)
36135 - return NULL;
36136 - pte = kmalloc(count, GFP_KERNEL);
36137 - if (!pte)
36138 - return NULL;
36139 -
36140 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36141 (u8 *) pte, count) < count) {
36142 kfree(pte);
36143 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36144 index b0c2a61..10bb6ec 100644
36145 --- a/block/scsi_ioctl.c
36146 +++ b/block/scsi_ioctl.c
36147 @@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36148 return put_user(0, p);
36149 }
36150
36151 -static int sg_get_timeout(struct request_queue *q)
36152 +static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36153 {
36154 return jiffies_to_clock_t(q->sg_timeout);
36155 }
36156 @@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36157 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36158 struct sg_io_hdr *hdr, fmode_t mode)
36159 {
36160 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36161 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36162 + unsigned char *cmdptr;
36163 +
36164 + if (rq->cmd != rq->__cmd)
36165 + cmdptr = rq->cmd;
36166 + else
36167 + cmdptr = tmpcmd;
36168 +
36169 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36170 return -EFAULT;
36171 +
36172 + if (cmdptr != rq->cmd)
36173 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36174 +
36175 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36176 return -EPERM;
36177
36178 @@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36179 int err;
36180 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36181 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36182 + unsigned char tmpcmd[sizeof(rq->__cmd)];
36183 + unsigned char *cmdptr;
36184
36185 if (!sic)
36186 return -EINVAL;
36187 @@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36188 */
36189 err = -EFAULT;
36190 rq->cmd_len = cmdlen;
36191 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
36192 +
36193 + if (rq->cmd != rq->__cmd)
36194 + cmdptr = rq->cmd;
36195 + else
36196 + cmdptr = tmpcmd;
36197 +
36198 + if (copy_from_user(cmdptr, sic->data, cmdlen))
36199 goto error;
36200
36201 + if (rq->cmd != cmdptr)
36202 + memcpy(rq->cmd, cmdptr, cmdlen);
36203 +
36204 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36205 goto error;
36206
36207 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36208 index e592c90..c566114 100644
36209 --- a/crypto/cryptd.c
36210 +++ b/crypto/cryptd.c
36211 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36212
36213 struct cryptd_blkcipher_request_ctx {
36214 crypto_completion_t complete;
36215 -};
36216 +} __no_const;
36217
36218 struct cryptd_hash_ctx {
36219 struct crypto_shash *child;
36220 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36221
36222 struct cryptd_aead_request_ctx {
36223 crypto_completion_t complete;
36224 -};
36225 +} __no_const;
36226
36227 static void cryptd_queue_worker(struct work_struct *work);
36228
36229 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36230 index 309d345..1632720 100644
36231 --- a/crypto/pcrypt.c
36232 +++ b/crypto/pcrypt.c
36233 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36234 int ret;
36235
36236 pinst->kobj.kset = pcrypt_kset;
36237 - ret = kobject_add(&pinst->kobj, NULL, name);
36238 + ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36239 if (!ret)
36240 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36241
36242 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36243 index 6921c7f..78e1af7 100644
36244 --- a/drivers/acpi/acpica/hwxfsleep.c
36245 +++ b/drivers/acpi/acpica/hwxfsleep.c
36246 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36247 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36248
36249 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36250 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36251 - acpi_hw_extended_sleep},
36252 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36253 - acpi_hw_extended_wake_prep},
36254 - {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36255 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36256 + .extended_function = acpi_hw_extended_sleep},
36257 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36258 + .extended_function = acpi_hw_extended_wake_prep},
36259 + {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36260 + .extended_function = acpi_hw_extended_wake}
36261 };
36262
36263 /*
36264 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36265 index 16129c7..8b675cd 100644
36266 --- a/drivers/acpi/apei/apei-internal.h
36267 +++ b/drivers/acpi/apei/apei-internal.h
36268 @@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36269 struct apei_exec_ins_type {
36270 u32 flags;
36271 apei_exec_ins_func_t run;
36272 -};
36273 +} __do_const;
36274
36275 struct apei_exec_context {
36276 u32 ip;
36277 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36278 index fc5f780..e5ac91a 100644
36279 --- a/drivers/acpi/apei/ghes.c
36280 +++ b/drivers/acpi/apei/ghes.c
36281 @@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36282 const struct acpi_hest_generic *generic,
36283 const struct acpi_hest_generic_status *estatus)
36284 {
36285 - static atomic_t seqno;
36286 + static atomic_unchecked_t seqno;
36287 unsigned int curr_seqno;
36288 char pfx_seq[64];
36289
36290 @@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36291 else
36292 pfx = KERN_ERR;
36293 }
36294 - curr_seqno = atomic_inc_return(&seqno);
36295 + curr_seqno = atomic_inc_return_unchecked(&seqno);
36296 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36297 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36298 pfx_seq, generic->header.source_id);
36299 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36300 index a83e3c6..c3d617f 100644
36301 --- a/drivers/acpi/bgrt.c
36302 +++ b/drivers/acpi/bgrt.c
36303 @@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36304 if (!bgrt_image)
36305 return -ENODEV;
36306
36307 - bin_attr_image.private = bgrt_image;
36308 - bin_attr_image.size = bgrt_image_size;
36309 + pax_open_kernel();
36310 + *(void **)&bin_attr_image.private = bgrt_image;
36311 + *(size_t *)&bin_attr_image.size = bgrt_image_size;
36312 + pax_close_kernel();
36313
36314 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36315 if (!bgrt_kobj)
36316 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36317 index 7556e7c..89a96bd 100644
36318 --- a/drivers/acpi/blacklist.c
36319 +++ b/drivers/acpi/blacklist.c
36320 @@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36321 u32 is_critical_error;
36322 };
36323
36324 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36325 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36326
36327 /*
36328 * POLICY: If *anything* doesn't work, put it on the blacklist.
36329 @@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36330 return 0;
36331 }
36332
36333 -static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36334 +static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36335 {
36336 .callback = dmi_disable_osi_vista,
36337 .ident = "Fujitsu Siemens",
36338 diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36339 index c68e724..e863008 100644
36340 --- a/drivers/acpi/custom_method.c
36341 +++ b/drivers/acpi/custom_method.c
36342 @@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36343 struct acpi_table_header table;
36344 acpi_status status;
36345
36346 +#ifdef CONFIG_GRKERNSEC_KMEM
36347 + return -EPERM;
36348 +#endif
36349 +
36350 if (!(*ppos)) {
36351 /* parse the table header to get the table length */
36352 if (count <= sizeof(struct acpi_table_header))
36353 diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36354 index 93b7142..5676c75 100644
36355 --- a/drivers/acpi/device_pm.c
36356 +++ b/drivers/acpi/device_pm.c
36357 @@ -1021,6 +1021,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36358
36359 #endif /* CONFIG_PM_SLEEP */
36360
36361 +static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36362 +
36363 static struct dev_pm_domain acpi_general_pm_domain = {
36364 .ops = {
36365 #ifdef CONFIG_PM_RUNTIME
36366 @@ -1039,6 +1041,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36367 .restore_early = acpi_subsys_resume_early,
36368 #endif
36369 },
36370 + .detach = acpi_dev_pm_detach
36371 };
36372
36373 /**
36374 @@ -1108,7 +1111,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36375 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36376 }
36377
36378 - dev->pm_domain->detach = acpi_dev_pm_detach;
36379 return 0;
36380 }
36381 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36382 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36383 index 17f9ec5..d9a455e 100644
36384 --- a/drivers/acpi/processor_idle.c
36385 +++ b/drivers/acpi/processor_idle.c
36386 @@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36387 {
36388 int i, count = CPUIDLE_DRIVER_STATE_START;
36389 struct acpi_processor_cx *cx;
36390 - struct cpuidle_state *state;
36391 + cpuidle_state_no_const *state;
36392 struct cpuidle_driver *drv = &acpi_idle_driver;
36393
36394 if (!pr->flags.power_setup_done)
36395 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36396 index 13e577c..cef11ee 100644
36397 --- a/drivers/acpi/sysfs.c
36398 +++ b/drivers/acpi/sysfs.c
36399 @@ -423,11 +423,11 @@ static u32 num_counters;
36400 static struct attribute **all_attrs;
36401 static u32 acpi_gpe_count;
36402
36403 -static struct attribute_group interrupt_stats_attr_group = {
36404 +static attribute_group_no_const interrupt_stats_attr_group = {
36405 .name = "interrupts",
36406 };
36407
36408 -static struct kobj_attribute *counter_attrs;
36409 +static kobj_attribute_no_const *counter_attrs;
36410
36411 static void delete_gpe_attr_array(void)
36412 {
36413 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36414 index 97683e4..655f6ba 100644
36415 --- a/drivers/ata/libahci.c
36416 +++ b/drivers/ata/libahci.c
36417 @@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36418 }
36419 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36420
36421 -static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36422 +static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36423 struct ata_taskfile *tf, int is_cmd, u16 flags,
36424 unsigned long timeout_msec)
36425 {
36426 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36427 index c5ba15a..75ec7a8 100644
36428 --- a/drivers/ata/libata-core.c
36429 +++ b/drivers/ata/libata-core.c
36430 @@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36431 static void ata_dev_xfermask(struct ata_device *dev);
36432 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36433
36434 -atomic_t ata_print_id = ATOMIC_INIT(0);
36435 +atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36436
36437 struct ata_force_param {
36438 const char *name;
36439 @@ -4797,7 +4797,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36440 struct ata_port *ap;
36441 unsigned int tag;
36442
36443 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36444 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36445 ap = qc->ap;
36446
36447 qc->flags = 0;
36448 @@ -4813,7 +4813,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36449 struct ata_port *ap;
36450 struct ata_link *link;
36451
36452 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36453 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36454 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36455 ap = qc->ap;
36456 link = qc->dev->link;
36457 @@ -5917,6 +5917,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36458 return;
36459
36460 spin_lock(&lock);
36461 + pax_open_kernel();
36462
36463 for (cur = ops->inherits; cur; cur = cur->inherits) {
36464 void **inherit = (void **)cur;
36465 @@ -5930,8 +5931,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36466 if (IS_ERR(*pp))
36467 *pp = NULL;
36468
36469 - ops->inherits = NULL;
36470 + *(struct ata_port_operations **)&ops->inherits = NULL;
36471
36472 + pax_close_kernel();
36473 spin_unlock(&lock);
36474 }
36475
36476 @@ -6127,7 +6129,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36477
36478 /* give ports names and add SCSI hosts */
36479 for (i = 0; i < host->n_ports; i++) {
36480 - host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36481 + host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36482 host->ports[i]->local_port_no = i + 1;
36483 }
36484
36485 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36486 index 0586f66..1a8f74a 100644
36487 --- a/drivers/ata/libata-scsi.c
36488 +++ b/drivers/ata/libata-scsi.c
36489 @@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
36490
36491 if (rc)
36492 return rc;
36493 - ap->print_id = atomic_inc_return(&ata_print_id);
36494 + ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36495 return 0;
36496 }
36497 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36498 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36499 index 5f4e0cc..ff2c347 100644
36500 --- a/drivers/ata/libata.h
36501 +++ b/drivers/ata/libata.h
36502 @@ -53,7 +53,7 @@ enum {
36503 ATA_DNXFER_QUIET = (1 << 31),
36504 };
36505
36506 -extern atomic_t ata_print_id;
36507 +extern atomic_unchecked_t ata_print_id;
36508 extern int atapi_passthru16;
36509 extern int libata_fua;
36510 extern int libata_noacpi;
36511 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36512 index 38216b9..4ec6aeb 100644
36513 --- a/drivers/ata/pata_arasan_cf.c
36514 +++ b/drivers/ata/pata_arasan_cf.c
36515 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36516 /* Handle platform specific quirks */
36517 if (quirk) {
36518 if (quirk & CF_BROKEN_PIO) {
36519 - ap->ops->set_piomode = NULL;
36520 + pax_open_kernel();
36521 + *(void **)&ap->ops->set_piomode = NULL;
36522 + pax_close_kernel();
36523 ap->pio_mask = 0;
36524 }
36525 if (quirk & CF_BROKEN_MWDMA)
36526 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36527 index f9b983a..887b9d8 100644
36528 --- a/drivers/atm/adummy.c
36529 +++ b/drivers/atm/adummy.c
36530 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36531 vcc->pop(vcc, skb);
36532 else
36533 dev_kfree_skb_any(skb);
36534 - atomic_inc(&vcc->stats->tx);
36535 + atomic_inc_unchecked(&vcc->stats->tx);
36536
36537 return 0;
36538 }
36539 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36540 index f1a9198..f466a4a 100644
36541 --- a/drivers/atm/ambassador.c
36542 +++ b/drivers/atm/ambassador.c
36543 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36544 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36545
36546 // VC layer stats
36547 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36548 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36549
36550 // free the descriptor
36551 kfree (tx_descr);
36552 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36553 dump_skb ("<<<", vc, skb);
36554
36555 // VC layer stats
36556 - atomic_inc(&atm_vcc->stats->rx);
36557 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36558 __net_timestamp(skb);
36559 // end of our responsibility
36560 atm_vcc->push (atm_vcc, skb);
36561 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36562 } else {
36563 PRINTK (KERN_INFO, "dropped over-size frame");
36564 // should we count this?
36565 - atomic_inc(&atm_vcc->stats->rx_drop);
36566 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36567 }
36568
36569 } else {
36570 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36571 }
36572
36573 if (check_area (skb->data, skb->len)) {
36574 - atomic_inc(&atm_vcc->stats->tx_err);
36575 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36576 return -ENOMEM; // ?
36577 }
36578
36579 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36580 index 480fa6f..947067c 100644
36581 --- a/drivers/atm/atmtcp.c
36582 +++ b/drivers/atm/atmtcp.c
36583 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36584 if (vcc->pop) vcc->pop(vcc,skb);
36585 else dev_kfree_skb(skb);
36586 if (dev_data) return 0;
36587 - atomic_inc(&vcc->stats->tx_err);
36588 + atomic_inc_unchecked(&vcc->stats->tx_err);
36589 return -ENOLINK;
36590 }
36591 size = skb->len+sizeof(struct atmtcp_hdr);
36592 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36593 if (!new_skb) {
36594 if (vcc->pop) vcc->pop(vcc,skb);
36595 else dev_kfree_skb(skb);
36596 - atomic_inc(&vcc->stats->tx_err);
36597 + atomic_inc_unchecked(&vcc->stats->tx_err);
36598 return -ENOBUFS;
36599 }
36600 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36601 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36602 if (vcc->pop) vcc->pop(vcc,skb);
36603 else dev_kfree_skb(skb);
36604 out_vcc->push(out_vcc,new_skb);
36605 - atomic_inc(&vcc->stats->tx);
36606 - atomic_inc(&out_vcc->stats->rx);
36607 + atomic_inc_unchecked(&vcc->stats->tx);
36608 + atomic_inc_unchecked(&out_vcc->stats->rx);
36609 return 0;
36610 }
36611
36612 @@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36613 read_unlock(&vcc_sklist_lock);
36614 if (!out_vcc) {
36615 result = -EUNATCH;
36616 - atomic_inc(&vcc->stats->tx_err);
36617 + atomic_inc_unchecked(&vcc->stats->tx_err);
36618 goto done;
36619 }
36620 skb_pull(skb,sizeof(struct atmtcp_hdr));
36621 @@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36622 __net_timestamp(new_skb);
36623 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36624 out_vcc->push(out_vcc,new_skb);
36625 - atomic_inc(&vcc->stats->tx);
36626 - atomic_inc(&out_vcc->stats->rx);
36627 + atomic_inc_unchecked(&vcc->stats->tx);
36628 + atomic_inc_unchecked(&out_vcc->stats->rx);
36629 done:
36630 if (vcc->pop) vcc->pop(vcc,skb);
36631 else dev_kfree_skb(skb);
36632 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36633 index d65975a..0b87e20 100644
36634 --- a/drivers/atm/eni.c
36635 +++ b/drivers/atm/eni.c
36636 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36637 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36638 vcc->dev->number);
36639 length = 0;
36640 - atomic_inc(&vcc->stats->rx_err);
36641 + atomic_inc_unchecked(&vcc->stats->rx_err);
36642 }
36643 else {
36644 length = ATM_CELL_SIZE-1; /* no HEC */
36645 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36646 size);
36647 }
36648 eff = length = 0;
36649 - atomic_inc(&vcc->stats->rx_err);
36650 + atomic_inc_unchecked(&vcc->stats->rx_err);
36651 }
36652 else {
36653 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36654 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36655 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36656 vcc->dev->number,vcc->vci,length,size << 2,descr);
36657 length = eff = 0;
36658 - atomic_inc(&vcc->stats->rx_err);
36659 + atomic_inc_unchecked(&vcc->stats->rx_err);
36660 }
36661 }
36662 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36663 @@ -767,7 +767,7 @@ rx_dequeued++;
36664 vcc->push(vcc,skb);
36665 pushed++;
36666 }
36667 - atomic_inc(&vcc->stats->rx);
36668 + atomic_inc_unchecked(&vcc->stats->rx);
36669 }
36670 wake_up(&eni_dev->rx_wait);
36671 }
36672 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36673 PCI_DMA_TODEVICE);
36674 if (vcc->pop) vcc->pop(vcc,skb);
36675 else dev_kfree_skb_irq(skb);
36676 - atomic_inc(&vcc->stats->tx);
36677 + atomic_inc_unchecked(&vcc->stats->tx);
36678 wake_up(&eni_dev->tx_wait);
36679 dma_complete++;
36680 }
36681 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36682 index 82f2ae0..f205c02 100644
36683 --- a/drivers/atm/firestream.c
36684 +++ b/drivers/atm/firestream.c
36685 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36686 }
36687 }
36688
36689 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36690 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36691
36692 fs_dprintk (FS_DEBUG_TXMEM, "i");
36693 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36694 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36695 #endif
36696 skb_put (skb, qe->p1 & 0xffff);
36697 ATM_SKB(skb)->vcc = atm_vcc;
36698 - atomic_inc(&atm_vcc->stats->rx);
36699 + atomic_inc_unchecked(&atm_vcc->stats->rx);
36700 __net_timestamp(skb);
36701 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36702 atm_vcc->push (atm_vcc, skb);
36703 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36704 kfree (pe);
36705 }
36706 if (atm_vcc)
36707 - atomic_inc(&atm_vcc->stats->rx_drop);
36708 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36709 break;
36710 case 0x1f: /* Reassembly abort: no buffers. */
36711 /* Silently increment error counter. */
36712 if (atm_vcc)
36713 - atomic_inc(&atm_vcc->stats->rx_drop);
36714 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36715 break;
36716 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36717 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36718 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36719 index d4725fc..2d4ea65 100644
36720 --- a/drivers/atm/fore200e.c
36721 +++ b/drivers/atm/fore200e.c
36722 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36723 #endif
36724 /* check error condition */
36725 if (*entry->status & STATUS_ERROR)
36726 - atomic_inc(&vcc->stats->tx_err);
36727 + atomic_inc_unchecked(&vcc->stats->tx_err);
36728 else
36729 - atomic_inc(&vcc->stats->tx);
36730 + atomic_inc_unchecked(&vcc->stats->tx);
36731 }
36732 }
36733
36734 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36735 if (skb == NULL) {
36736 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36737
36738 - atomic_inc(&vcc->stats->rx_drop);
36739 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36740 return -ENOMEM;
36741 }
36742
36743 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36744
36745 dev_kfree_skb_any(skb);
36746
36747 - atomic_inc(&vcc->stats->rx_drop);
36748 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36749 return -ENOMEM;
36750 }
36751
36752 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36753
36754 vcc->push(vcc, skb);
36755 - atomic_inc(&vcc->stats->rx);
36756 + atomic_inc_unchecked(&vcc->stats->rx);
36757
36758 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36759
36760 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36761 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36762 fore200e->atm_dev->number,
36763 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36764 - atomic_inc(&vcc->stats->rx_err);
36765 + atomic_inc_unchecked(&vcc->stats->rx_err);
36766 }
36767 }
36768
36769 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36770 goto retry_here;
36771 }
36772
36773 - atomic_inc(&vcc->stats->tx_err);
36774 + atomic_inc_unchecked(&vcc->stats->tx_err);
36775
36776 fore200e->tx_sat++;
36777 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36778 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36779 index c39702b..785b73b 100644
36780 --- a/drivers/atm/he.c
36781 +++ b/drivers/atm/he.c
36782 @@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36783
36784 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36785 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36786 - atomic_inc(&vcc->stats->rx_drop);
36787 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36788 goto return_host_buffers;
36789 }
36790
36791 @@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36792 RBRQ_LEN_ERR(he_dev->rbrq_head)
36793 ? "LEN_ERR" : "",
36794 vcc->vpi, vcc->vci);
36795 - atomic_inc(&vcc->stats->rx_err);
36796 + atomic_inc_unchecked(&vcc->stats->rx_err);
36797 goto return_host_buffers;
36798 }
36799
36800 @@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36801 vcc->push(vcc, skb);
36802 spin_lock(&he_dev->global_lock);
36803
36804 - atomic_inc(&vcc->stats->rx);
36805 + atomic_inc_unchecked(&vcc->stats->rx);
36806
36807 return_host_buffers:
36808 ++pdus_assembled;
36809 @@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36810 tpd->vcc->pop(tpd->vcc, tpd->skb);
36811 else
36812 dev_kfree_skb_any(tpd->skb);
36813 - atomic_inc(&tpd->vcc->stats->tx_err);
36814 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36815 }
36816 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36817 return;
36818 @@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36819 vcc->pop(vcc, skb);
36820 else
36821 dev_kfree_skb_any(skb);
36822 - atomic_inc(&vcc->stats->tx_err);
36823 + atomic_inc_unchecked(&vcc->stats->tx_err);
36824 return -EINVAL;
36825 }
36826
36827 @@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36828 vcc->pop(vcc, skb);
36829 else
36830 dev_kfree_skb_any(skb);
36831 - atomic_inc(&vcc->stats->tx_err);
36832 + atomic_inc_unchecked(&vcc->stats->tx_err);
36833 return -EINVAL;
36834 }
36835 #endif
36836 @@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36837 vcc->pop(vcc, skb);
36838 else
36839 dev_kfree_skb_any(skb);
36840 - atomic_inc(&vcc->stats->tx_err);
36841 + atomic_inc_unchecked(&vcc->stats->tx_err);
36842 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36843 return -ENOMEM;
36844 }
36845 @@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36846 vcc->pop(vcc, skb);
36847 else
36848 dev_kfree_skb_any(skb);
36849 - atomic_inc(&vcc->stats->tx_err);
36850 + atomic_inc_unchecked(&vcc->stats->tx_err);
36851 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36852 return -ENOMEM;
36853 }
36854 @@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36855 __enqueue_tpd(he_dev, tpd, cid);
36856 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36857
36858 - atomic_inc(&vcc->stats->tx);
36859 + atomic_inc_unchecked(&vcc->stats->tx);
36860
36861 return 0;
36862 }
36863 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36864 index 1dc0519..1aadaf7 100644
36865 --- a/drivers/atm/horizon.c
36866 +++ b/drivers/atm/horizon.c
36867 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36868 {
36869 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36870 // VC layer stats
36871 - atomic_inc(&vcc->stats->rx);
36872 + atomic_inc_unchecked(&vcc->stats->rx);
36873 __net_timestamp(skb);
36874 // end of our responsibility
36875 vcc->push (vcc, skb);
36876 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36877 dev->tx_iovec = NULL;
36878
36879 // VC layer stats
36880 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36881 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36882
36883 // free the skb
36884 hrz_kfree_skb (skb);
36885 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36886 index 2b24ed0..b3d6acc 100644
36887 --- a/drivers/atm/idt77252.c
36888 +++ b/drivers/atm/idt77252.c
36889 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36890 else
36891 dev_kfree_skb(skb);
36892
36893 - atomic_inc(&vcc->stats->tx);
36894 + atomic_inc_unchecked(&vcc->stats->tx);
36895 }
36896
36897 atomic_dec(&scq->used);
36898 @@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36899 if ((sb = dev_alloc_skb(64)) == NULL) {
36900 printk("%s: Can't allocate buffers for aal0.\n",
36901 card->name);
36902 - atomic_add(i, &vcc->stats->rx_drop);
36903 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
36904 break;
36905 }
36906 if (!atm_charge(vcc, sb->truesize)) {
36907 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36908 card->name);
36909 - atomic_add(i - 1, &vcc->stats->rx_drop);
36910 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36911 dev_kfree_skb(sb);
36912 break;
36913 }
36914 @@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36915 ATM_SKB(sb)->vcc = vcc;
36916 __net_timestamp(sb);
36917 vcc->push(vcc, sb);
36918 - atomic_inc(&vcc->stats->rx);
36919 + atomic_inc_unchecked(&vcc->stats->rx);
36920
36921 cell += ATM_CELL_PAYLOAD;
36922 }
36923 @@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36924 "(CDC: %08x)\n",
36925 card->name, len, rpp->len, readl(SAR_REG_CDC));
36926 recycle_rx_pool_skb(card, rpp);
36927 - atomic_inc(&vcc->stats->rx_err);
36928 + atomic_inc_unchecked(&vcc->stats->rx_err);
36929 return;
36930 }
36931 if (stat & SAR_RSQE_CRC) {
36932 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36933 recycle_rx_pool_skb(card, rpp);
36934 - atomic_inc(&vcc->stats->rx_err);
36935 + atomic_inc_unchecked(&vcc->stats->rx_err);
36936 return;
36937 }
36938 if (skb_queue_len(&rpp->queue) > 1) {
36939 @@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36940 RXPRINTK("%s: Can't alloc RX skb.\n",
36941 card->name);
36942 recycle_rx_pool_skb(card, rpp);
36943 - atomic_inc(&vcc->stats->rx_err);
36944 + atomic_inc_unchecked(&vcc->stats->rx_err);
36945 return;
36946 }
36947 if (!atm_charge(vcc, skb->truesize)) {
36948 @@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36949 __net_timestamp(skb);
36950
36951 vcc->push(vcc, skb);
36952 - atomic_inc(&vcc->stats->rx);
36953 + atomic_inc_unchecked(&vcc->stats->rx);
36954
36955 return;
36956 }
36957 @@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36958 __net_timestamp(skb);
36959
36960 vcc->push(vcc, skb);
36961 - atomic_inc(&vcc->stats->rx);
36962 + atomic_inc_unchecked(&vcc->stats->rx);
36963
36964 if (skb->truesize > SAR_FB_SIZE_3)
36965 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36966 @@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36967 if (vcc->qos.aal != ATM_AAL0) {
36968 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36969 card->name, vpi, vci);
36970 - atomic_inc(&vcc->stats->rx_drop);
36971 + atomic_inc_unchecked(&vcc->stats->rx_drop);
36972 goto drop;
36973 }
36974
36975 if ((sb = dev_alloc_skb(64)) == NULL) {
36976 printk("%s: Can't allocate buffers for AAL0.\n",
36977 card->name);
36978 - atomic_inc(&vcc->stats->rx_err);
36979 + atomic_inc_unchecked(&vcc->stats->rx_err);
36980 goto drop;
36981 }
36982
36983 @@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36984 ATM_SKB(sb)->vcc = vcc;
36985 __net_timestamp(sb);
36986 vcc->push(vcc, sb);
36987 - atomic_inc(&vcc->stats->rx);
36988 + atomic_inc_unchecked(&vcc->stats->rx);
36989
36990 drop:
36991 skb_pull(queue, 64);
36992 @@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36993
36994 if (vc == NULL) {
36995 printk("%s: NULL connection in send().\n", card->name);
36996 - atomic_inc(&vcc->stats->tx_err);
36997 + atomic_inc_unchecked(&vcc->stats->tx_err);
36998 dev_kfree_skb(skb);
36999 return -EINVAL;
37000 }
37001 if (!test_bit(VCF_TX, &vc->flags)) {
37002 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37003 - atomic_inc(&vcc->stats->tx_err);
37004 + atomic_inc_unchecked(&vcc->stats->tx_err);
37005 dev_kfree_skb(skb);
37006 return -EINVAL;
37007 }
37008 @@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37009 break;
37010 default:
37011 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37012 - atomic_inc(&vcc->stats->tx_err);
37013 + atomic_inc_unchecked(&vcc->stats->tx_err);
37014 dev_kfree_skb(skb);
37015 return -EINVAL;
37016 }
37017
37018 if (skb_shinfo(skb)->nr_frags != 0) {
37019 printk("%s: No scatter-gather yet.\n", card->name);
37020 - atomic_inc(&vcc->stats->tx_err);
37021 + atomic_inc_unchecked(&vcc->stats->tx_err);
37022 dev_kfree_skb(skb);
37023 return -EINVAL;
37024 }
37025 @@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37026
37027 err = queue_skb(card, vc, skb, oam);
37028 if (err) {
37029 - atomic_inc(&vcc->stats->tx_err);
37030 + atomic_inc_unchecked(&vcc->stats->tx_err);
37031 dev_kfree_skb(skb);
37032 return err;
37033 }
37034 @@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37035 skb = dev_alloc_skb(64);
37036 if (!skb) {
37037 printk("%s: Out of memory in send_oam().\n", card->name);
37038 - atomic_inc(&vcc->stats->tx_err);
37039 + atomic_inc_unchecked(&vcc->stats->tx_err);
37040 return -ENOMEM;
37041 }
37042 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37043 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37044 index 4217f29..88f547a 100644
37045 --- a/drivers/atm/iphase.c
37046 +++ b/drivers/atm/iphase.c
37047 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37048 status = (u_short) (buf_desc_ptr->desc_mode);
37049 if (status & (RX_CER | RX_PTE | RX_OFL))
37050 {
37051 - atomic_inc(&vcc->stats->rx_err);
37052 + atomic_inc_unchecked(&vcc->stats->rx_err);
37053 IF_ERR(printk("IA: bad packet, dropping it");)
37054 if (status & RX_CER) {
37055 IF_ERR(printk(" cause: packet CRC error\n");)
37056 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37057 len = dma_addr - buf_addr;
37058 if (len > iadev->rx_buf_sz) {
37059 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37060 - atomic_inc(&vcc->stats->rx_err);
37061 + atomic_inc_unchecked(&vcc->stats->rx_err);
37062 goto out_free_desc;
37063 }
37064
37065 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37066 ia_vcc = INPH_IA_VCC(vcc);
37067 if (ia_vcc == NULL)
37068 {
37069 - atomic_inc(&vcc->stats->rx_err);
37070 + atomic_inc_unchecked(&vcc->stats->rx_err);
37071 atm_return(vcc, skb->truesize);
37072 dev_kfree_skb_any(skb);
37073 goto INCR_DLE;
37074 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37075 if ((length > iadev->rx_buf_sz) || (length >
37076 (skb->len - sizeof(struct cpcs_trailer))))
37077 {
37078 - atomic_inc(&vcc->stats->rx_err);
37079 + atomic_inc_unchecked(&vcc->stats->rx_err);
37080 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37081 length, skb->len);)
37082 atm_return(vcc, skb->truesize);
37083 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37084
37085 IF_RX(printk("rx_dle_intr: skb push");)
37086 vcc->push(vcc,skb);
37087 - atomic_inc(&vcc->stats->rx);
37088 + atomic_inc_unchecked(&vcc->stats->rx);
37089 iadev->rx_pkt_cnt++;
37090 }
37091 INCR_DLE:
37092 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37093 {
37094 struct k_sonet_stats *stats;
37095 stats = &PRIV(_ia_dev[board])->sonet_stats;
37096 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37097 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37098 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37099 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37100 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37101 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37102 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37103 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37104 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37105 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37106 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37107 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37108 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37109 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37110 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37111 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37112 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37113 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37114 }
37115 ia_cmds.status = 0;
37116 break;
37117 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37118 if ((desc == 0) || (desc > iadev->num_tx_desc))
37119 {
37120 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37121 - atomic_inc(&vcc->stats->tx);
37122 + atomic_inc_unchecked(&vcc->stats->tx);
37123 if (vcc->pop)
37124 vcc->pop(vcc, skb);
37125 else
37126 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37127 ATM_DESC(skb) = vcc->vci;
37128 skb_queue_tail(&iadev->tx_dma_q, skb);
37129
37130 - atomic_inc(&vcc->stats->tx);
37131 + atomic_inc_unchecked(&vcc->stats->tx);
37132 iadev->tx_pkt_cnt++;
37133 /* Increment transaction counter */
37134 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37135
37136 #if 0
37137 /* add flow control logic */
37138 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37139 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37140 if (iavcc->vc_desc_cnt > 10) {
37141 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37142 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37143 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37144 index 93eaf8d..b4ca7da 100644
37145 --- a/drivers/atm/lanai.c
37146 +++ b/drivers/atm/lanai.c
37147 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37148 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37149 lanai_endtx(lanai, lvcc);
37150 lanai_free_skb(lvcc->tx.atmvcc, skb);
37151 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37152 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37153 }
37154
37155 /* Try to fill the buffer - don't call unless there is backlog */
37156 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37157 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37158 __net_timestamp(skb);
37159 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37160 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37161 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37162 out:
37163 lvcc->rx.buf.ptr = end;
37164 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37165 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37166 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37167 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37168 lanai->stats.service_rxnotaal5++;
37169 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37170 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37171 return 0;
37172 }
37173 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37174 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37175 int bytes;
37176 read_unlock(&vcc_sklist_lock);
37177 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37178 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37179 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37180 lvcc->stats.x.aal5.service_trash++;
37181 bytes = (SERVICE_GET_END(s) * 16) -
37182 (((unsigned long) lvcc->rx.buf.ptr) -
37183 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37184 }
37185 if (s & SERVICE_STREAM) {
37186 read_unlock(&vcc_sklist_lock);
37187 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37188 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37189 lvcc->stats.x.aal5.service_stream++;
37190 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37191 "PDU on VCI %d!\n", lanai->number, vci);
37192 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37193 return 0;
37194 }
37195 DPRINTK("got rx crc error on vci %d\n", vci);
37196 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37197 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37198 lvcc->stats.x.aal5.service_rxcrc++;
37199 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37200 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37201 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37202 index 9988ac9..7c52585 100644
37203 --- a/drivers/atm/nicstar.c
37204 +++ b/drivers/atm/nicstar.c
37205 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37206 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37207 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37208 card->index);
37209 - atomic_inc(&vcc->stats->tx_err);
37210 + atomic_inc_unchecked(&vcc->stats->tx_err);
37211 dev_kfree_skb_any(skb);
37212 return -EINVAL;
37213 }
37214 @@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37215 if (!vc->tx) {
37216 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37217 card->index);
37218 - atomic_inc(&vcc->stats->tx_err);
37219 + atomic_inc_unchecked(&vcc->stats->tx_err);
37220 dev_kfree_skb_any(skb);
37221 return -EINVAL;
37222 }
37223 @@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37224 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37225 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37226 card->index);
37227 - atomic_inc(&vcc->stats->tx_err);
37228 + atomic_inc_unchecked(&vcc->stats->tx_err);
37229 dev_kfree_skb_any(skb);
37230 return -EINVAL;
37231 }
37232
37233 if (skb_shinfo(skb)->nr_frags != 0) {
37234 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37235 - atomic_inc(&vcc->stats->tx_err);
37236 + atomic_inc_unchecked(&vcc->stats->tx_err);
37237 dev_kfree_skb_any(skb);
37238 return -EINVAL;
37239 }
37240 @@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37241 }
37242
37243 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37244 - atomic_inc(&vcc->stats->tx_err);
37245 + atomic_inc_unchecked(&vcc->stats->tx_err);
37246 dev_kfree_skb_any(skb);
37247 return -EIO;
37248 }
37249 - atomic_inc(&vcc->stats->tx);
37250 + atomic_inc_unchecked(&vcc->stats->tx);
37251
37252 return 0;
37253 }
37254 @@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37255 printk
37256 ("nicstar%d: Can't allocate buffers for aal0.\n",
37257 card->index);
37258 - atomic_add(i, &vcc->stats->rx_drop);
37259 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
37260 break;
37261 }
37262 if (!atm_charge(vcc, sb->truesize)) {
37263 RXPRINTK
37264 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37265 card->index);
37266 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37267 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37268 dev_kfree_skb_any(sb);
37269 break;
37270 }
37271 @@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37272 ATM_SKB(sb)->vcc = vcc;
37273 __net_timestamp(sb);
37274 vcc->push(vcc, sb);
37275 - atomic_inc(&vcc->stats->rx);
37276 + atomic_inc_unchecked(&vcc->stats->rx);
37277 cell += ATM_CELL_PAYLOAD;
37278 }
37279
37280 @@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37281 if (iovb == NULL) {
37282 printk("nicstar%d: Out of iovec buffers.\n",
37283 card->index);
37284 - atomic_inc(&vcc->stats->rx_drop);
37285 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37286 recycle_rx_buf(card, skb);
37287 return;
37288 }
37289 @@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37290 small or large buffer itself. */
37291 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37292 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37293 - atomic_inc(&vcc->stats->rx_err);
37294 + atomic_inc_unchecked(&vcc->stats->rx_err);
37295 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37296 NS_MAX_IOVECS);
37297 NS_PRV_IOVCNT(iovb) = 0;
37298 @@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37299 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37300 card->index);
37301 which_list(card, skb);
37302 - atomic_inc(&vcc->stats->rx_err);
37303 + atomic_inc_unchecked(&vcc->stats->rx_err);
37304 recycle_rx_buf(card, skb);
37305 vc->rx_iov = NULL;
37306 recycle_iov_buf(card, iovb);
37307 @@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37308 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37309 card->index);
37310 which_list(card, skb);
37311 - atomic_inc(&vcc->stats->rx_err);
37312 + atomic_inc_unchecked(&vcc->stats->rx_err);
37313 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37314 NS_PRV_IOVCNT(iovb));
37315 vc->rx_iov = NULL;
37316 @@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37317 printk(" - PDU size mismatch.\n");
37318 else
37319 printk(".\n");
37320 - atomic_inc(&vcc->stats->rx_err);
37321 + atomic_inc_unchecked(&vcc->stats->rx_err);
37322 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37323 NS_PRV_IOVCNT(iovb));
37324 vc->rx_iov = NULL;
37325 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37326 /* skb points to a small buffer */
37327 if (!atm_charge(vcc, skb->truesize)) {
37328 push_rxbufs(card, skb);
37329 - atomic_inc(&vcc->stats->rx_drop);
37330 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37331 } else {
37332 skb_put(skb, len);
37333 dequeue_sm_buf(card, skb);
37334 @@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37335 ATM_SKB(skb)->vcc = vcc;
37336 __net_timestamp(skb);
37337 vcc->push(vcc, skb);
37338 - atomic_inc(&vcc->stats->rx);
37339 + atomic_inc_unchecked(&vcc->stats->rx);
37340 }
37341 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37342 struct sk_buff *sb;
37343 @@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37344 if (len <= NS_SMBUFSIZE) {
37345 if (!atm_charge(vcc, sb->truesize)) {
37346 push_rxbufs(card, sb);
37347 - atomic_inc(&vcc->stats->rx_drop);
37348 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37349 } else {
37350 skb_put(sb, len);
37351 dequeue_sm_buf(card, sb);
37352 @@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37353 ATM_SKB(sb)->vcc = vcc;
37354 __net_timestamp(sb);
37355 vcc->push(vcc, sb);
37356 - atomic_inc(&vcc->stats->rx);
37357 + atomic_inc_unchecked(&vcc->stats->rx);
37358 }
37359
37360 push_rxbufs(card, skb);
37361 @@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37362
37363 if (!atm_charge(vcc, skb->truesize)) {
37364 push_rxbufs(card, skb);
37365 - atomic_inc(&vcc->stats->rx_drop);
37366 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37367 } else {
37368 dequeue_lg_buf(card, skb);
37369 #ifdef NS_USE_DESTRUCTORS
37370 @@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37371 ATM_SKB(skb)->vcc = vcc;
37372 __net_timestamp(skb);
37373 vcc->push(vcc, skb);
37374 - atomic_inc(&vcc->stats->rx);
37375 + atomic_inc_unchecked(&vcc->stats->rx);
37376 }
37377
37378 push_rxbufs(card, sb);
37379 @@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37380 printk
37381 ("nicstar%d: Out of huge buffers.\n",
37382 card->index);
37383 - atomic_inc(&vcc->stats->rx_drop);
37384 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37385 recycle_iovec_rx_bufs(card,
37386 (struct iovec *)
37387 iovb->data,
37388 @@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37389 card->hbpool.count++;
37390 } else
37391 dev_kfree_skb_any(hb);
37392 - atomic_inc(&vcc->stats->rx_drop);
37393 + atomic_inc_unchecked(&vcc->stats->rx_drop);
37394 } else {
37395 /* Copy the small buffer to the huge buffer */
37396 sb = (struct sk_buff *)iov->iov_base;
37397 @@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37398 #endif /* NS_USE_DESTRUCTORS */
37399 __net_timestamp(hb);
37400 vcc->push(vcc, hb);
37401 - atomic_inc(&vcc->stats->rx);
37402 + atomic_inc_unchecked(&vcc->stats->rx);
37403 }
37404 }
37405
37406 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37407 index 21b0bc6..b5f40ba 100644
37408 --- a/drivers/atm/solos-pci.c
37409 +++ b/drivers/atm/solos-pci.c
37410 @@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37411 }
37412 atm_charge(vcc, skb->truesize);
37413 vcc->push(vcc, skb);
37414 - atomic_inc(&vcc->stats->rx);
37415 + atomic_inc_unchecked(&vcc->stats->rx);
37416 break;
37417
37418 case PKT_STATUS:
37419 @@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37420 vcc = SKB_CB(oldskb)->vcc;
37421
37422 if (vcc) {
37423 - atomic_inc(&vcc->stats->tx);
37424 + atomic_inc_unchecked(&vcc->stats->tx);
37425 solos_pop(vcc, oldskb);
37426 } else {
37427 dev_kfree_skb_irq(oldskb);
37428 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37429 index 0215934..ce9f5b1 100644
37430 --- a/drivers/atm/suni.c
37431 +++ b/drivers/atm/suni.c
37432 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37433
37434
37435 #define ADD_LIMITED(s,v) \
37436 - atomic_add((v),&stats->s); \
37437 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37438 + atomic_add_unchecked((v),&stats->s); \
37439 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37440
37441
37442 static void suni_hz(unsigned long from_timer)
37443 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37444 index 5120a96..e2572bd 100644
37445 --- a/drivers/atm/uPD98402.c
37446 +++ b/drivers/atm/uPD98402.c
37447 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37448 struct sonet_stats tmp;
37449 int error = 0;
37450
37451 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37452 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37453 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37454 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37455 if (zero && !error) {
37456 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37457
37458
37459 #define ADD_LIMITED(s,v) \
37460 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37461 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37462 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37463 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37464 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37465 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37466
37467
37468 static void stat_event(struct atm_dev *dev)
37469 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37470 if (reason & uPD98402_INT_PFM) stat_event(dev);
37471 if (reason & uPD98402_INT_PCO) {
37472 (void) GET(PCOCR); /* clear interrupt cause */
37473 - atomic_add(GET(HECCT),
37474 + atomic_add_unchecked(GET(HECCT),
37475 &PRIV(dev)->sonet_stats.uncorr_hcs);
37476 }
37477 if ((reason & uPD98402_INT_RFO) &&
37478 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37479 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37480 uPD98402_INT_LOS),PIMR); /* enable them */
37481 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37482 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37483 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37484 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37485 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37486 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37487 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37488 return 0;
37489 }
37490
37491 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37492 index 969c3c2..9b72956 100644
37493 --- a/drivers/atm/zatm.c
37494 +++ b/drivers/atm/zatm.c
37495 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37496 }
37497 if (!size) {
37498 dev_kfree_skb_irq(skb);
37499 - if (vcc) atomic_inc(&vcc->stats->rx_err);
37500 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37501 continue;
37502 }
37503 if (!atm_charge(vcc,skb->truesize)) {
37504 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37505 skb->len = size;
37506 ATM_SKB(skb)->vcc = vcc;
37507 vcc->push(vcc,skb);
37508 - atomic_inc(&vcc->stats->rx);
37509 + atomic_inc_unchecked(&vcc->stats->rx);
37510 }
37511 zout(pos & 0xffff,MTA(mbx));
37512 #if 0 /* probably a stupid idea */
37513 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37514 skb_queue_head(&zatm_vcc->backlog,skb);
37515 break;
37516 }
37517 - atomic_inc(&vcc->stats->tx);
37518 + atomic_inc_unchecked(&vcc->stats->tx);
37519 wake_up(&zatm_vcc->tx_wait);
37520 }
37521
37522 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37523 index 876bae5..8978785 100644
37524 --- a/drivers/base/bus.c
37525 +++ b/drivers/base/bus.c
37526 @@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37527 return -EINVAL;
37528
37529 mutex_lock(&subsys->p->mutex);
37530 - list_add_tail(&sif->node, &subsys->p->interfaces);
37531 + pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37532 if (sif->add_dev) {
37533 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37534 while ((dev = subsys_dev_iter_next(&iter)))
37535 @@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37536 subsys = sif->subsys;
37537
37538 mutex_lock(&subsys->p->mutex);
37539 - list_del_init(&sif->node);
37540 + pax_list_del_init((struct list_head *)&sif->node);
37541 if (sif->remove_dev) {
37542 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37543 while ((dev = subsys_dev_iter_next(&iter)))
37544 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37545 index 25798db..15f130e 100644
37546 --- a/drivers/base/devtmpfs.c
37547 +++ b/drivers/base/devtmpfs.c
37548 @@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37549 if (!thread)
37550 return 0;
37551
37552 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37553 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37554 if (err)
37555 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37556 else
37557 @@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37558 *err = sys_unshare(CLONE_NEWNS);
37559 if (*err)
37560 goto out;
37561 - *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37562 + *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37563 if (*err)
37564 goto out;
37565 - sys_chdir("/.."); /* will traverse into overmounted root */
37566 - sys_chroot(".");
37567 + sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37568 + sys_chroot((char __force_user *)".");
37569 complete(&setup_done);
37570 while (1) {
37571 spin_lock(&req_lock);
37572 diff --git a/drivers/base/node.c b/drivers/base/node.c
37573 index 472168c..4af587e 100644
37574 --- a/drivers/base/node.c
37575 +++ b/drivers/base/node.c
37576 @@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37577 struct node_attr {
37578 struct device_attribute attr;
37579 enum node_states state;
37580 -};
37581 +} __do_const;
37582
37583 static ssize_t show_node_state(struct device *dev,
37584 struct device_attribute *attr, char *buf)
37585 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37586 index fb83d4a..e1797b3 100644
37587 --- a/drivers/base/power/domain.c
37588 +++ b/drivers/base/power/domain.c
37589 @@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37590 {
37591 struct cpuidle_driver *cpuidle_drv;
37592 struct gpd_cpuidle_data *cpuidle_data;
37593 - struct cpuidle_state *idle_state;
37594 + cpuidle_state_no_const *idle_state;
37595 int ret = 0;
37596
37597 if (IS_ERR_OR_NULL(genpd) || state < 0)
37598 @@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37599 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37600 {
37601 struct gpd_cpuidle_data *cpuidle_data;
37602 - struct cpuidle_state *idle_state;
37603 + cpuidle_state_no_const *idle_state;
37604 int ret = 0;
37605
37606 if (IS_ERR_OR_NULL(genpd))
37607 @@ -2215,7 +2215,9 @@ int genpd_dev_pm_attach(struct device *dev)
37608 return ret;
37609 }
37610
37611 - dev->pm_domain->detach = genpd_dev_pm_detach;
37612 + pax_open_kernel();
37613 + *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37614 + pax_close_kernel();
37615
37616 return 0;
37617 }
37618 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37619 index a9d26ed..74b8405 100644
37620 --- a/drivers/base/power/sysfs.c
37621 +++ b/drivers/base/power/sysfs.c
37622 @@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37623 return -EIO;
37624 }
37625 }
37626 - return sprintf(buf, p);
37627 + return sprintf(buf, "%s", p);
37628 }
37629
37630 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37631 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37632 index c2744b3..08fac19 100644
37633 --- a/drivers/base/power/wakeup.c
37634 +++ b/drivers/base/power/wakeup.c
37635 @@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37636 * They need to be modified together atomically, so it's better to use one
37637 * atomic variable to hold them both.
37638 */
37639 -static atomic_t combined_event_count = ATOMIC_INIT(0);
37640 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37641
37642 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37643 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37644
37645 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37646 {
37647 - unsigned int comb = atomic_read(&combined_event_count);
37648 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
37649
37650 *cnt = (comb >> IN_PROGRESS_BITS);
37651 *inpr = comb & MAX_IN_PROGRESS;
37652 @@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37653 ws->start_prevent_time = ws->last_time;
37654
37655 /* Increment the counter of events in progress. */
37656 - cec = atomic_inc_return(&combined_event_count);
37657 + cec = atomic_inc_return_unchecked(&combined_event_count);
37658
37659 trace_wakeup_source_activate(ws->name, cec);
37660 }
37661 @@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37662 * Increment the counter of registered wakeup events and decrement the
37663 * couter of wakeup events in progress simultaneously.
37664 */
37665 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37666 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37667 trace_wakeup_source_deactivate(ws->name, cec);
37668
37669 split_counters(&cnt, &inpr);
37670 diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37671 index 8d98a32..61d3165 100644
37672 --- a/drivers/base/syscore.c
37673 +++ b/drivers/base/syscore.c
37674 @@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37675 void register_syscore_ops(struct syscore_ops *ops)
37676 {
37677 mutex_lock(&syscore_ops_lock);
37678 - list_add_tail(&ops->node, &syscore_ops_list);
37679 + pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37680 mutex_unlock(&syscore_ops_lock);
37681 }
37682 EXPORT_SYMBOL_GPL(register_syscore_ops);
37683 @@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37684 void unregister_syscore_ops(struct syscore_ops *ops)
37685 {
37686 mutex_lock(&syscore_ops_lock);
37687 - list_del(&ops->node);
37688 + pax_list_del((struct list_head *)&ops->node);
37689 mutex_unlock(&syscore_ops_lock);
37690 }
37691 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37692 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37693 index ff20f19..018f1da 100644
37694 --- a/drivers/block/cciss.c
37695 +++ b/drivers/block/cciss.c
37696 @@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37697 while (!list_empty(&h->reqQ)) {
37698 c = list_entry(h->reqQ.next, CommandList_struct, list);
37699 /* can't do anything if fifo is full */
37700 - if ((h->access.fifo_full(h))) {
37701 + if ((h->access->fifo_full(h))) {
37702 dev_warn(&h->pdev->dev, "fifo full\n");
37703 break;
37704 }
37705 @@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37706 h->Qdepth--;
37707
37708 /* Tell the controller execute command */
37709 - h->access.submit_command(h, c);
37710 + h->access->submit_command(h, c);
37711
37712 /* Put job onto the completed Q */
37713 addQ(&h->cmpQ, c);
37714 @@ -3444,17 +3444,17 @@ startio:
37715
37716 static inline unsigned long get_next_completion(ctlr_info_t *h)
37717 {
37718 - return h->access.command_completed(h);
37719 + return h->access->command_completed(h);
37720 }
37721
37722 static inline int interrupt_pending(ctlr_info_t *h)
37723 {
37724 - return h->access.intr_pending(h);
37725 + return h->access->intr_pending(h);
37726 }
37727
37728 static inline long interrupt_not_for_us(ctlr_info_t *h)
37729 {
37730 - return ((h->access.intr_pending(h) == 0) ||
37731 + return ((h->access->intr_pending(h) == 0) ||
37732 (h->interrupts_enabled == 0));
37733 }
37734
37735 @@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37736 u32 a;
37737
37738 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37739 - return h->access.command_completed(h);
37740 + return h->access->command_completed(h);
37741
37742 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37743 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37744 @@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37745 trans_support & CFGTBL_Trans_use_short_tags);
37746
37747 /* Change the access methods to the performant access methods */
37748 - h->access = SA5_performant_access;
37749 + h->access = &SA5_performant_access;
37750 h->transMethod = CFGTBL_Trans_Performant;
37751
37752 return;
37753 @@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37754 if (prod_index < 0)
37755 return -ENODEV;
37756 h->product_name = products[prod_index].product_name;
37757 - h->access = *(products[prod_index].access);
37758 + h->access = products[prod_index].access;
37759
37760 if (cciss_board_disabled(h)) {
37761 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37762 @@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37763 }
37764
37765 /* make sure the board interrupts are off */
37766 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37767 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37768 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37769 if (rc)
37770 goto clean2;
37771 @@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37772 * fake ones to scoop up any residual completions.
37773 */
37774 spin_lock_irqsave(&h->lock, flags);
37775 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37776 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37777 spin_unlock_irqrestore(&h->lock, flags);
37778 free_irq(h->intr[h->intr_mode], h);
37779 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37780 @@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37781 dev_info(&h->pdev->dev, "Board READY.\n");
37782 dev_info(&h->pdev->dev,
37783 "Waiting for stale completions to drain.\n");
37784 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37785 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37786 msleep(10000);
37787 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37788 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37789
37790 rc = controller_reset_failed(h->cfgtable);
37791 if (rc)
37792 @@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37793 cciss_scsi_setup(h);
37794
37795 /* Turn the interrupts on so we can service requests */
37796 - h->access.set_intr_mask(h, CCISS_INTR_ON);
37797 + h->access->set_intr_mask(h, CCISS_INTR_ON);
37798
37799 /* Get the firmware version */
37800 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37801 @@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37802 kfree(flush_buf);
37803 if (return_code != IO_OK)
37804 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37805 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
37806 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
37807 free_irq(h->intr[h->intr_mode], h);
37808 }
37809
37810 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37811 index 7fda30e..2f27946 100644
37812 --- a/drivers/block/cciss.h
37813 +++ b/drivers/block/cciss.h
37814 @@ -101,7 +101,7 @@ struct ctlr_info
37815 /* information about each logical volume */
37816 drive_info_struct *drv[CISS_MAX_LUN];
37817
37818 - struct access_method access;
37819 + struct access_method *access;
37820
37821 /* queue and queue Info */
37822 struct list_head reqQ;
37823 @@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37824 }
37825
37826 static struct access_method SA5_access = {
37827 - SA5_submit_command,
37828 - SA5_intr_mask,
37829 - SA5_fifo_full,
37830 - SA5_intr_pending,
37831 - SA5_completed,
37832 + .submit_command = SA5_submit_command,
37833 + .set_intr_mask = SA5_intr_mask,
37834 + .fifo_full = SA5_fifo_full,
37835 + .intr_pending = SA5_intr_pending,
37836 + .command_completed = SA5_completed,
37837 };
37838
37839 static struct access_method SA5B_access = {
37840 - SA5_submit_command,
37841 - SA5B_intr_mask,
37842 - SA5_fifo_full,
37843 - SA5B_intr_pending,
37844 - SA5_completed,
37845 + .submit_command = SA5_submit_command,
37846 + .set_intr_mask = SA5B_intr_mask,
37847 + .fifo_full = SA5_fifo_full,
37848 + .intr_pending = SA5B_intr_pending,
37849 + .command_completed = SA5_completed,
37850 };
37851
37852 static struct access_method SA5_performant_access = {
37853 - SA5_submit_command,
37854 - SA5_performant_intr_mask,
37855 - SA5_fifo_full,
37856 - SA5_performant_intr_pending,
37857 - SA5_performant_completed,
37858 + .submit_command = SA5_submit_command,
37859 + .set_intr_mask = SA5_performant_intr_mask,
37860 + .fifo_full = SA5_fifo_full,
37861 + .intr_pending = SA5_performant_intr_pending,
37862 + .command_completed = SA5_performant_completed,
37863 };
37864
37865 struct board_type {
37866 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37867 index 2b94403..fd6ad1f 100644
37868 --- a/drivers/block/cpqarray.c
37869 +++ b/drivers/block/cpqarray.c
37870 @@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37871 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37872 goto Enomem4;
37873 }
37874 - hba[i]->access.set_intr_mask(hba[i], 0);
37875 + hba[i]->access->set_intr_mask(hba[i], 0);
37876 if (request_irq(hba[i]->intr, do_ida_intr,
37877 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37878 {
37879 @@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37880 add_timer(&hba[i]->timer);
37881
37882 /* Enable IRQ now that spinlock and rate limit timer are set up */
37883 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37884 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37885
37886 for(j=0; j<NWD; j++) {
37887 struct gendisk *disk = ida_gendisk[i][j];
37888 @@ -694,7 +694,7 @@ DBGINFO(
37889 for(i=0; i<NR_PRODUCTS; i++) {
37890 if (board_id == products[i].board_id) {
37891 c->product_name = products[i].product_name;
37892 - c->access = *(products[i].access);
37893 + c->access = products[i].access;
37894 break;
37895 }
37896 }
37897 @@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37898 hba[ctlr]->intr = intr;
37899 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37900 hba[ctlr]->product_name = products[j].product_name;
37901 - hba[ctlr]->access = *(products[j].access);
37902 + hba[ctlr]->access = products[j].access;
37903 hba[ctlr]->ctlr = ctlr;
37904 hba[ctlr]->board_id = board_id;
37905 hba[ctlr]->pci_dev = NULL; /* not PCI */
37906 @@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37907
37908 while((c = h->reqQ) != NULL) {
37909 /* Can't do anything if we're busy */
37910 - if (h->access.fifo_full(h) == 0)
37911 + if (h->access->fifo_full(h) == 0)
37912 return;
37913
37914 /* Get the first entry from the request Q */
37915 @@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37916 h->Qdepth--;
37917
37918 /* Tell the controller to do our bidding */
37919 - h->access.submit_command(h, c);
37920 + h->access->submit_command(h, c);
37921
37922 /* Get onto the completion Q */
37923 addQ(&h->cmpQ, c);
37924 @@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37925 unsigned long flags;
37926 __u32 a,a1;
37927
37928 - istat = h->access.intr_pending(h);
37929 + istat = h->access->intr_pending(h);
37930 /* Is this interrupt for us? */
37931 if (istat == 0)
37932 return IRQ_NONE;
37933 @@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37934 */
37935 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37936 if (istat & FIFO_NOT_EMPTY) {
37937 - while((a = h->access.command_completed(h))) {
37938 + while((a = h->access->command_completed(h))) {
37939 a1 = a; a &= ~3;
37940 if ((c = h->cmpQ) == NULL)
37941 {
37942 @@ -1448,11 +1448,11 @@ static int sendcmd(
37943 /*
37944 * Disable interrupt
37945 */
37946 - info_p->access.set_intr_mask(info_p, 0);
37947 + info_p->access->set_intr_mask(info_p, 0);
37948 /* Make sure there is room in the command FIFO */
37949 /* Actually it should be completely empty at this time. */
37950 for (i = 200000; i > 0; i--) {
37951 - temp = info_p->access.fifo_full(info_p);
37952 + temp = info_p->access->fifo_full(info_p);
37953 if (temp != 0) {
37954 break;
37955 }
37956 @@ -1465,7 +1465,7 @@ DBG(
37957 /*
37958 * Send the cmd
37959 */
37960 - info_p->access.submit_command(info_p, c);
37961 + info_p->access->submit_command(info_p, c);
37962 complete = pollcomplete(ctlr);
37963
37964 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37965 @@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37966 * we check the new geometry. Then turn interrupts back on when
37967 * we're done.
37968 */
37969 - host->access.set_intr_mask(host, 0);
37970 + host->access->set_intr_mask(host, 0);
37971 getgeometry(ctlr);
37972 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37973 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37974
37975 for(i=0; i<NWD; i++) {
37976 struct gendisk *disk = ida_gendisk[ctlr][i];
37977 @@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37978 /* Wait (up to 2 seconds) for a command to complete */
37979
37980 for (i = 200000; i > 0; i--) {
37981 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
37982 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
37983 if (done == 0) {
37984 udelay(10); /* a short fixed delay */
37985 } else
37986 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37987 index be73e9d..7fbf140 100644
37988 --- a/drivers/block/cpqarray.h
37989 +++ b/drivers/block/cpqarray.h
37990 @@ -99,7 +99,7 @@ struct ctlr_info {
37991 drv_info_t drv[NWD];
37992 struct proc_dir_entry *proc;
37993
37994 - struct access_method access;
37995 + struct access_method *access;
37996
37997 cmdlist_t *reqQ;
37998 cmdlist_t *cmpQ;
37999 diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38000 index 434c77d..6d3219a 100644
38001 --- a/drivers/block/drbd/drbd_bitmap.c
38002 +++ b/drivers/block/drbd/drbd_bitmap.c
38003 @@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38004 submit_bio(rw, bio);
38005 /* this should not count as user activity and cause the
38006 * resync to throttle -- see drbd_rs_should_slow_down(). */
38007 - atomic_add(len >> 9, &device->rs_sect_ev);
38008 + atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38009 }
38010 }
38011
38012 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38013 index 9b22f8f..f2932af 100644
38014 --- a/drivers/block/drbd/drbd_int.h
38015 +++ b/drivers/block/drbd/drbd_int.h
38016 @@ -385,7 +385,7 @@ struct drbd_epoch {
38017 struct drbd_connection *connection;
38018 struct list_head list;
38019 unsigned int barrier_nr;
38020 - atomic_t epoch_size; /* increased on every request added. */
38021 + atomic_unchecked_t epoch_size; /* increased on every request added. */
38022 atomic_t active; /* increased on every req. added, and dec on every finished. */
38023 unsigned long flags;
38024 };
38025 @@ -946,7 +946,7 @@ struct drbd_device {
38026 unsigned int al_tr_number;
38027 int al_tr_cycle;
38028 wait_queue_head_t seq_wait;
38029 - atomic_t packet_seq;
38030 + atomic_unchecked_t packet_seq;
38031 unsigned int peer_seq;
38032 spinlock_t peer_seq_lock;
38033 unsigned long comm_bm_set; /* communicated number of set bits. */
38034 @@ -955,8 +955,8 @@ struct drbd_device {
38035 struct mutex own_state_mutex;
38036 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38037 char congestion_reason; /* Why we where congested... */
38038 - atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38039 - atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38040 + atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38041 + atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38042 int rs_last_sect_ev; /* counter to compare with */
38043 int rs_last_events; /* counter of read or write "events" (unit sectors)
38044 * on the lower level device when we last looked. */
38045 @@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38046 char __user *uoptval;
38047 int err;
38048
38049 - uoptval = (char __user __force *)optval;
38050 + uoptval = (char __force_user *)optval;
38051
38052 set_fs(KERNEL_DS);
38053 if (level == SOL_SOCKET)
38054 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38055 index 973c185..05d8b1a 100644
38056 --- a/drivers/block/drbd/drbd_main.c
38057 +++ b/drivers/block/drbd/drbd_main.c
38058 @@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38059 p->sector = sector;
38060 p->block_id = block_id;
38061 p->blksize = blksize;
38062 - p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38063 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38064 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38065 }
38066
38067 @@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38068 return -EIO;
38069 p->sector = cpu_to_be64(req->i.sector);
38070 p->block_id = (unsigned long)req;
38071 - p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38072 + p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38073 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38074 if (device->state.conn >= C_SYNC_SOURCE &&
38075 device->state.conn <= C_PAUSED_SYNC_T)
38076 @@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38077 atomic_set(&device->unacked_cnt, 0);
38078 atomic_set(&device->local_cnt, 0);
38079 atomic_set(&device->pp_in_use_by_net, 0);
38080 - atomic_set(&device->rs_sect_in, 0);
38081 - atomic_set(&device->rs_sect_ev, 0);
38082 + atomic_set_unchecked(&device->rs_sect_in, 0);
38083 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38084 atomic_set(&device->ap_in_flight, 0);
38085 atomic_set(&device->md_io.in_use, 0);
38086
38087 @@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38088 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38089 struct drbd_resource *resource = connection->resource;
38090
38091 - if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38092 - drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38093 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38094 + drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38095 kfree(connection->current_epoch);
38096
38097 idr_destroy(&connection->peer_devices);
38098 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38099 index 1cd47df..57c53c0 100644
38100 --- a/drivers/block/drbd/drbd_nl.c
38101 +++ b/drivers/block/drbd/drbd_nl.c
38102 @@ -3645,13 +3645,13 @@ finish:
38103
38104 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38105 {
38106 - static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38107 + static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38108 struct sk_buff *msg;
38109 struct drbd_genlmsghdr *d_out;
38110 unsigned seq;
38111 int err = -ENOMEM;
38112
38113 - seq = atomic_inc_return(&drbd_genl_seq);
38114 + seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38115 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38116 if (!msg)
38117 goto failed;
38118 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38119 index 6960fb0..215d76b 100644
38120 --- a/drivers/block/drbd/drbd_receiver.c
38121 +++ b/drivers/block/drbd/drbd_receiver.c
38122 @@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38123 struct drbd_device *device = peer_device->device;
38124 int err;
38125
38126 - atomic_set(&device->packet_seq, 0);
38127 + atomic_set_unchecked(&device->packet_seq, 0);
38128 device->peer_seq = 0;
38129
38130 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38131 @@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38132 do {
38133 next_epoch = NULL;
38134
38135 - epoch_size = atomic_read(&epoch->epoch_size);
38136 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38137
38138 switch (ev & ~EV_CLEANUP) {
38139 case EV_PUT:
38140 @@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38141 rv = FE_DESTROYED;
38142 } else {
38143 epoch->flags = 0;
38144 - atomic_set(&epoch->epoch_size, 0);
38145 + atomic_set_unchecked(&epoch->epoch_size, 0);
38146 /* atomic_set(&epoch->active, 0); is already zero */
38147 if (rv == FE_STILL_LIVE)
38148 rv = FE_RECYCLED;
38149 @@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38150 conn_wait_active_ee_empty(connection);
38151 drbd_flush(connection);
38152
38153 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38154 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38155 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38156 if (epoch)
38157 break;
38158 @@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38159 }
38160
38161 epoch->flags = 0;
38162 - atomic_set(&epoch->epoch_size, 0);
38163 + atomic_set_unchecked(&epoch->epoch_size, 0);
38164 atomic_set(&epoch->active, 0);
38165
38166 spin_lock(&connection->epoch_lock);
38167 - if (atomic_read(&connection->current_epoch->epoch_size)) {
38168 + if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38169 list_add(&epoch->list, &connection->current_epoch->list);
38170 connection->current_epoch = epoch;
38171 connection->epochs++;
38172 @@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38173 list_add_tail(&peer_req->w.list, &device->sync_ee);
38174 spin_unlock_irq(&device->resource->req_lock);
38175
38176 - atomic_add(pi->size >> 9, &device->rs_sect_ev);
38177 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38178 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38179 return 0;
38180
38181 @@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38182 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38183 }
38184
38185 - atomic_add(pi->size >> 9, &device->rs_sect_in);
38186 + atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38187
38188 return err;
38189 }
38190 @@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38191
38192 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38193 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38194 - atomic_inc(&connection->current_epoch->epoch_size);
38195 + atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38196 err2 = drbd_drain_block(peer_device, pi->size);
38197 if (!err)
38198 err = err2;
38199 @@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38200
38201 spin_lock(&connection->epoch_lock);
38202 peer_req->epoch = connection->current_epoch;
38203 - atomic_inc(&peer_req->epoch->epoch_size);
38204 + atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38205 atomic_inc(&peer_req->epoch->active);
38206 spin_unlock(&connection->epoch_lock);
38207
38208 @@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38209
38210 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38211 (int)part_stat_read(&disk->part0, sectors[1]) -
38212 - atomic_read(&device->rs_sect_ev);
38213 + atomic_read_unchecked(&device->rs_sect_ev);
38214
38215 if (atomic_read(&device->ap_actlog_cnt)
38216 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38217 @@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38218 device->use_csums = true;
38219 } else if (pi->cmd == P_OV_REPLY) {
38220 /* track progress, we may need to throttle */
38221 - atomic_add(size >> 9, &device->rs_sect_in);
38222 + atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38223 peer_req->w.cb = w_e_end_ov_reply;
38224 dec_rs_pending(device);
38225 /* drbd_rs_begin_io done when we sent this request,
38226 @@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38227 goto out_free_e;
38228
38229 submit_for_resync:
38230 - atomic_add(size >> 9, &device->rs_sect_ev);
38231 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38232
38233 submit:
38234 update_receiver_timing_details(connection, drbd_submit_peer_request);
38235 @@ -4564,7 +4564,7 @@ struct data_cmd {
38236 int expect_payload;
38237 size_t pkt_size;
38238 int (*fn)(struct drbd_connection *, struct packet_info *);
38239 -};
38240 +} __do_const;
38241
38242 static struct data_cmd drbd_cmd_handler[] = {
38243 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38244 @@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38245 if (!list_empty(&connection->current_epoch->list))
38246 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38247 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38248 - atomic_set(&connection->current_epoch->epoch_size, 0);
38249 + atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38250 connection->send.seen_any_write_yet = false;
38251
38252 drbd_info(connection, "Connection closed\n");
38253 @@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38254 put_ldev(device);
38255 }
38256 dec_rs_pending(device);
38257 - atomic_add(blksize >> 9, &device->rs_sect_in);
38258 + atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38259
38260 return 0;
38261 }
38262 @@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38263 struct asender_cmd {
38264 size_t pkt_size;
38265 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38266 -};
38267 +} __do_const;
38268
38269 static struct asender_cmd asender_tbl[] = {
38270 [P_PING] = { 0, got_Ping },
38271 diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38272 index d2d1f97..6a1188f 100644
38273 --- a/drivers/block/drbd/drbd_worker.c
38274 +++ b/drivers/block/drbd/drbd_worker.c
38275 @@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38276 list_add_tail(&peer_req->w.list, &device->read_ee);
38277 spin_unlock_irq(&device->resource->req_lock);
38278
38279 - atomic_add(size >> 9, &device->rs_sect_ev);
38280 + atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38281 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38282 return 0;
38283
38284 @@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38285 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38286 int number, mxb;
38287
38288 - sect_in = atomic_xchg(&device->rs_sect_in, 0);
38289 + sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38290 device->rs_in_flight -= sect_in;
38291
38292 rcu_read_lock();
38293 @@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38294 {
38295 struct fifo_buffer *plan;
38296
38297 - atomic_set(&device->rs_sect_in, 0);
38298 - atomic_set(&device->rs_sect_ev, 0);
38299 + atomic_set_unchecked(&device->rs_sect_in, 0);
38300 + atomic_set_unchecked(&device->rs_sect_ev, 0);
38301 device->rs_in_flight = 0;
38302
38303 /* Updating the RCU protected object in place is necessary since
38304 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38305 index 6cb1beb..bf490f7 100644
38306 --- a/drivers/block/loop.c
38307 +++ b/drivers/block/loop.c
38308 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38309
38310 file_start_write(file);
38311 set_fs(get_ds());
38312 - bw = file->f_op->write(file, buf, len, &pos);
38313 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38314 set_fs(old_fs);
38315 file_end_write(file);
38316 if (likely(bw == len))
38317 diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38318 index e2bb8af..44b8aef 100644
38319 --- a/drivers/block/nvme-core.c
38320 +++ b/drivers/block/nvme-core.c
38321 @@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38322 static struct task_struct *nvme_thread;
38323 static struct workqueue_struct *nvme_workq;
38324 static wait_queue_head_t nvme_kthread_wait;
38325 -static struct notifier_block nvme_nb;
38326
38327 static void nvme_reset_failed_dev(struct work_struct *ws);
38328
38329 @@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38330 .err_handler = &nvme_err_handler,
38331 };
38332
38333 +static struct notifier_block nvme_nb = {
38334 + .notifier_call = &nvme_cpu_notify,
38335 +};
38336 +
38337 static int __init nvme_init(void)
38338 {
38339 int result;
38340 @@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38341 else if (result > 0)
38342 nvme_major = result;
38343
38344 - nvme_nb.notifier_call = &nvme_cpu_notify;
38345 result = register_hotcpu_notifier(&nvme_nb);
38346 if (result)
38347 goto unregister_blkdev;
38348 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38349 index 09e628da..7607aaa 100644
38350 --- a/drivers/block/pktcdvd.c
38351 +++ b/drivers/block/pktcdvd.c
38352 @@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38353
38354 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38355 {
38356 - return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38357 + return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38358 }
38359
38360 /*
38361 @@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38362 return -EROFS;
38363 }
38364 pd->settings.fp = ti.fp;
38365 - pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38366 + pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38367
38368 if (ti.nwa_v) {
38369 pd->nwa = be32_to_cpu(ti.next_writable);
38370 diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38371 index e5565fb..71be10b4 100644
38372 --- a/drivers/block/smart1,2.h
38373 +++ b/drivers/block/smart1,2.h
38374 @@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38375 }
38376
38377 static struct access_method smart4_access = {
38378 - smart4_submit_command,
38379 - smart4_intr_mask,
38380 - smart4_fifo_full,
38381 - smart4_intr_pending,
38382 - smart4_completed,
38383 + .submit_command = smart4_submit_command,
38384 + .set_intr_mask = smart4_intr_mask,
38385 + .fifo_full = smart4_fifo_full,
38386 + .intr_pending = smart4_intr_pending,
38387 + .command_completed = smart4_completed,
38388 };
38389
38390 /*
38391 @@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38392 }
38393
38394 static struct access_method smart2_access = {
38395 - smart2_submit_command,
38396 - smart2_intr_mask,
38397 - smart2_fifo_full,
38398 - smart2_intr_pending,
38399 - smart2_completed,
38400 + .submit_command = smart2_submit_command,
38401 + .set_intr_mask = smart2_intr_mask,
38402 + .fifo_full = smart2_fifo_full,
38403 + .intr_pending = smart2_intr_pending,
38404 + .command_completed = smart2_completed,
38405 };
38406
38407 /*
38408 @@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38409 }
38410
38411 static struct access_method smart2e_access = {
38412 - smart2e_submit_command,
38413 - smart2e_intr_mask,
38414 - smart2e_fifo_full,
38415 - smart2e_intr_pending,
38416 - smart2e_completed,
38417 + .submit_command = smart2e_submit_command,
38418 + .set_intr_mask = smart2e_intr_mask,
38419 + .fifo_full = smart2e_fifo_full,
38420 + .intr_pending = smart2e_intr_pending,
38421 + .command_completed = smart2e_completed,
38422 };
38423
38424 /*
38425 @@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38426 }
38427
38428 static struct access_method smart1_access = {
38429 - smart1_submit_command,
38430 - smart1_intr_mask,
38431 - smart1_fifo_full,
38432 - smart1_intr_pending,
38433 - smart1_completed,
38434 + .submit_command = smart1_submit_command,
38435 + .set_intr_mask = smart1_intr_mask,
38436 + .fifo_full = smart1_fifo_full,
38437 + .intr_pending = smart1_intr_pending,
38438 + .command_completed = smart1_completed,
38439 };
38440 diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38441 index f038dba..bb74c08 100644
38442 --- a/drivers/bluetooth/btwilink.c
38443 +++ b/drivers/bluetooth/btwilink.c
38444 @@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38445
38446 static int bt_ti_probe(struct platform_device *pdev)
38447 {
38448 - static struct ti_st *hst;
38449 + struct ti_st *hst;
38450 struct hci_dev *hdev;
38451 int err;
38452
38453 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38454 index 5d28a45..a538f90 100644
38455 --- a/drivers/cdrom/cdrom.c
38456 +++ b/drivers/cdrom/cdrom.c
38457 @@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38458 ENSURE(reset, CDC_RESET);
38459 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38460 cdi->mc_flags = 0;
38461 - cdo->n_minors = 0;
38462 cdi->options = CDO_USE_FFLAGS;
38463
38464 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38465 @@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38466 else
38467 cdi->cdda_method = CDDA_OLD;
38468
38469 - if (!cdo->generic_packet)
38470 - cdo->generic_packet = cdrom_dummy_generic_packet;
38471 + if (!cdo->generic_packet) {
38472 + pax_open_kernel();
38473 + *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38474 + pax_close_kernel();
38475 + }
38476
38477 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38478 mutex_lock(&cdrom_mutex);
38479 @@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38480 if (cdi->exit)
38481 cdi->exit(cdi);
38482
38483 - cdi->ops->n_minors--;
38484 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38485 }
38486
38487 @@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38488 */
38489 nr = nframes;
38490 do {
38491 - cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38492 + cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38493 if (cgc.buffer)
38494 break;
38495
38496 @@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38497 struct cdrom_device_info *cdi;
38498 int ret;
38499
38500 - ret = scnprintf(info + *pos, max_size - *pos, header);
38501 + ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38502 if (!ret)
38503 return 1;
38504
38505 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38506 index 584bc31..e64a12c 100644
38507 --- a/drivers/cdrom/gdrom.c
38508 +++ b/drivers/cdrom/gdrom.c
38509 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38510 .audio_ioctl = gdrom_audio_ioctl,
38511 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38512 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38513 - .n_minors = 1,
38514 };
38515
38516 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38517 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38518 index efefd12..4f1d494 100644
38519 --- a/drivers/char/Kconfig
38520 +++ b/drivers/char/Kconfig
38521 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38522
38523 config DEVKMEM
38524 bool "/dev/kmem virtual device support"
38525 - default y
38526 + default n
38527 + depends on !GRKERNSEC_KMEM
38528 help
38529 Say Y here if you want to support the /dev/kmem device. The
38530 /dev/kmem device is rarely used, but can be used for certain
38531 @@ -577,6 +578,7 @@ config DEVPORT
38532 bool
38533 depends on !M68K
38534 depends on ISA || PCI
38535 + depends on !GRKERNSEC_KMEM
38536 default y
38537
38538 source "drivers/s390/char/Kconfig"
38539 diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38540 index a48e05b..6bac831 100644
38541 --- a/drivers/char/agp/compat_ioctl.c
38542 +++ b/drivers/char/agp/compat_ioctl.c
38543 @@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38544 return -ENOMEM;
38545 }
38546
38547 - if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38548 + if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38549 sizeof(*usegment) * ureserve.seg_count)) {
38550 kfree(usegment);
38551 kfree(ksegment);
38552 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38553 index 09f17eb..8531d2f 100644
38554 --- a/drivers/char/agp/frontend.c
38555 +++ b/drivers/char/agp/frontend.c
38556 @@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38557 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38558 return -EFAULT;
38559
38560 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38561 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38562 return -EFAULT;
38563
38564 client = agp_find_client_by_pid(reserve.pid);
38565 @@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38566 if (segment == NULL)
38567 return -ENOMEM;
38568
38569 - if (copy_from_user(segment, (void __user *) reserve.seg_list,
38570 + if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38571 sizeof(struct agp_segment) * reserve.seg_count)) {
38572 kfree(segment);
38573 return -EFAULT;
38574 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38575 index 4f94375..413694e 100644
38576 --- a/drivers/char/genrtc.c
38577 +++ b/drivers/char/genrtc.c
38578 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38579 switch (cmd) {
38580
38581 case RTC_PLL_GET:
38582 + memset(&pll, 0, sizeof(pll));
38583 if (get_rtc_pll(&pll))
38584 return -EINVAL;
38585 else
38586 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38587 index d5d4cd8..22d561d 100644
38588 --- a/drivers/char/hpet.c
38589 +++ b/drivers/char/hpet.c
38590 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38591 }
38592
38593 static int
38594 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38595 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38596 struct hpet_info *info)
38597 {
38598 struct hpet_timer __iomem *timer;
38599 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38600 index f816211..89eadea 100644
38601 --- a/drivers/char/ipmi/ipmi_msghandler.c
38602 +++ b/drivers/char/ipmi/ipmi_msghandler.c
38603 @@ -438,7 +438,7 @@ struct ipmi_smi {
38604 struct proc_dir_entry *proc_dir;
38605 char proc_dir_name[10];
38606
38607 - atomic_t stats[IPMI_NUM_STATS];
38608 + atomic_unchecked_t stats[IPMI_NUM_STATS];
38609
38610 /*
38611 * run_to_completion duplicate of smb_info, smi_info
38612 @@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38613 static DEFINE_MUTEX(smi_watchers_mutex);
38614
38615 #define ipmi_inc_stat(intf, stat) \
38616 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38617 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38618 #define ipmi_get_stat(intf, stat) \
38619 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38620 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38621
38622 static int is_lan_addr(struct ipmi_addr *addr)
38623 {
38624 @@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38625 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38626 init_waitqueue_head(&intf->waitq);
38627 for (i = 0; i < IPMI_NUM_STATS; i++)
38628 - atomic_set(&intf->stats[i], 0);
38629 + atomic_set_unchecked(&intf->stats[i], 0);
38630
38631 intf->proc_dir = NULL;
38632
38633 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38634 index 5c4e1f6..0ea58f9 100644
38635 --- a/drivers/char/ipmi/ipmi_si_intf.c
38636 +++ b/drivers/char/ipmi/ipmi_si_intf.c
38637 @@ -285,7 +285,7 @@ struct smi_info {
38638 unsigned char slave_addr;
38639
38640 /* Counters and things for the proc filesystem. */
38641 - atomic_t stats[SI_NUM_STATS];
38642 + atomic_unchecked_t stats[SI_NUM_STATS];
38643
38644 struct task_struct *thread;
38645
38646 @@ -294,9 +294,9 @@ struct smi_info {
38647 };
38648
38649 #define smi_inc_stat(smi, stat) \
38650 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38651 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38652 #define smi_get_stat(smi, stat) \
38653 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38654 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38655
38656 #define SI_MAX_PARMS 4
38657
38658 @@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38659 atomic_set(&new_smi->req_events, 0);
38660 new_smi->run_to_completion = false;
38661 for (i = 0; i < SI_NUM_STATS; i++)
38662 - atomic_set(&new_smi->stats[i], 0);
38663 + atomic_set_unchecked(&new_smi->stats[i], 0);
38664
38665 new_smi->interrupt_disabled = true;
38666 atomic_set(&new_smi->stop_operation, 0);
38667 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38668 index 524b707..29d07c1 100644
38669 --- a/drivers/char/mem.c
38670 +++ b/drivers/char/mem.c
38671 @@ -18,6 +18,7 @@
38672 #include <linux/raw.h>
38673 #include <linux/tty.h>
38674 #include <linux/capability.h>
38675 +#include <linux/security.h>
38676 #include <linux/ptrace.h>
38677 #include <linux/device.h>
38678 #include <linux/highmem.h>
38679 @@ -36,6 +37,10 @@
38680
38681 #define DEVPORT_MINOR 4
38682
38683 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38684 +extern const struct file_operations grsec_fops;
38685 +#endif
38686 +
38687 static inline unsigned long size_inside_page(unsigned long start,
38688 unsigned long size)
38689 {
38690 @@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38691
38692 while (cursor < to) {
38693 if (!devmem_is_allowed(pfn)) {
38694 +#ifdef CONFIG_GRKERNSEC_KMEM
38695 + gr_handle_mem_readwrite(from, to);
38696 +#else
38697 printk(KERN_INFO
38698 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38699 current->comm, from, to);
38700 +#endif
38701 return 0;
38702 }
38703 cursor += PAGE_SIZE;
38704 @@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38705 }
38706 return 1;
38707 }
38708 +#elif defined(CONFIG_GRKERNSEC_KMEM)
38709 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38710 +{
38711 + return 0;
38712 +}
38713 #else
38714 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38715 {
38716 @@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38717
38718 while (count > 0) {
38719 unsigned long remaining;
38720 + char *temp;
38721
38722 sz = size_inside_page(p, count);
38723
38724 @@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38725 if (!ptr)
38726 return -EFAULT;
38727
38728 - remaining = copy_to_user(buf, ptr, sz);
38729 +#ifdef CONFIG_PAX_USERCOPY
38730 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38731 + if (!temp) {
38732 + unxlate_dev_mem_ptr(p, ptr);
38733 + return -ENOMEM;
38734 + }
38735 + memcpy(temp, ptr, sz);
38736 +#else
38737 + temp = ptr;
38738 +#endif
38739 +
38740 + remaining = copy_to_user(buf, temp, sz);
38741 +
38742 +#ifdef CONFIG_PAX_USERCOPY
38743 + kfree(temp);
38744 +#endif
38745 +
38746 unxlate_dev_mem_ptr(p, ptr);
38747 if (remaining)
38748 return -EFAULT;
38749 @@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38750 size_t count, loff_t *ppos)
38751 {
38752 unsigned long p = *ppos;
38753 - ssize_t low_count, read, sz;
38754 + ssize_t low_count, read, sz, err = 0;
38755 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38756 - int err = 0;
38757
38758 read = 0;
38759 if (p < (unsigned long) high_memory) {
38760 @@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38761 }
38762 #endif
38763 while (low_count > 0) {
38764 + char *temp;
38765 +
38766 sz = size_inside_page(p, low_count);
38767
38768 /*
38769 @@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38770 */
38771 kbuf = xlate_dev_kmem_ptr((char *)p);
38772
38773 - if (copy_to_user(buf, kbuf, sz))
38774 +#ifdef CONFIG_PAX_USERCOPY
38775 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38776 + if (!temp)
38777 + return -ENOMEM;
38778 + memcpy(temp, kbuf, sz);
38779 +#else
38780 + temp = kbuf;
38781 +#endif
38782 +
38783 + err = copy_to_user(buf, temp, sz);
38784 +
38785 +#ifdef CONFIG_PAX_USERCOPY
38786 + kfree(temp);
38787 +#endif
38788 +
38789 + if (err)
38790 return -EFAULT;
38791 buf += sz;
38792 p += sz;
38793 @@ -797,6 +844,9 @@ static const struct memdev {
38794 #ifdef CONFIG_PRINTK
38795 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38796 #endif
38797 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38798 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38799 +#endif
38800 };
38801
38802 static int memory_open(struct inode *inode, struct file *filp)
38803 @@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38804 continue;
38805
38806 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38807 - NULL, devlist[minor].name);
38808 + NULL, "%s", devlist[minor].name);
38809 }
38810
38811 return tty_init();
38812 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38813 index 9df78e2..01ba9ae 100644
38814 --- a/drivers/char/nvram.c
38815 +++ b/drivers/char/nvram.c
38816 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38817
38818 spin_unlock_irq(&rtc_lock);
38819
38820 - if (copy_to_user(buf, contents, tmp - contents))
38821 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38822 return -EFAULT;
38823
38824 *ppos = i;
38825 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38826 index 0ea9986..e7b07e4 100644
38827 --- a/drivers/char/pcmcia/synclink_cs.c
38828 +++ b/drivers/char/pcmcia/synclink_cs.c
38829 @@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38830
38831 if (debug_level >= DEBUG_LEVEL_INFO)
38832 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38833 - __FILE__, __LINE__, info->device_name, port->count);
38834 + __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38835
38836 if (tty_port_close_start(port, tty, filp) == 0)
38837 goto cleanup;
38838 @@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38839 cleanup:
38840 if (debug_level >= DEBUG_LEVEL_INFO)
38841 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38842 - tty->driver->name, port->count);
38843 + tty->driver->name, atomic_read(&port->count));
38844 }
38845
38846 /* Wait until the transmitter is empty.
38847 @@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38848
38849 if (debug_level >= DEBUG_LEVEL_INFO)
38850 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38851 - __FILE__, __LINE__, tty->driver->name, port->count);
38852 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38853
38854 /* If port is closing, signal caller to try again */
38855 if (port->flags & ASYNC_CLOSING){
38856 @@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38857 goto cleanup;
38858 }
38859 spin_lock(&port->lock);
38860 - port->count++;
38861 + atomic_inc(&port->count);
38862 spin_unlock(&port->lock);
38863 spin_unlock_irqrestore(&info->netlock, flags);
38864
38865 - if (port->count == 1) {
38866 + if (atomic_read(&port->count) == 1) {
38867 /* 1st open on this device, init hardware */
38868 retval = startup(info, tty);
38869 if (retval < 0)
38870 @@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38871 unsigned short new_crctype;
38872
38873 /* return error if TTY interface open */
38874 - if (info->port.count)
38875 + if (atomic_read(&info->port.count))
38876 return -EBUSY;
38877
38878 switch (encoding)
38879 @@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38880
38881 /* arbitrate between network and tty opens */
38882 spin_lock_irqsave(&info->netlock, flags);
38883 - if (info->port.count != 0 || info->netcount != 0) {
38884 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38885 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38886 spin_unlock_irqrestore(&info->netlock, flags);
38887 return -EBUSY;
38888 @@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38889 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38890
38891 /* return error if TTY interface open */
38892 - if (info->port.count)
38893 + if (atomic_read(&info->port.count))
38894 return -EBUSY;
38895
38896 if (cmd != SIOCWANDEV)
38897 diff --git a/drivers/char/random.c b/drivers/char/random.c
38898 index 04645c0..560e350 100644
38899 --- a/drivers/char/random.c
38900 +++ b/drivers/char/random.c
38901 @@ -289,9 +289,6 @@
38902 /*
38903 * To allow fractional bits to be tracked, the entropy_count field is
38904 * denominated in units of 1/8th bits.
38905 - *
38906 - * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38907 - * credit_entropy_bits() needs to be 64 bits wide.
38908 */
38909 #define ENTROPY_SHIFT 3
38910 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38911 @@ -439,9 +436,9 @@ struct entropy_store {
38912 };
38913
38914 static void push_to_pool(struct work_struct *work);
38915 -static __u32 input_pool_data[INPUT_POOL_WORDS];
38916 -static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38917 -static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38918 +static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38919 +static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38920 +static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38921
38922 static struct entropy_store input_pool = {
38923 .poolinfo = &poolinfo_table[0],
38924 @@ -635,7 +632,7 @@ retry:
38925 /* The +2 corresponds to the /4 in the denominator */
38926
38927 do {
38928 - unsigned int anfrac = min(pnfrac, pool_size/2);
38929 + u64 anfrac = min(pnfrac, pool_size/2);
38930 unsigned int add =
38931 ((pool_size - entropy_count)*anfrac*3) >> s;
38932
38933 @@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38934
38935 extract_buf(r, tmp);
38936 i = min_t(int, nbytes, EXTRACT_SIZE);
38937 - if (copy_to_user(buf, tmp, i)) {
38938 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38939 ret = -EFAULT;
38940 break;
38941 }
38942 @@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38943 static int proc_do_uuid(struct ctl_table *table, int write,
38944 void __user *buffer, size_t *lenp, loff_t *ppos)
38945 {
38946 - struct ctl_table fake_table;
38947 + ctl_table_no_const fake_table;
38948 unsigned char buf[64], tmp_uuid[16], *uuid;
38949
38950 uuid = table->data;
38951 @@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38952 static int proc_do_entropy(struct ctl_table *table, int write,
38953 void __user *buffer, size_t *lenp, loff_t *ppos)
38954 {
38955 - struct ctl_table fake_table;
38956 + ctl_table_no_const fake_table;
38957 int entropy_count;
38958
38959 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38960 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38961 index 7cc1fe22..b602d6b 100644
38962 --- a/drivers/char/sonypi.c
38963 +++ b/drivers/char/sonypi.c
38964 @@ -54,6 +54,7 @@
38965
38966 #include <asm/uaccess.h>
38967 #include <asm/io.h>
38968 +#include <asm/local.h>
38969
38970 #include <linux/sonypi.h>
38971
38972 @@ -490,7 +491,7 @@ static struct sonypi_device {
38973 spinlock_t fifo_lock;
38974 wait_queue_head_t fifo_proc_list;
38975 struct fasync_struct *fifo_async;
38976 - int open_count;
38977 + local_t open_count;
38978 int model;
38979 struct input_dev *input_jog_dev;
38980 struct input_dev *input_key_dev;
38981 @@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38982 static int sonypi_misc_release(struct inode *inode, struct file *file)
38983 {
38984 mutex_lock(&sonypi_device.lock);
38985 - sonypi_device.open_count--;
38986 + local_dec(&sonypi_device.open_count);
38987 mutex_unlock(&sonypi_device.lock);
38988 return 0;
38989 }
38990 @@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38991 {
38992 mutex_lock(&sonypi_device.lock);
38993 /* Flush input queue on first open */
38994 - if (!sonypi_device.open_count)
38995 + if (!local_read(&sonypi_device.open_count))
38996 kfifo_reset(&sonypi_device.fifo);
38997 - sonypi_device.open_count++;
38998 + local_inc(&sonypi_device.open_count);
38999 mutex_unlock(&sonypi_device.lock);
39000
39001 return 0;
39002 diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39003 index 565a947..dcdc06e 100644
39004 --- a/drivers/char/tpm/tpm_acpi.c
39005 +++ b/drivers/char/tpm/tpm_acpi.c
39006 @@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39007 virt = acpi_os_map_iomem(start, len);
39008 if (!virt) {
39009 kfree(log->bios_event_log);
39010 + log->bios_event_log = NULL;
39011 printk("%s: ERROR - Unable to map memory\n", __func__);
39012 return -EIO;
39013 }
39014
39015 - memcpy_fromio(log->bios_event_log, virt, len);
39016 + memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39017
39018 acpi_os_unmap_iomem(virt, len);
39019 return 0;
39020 diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39021 index 3a56a13..f8cbd25 100644
39022 --- a/drivers/char/tpm/tpm_eventlog.c
39023 +++ b/drivers/char/tpm/tpm_eventlog.c
39024 @@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39025 event = addr;
39026
39027 if ((event->event_type == 0 && event->event_size == 0) ||
39028 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39029 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39030 return NULL;
39031
39032 return addr;
39033 @@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39034 return NULL;
39035
39036 if ((event->event_type == 0 && event->event_size == 0) ||
39037 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39038 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39039 return NULL;
39040
39041 (*pos)++;
39042 @@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39043 int i;
39044
39045 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39046 - seq_putc(m, data[i]);
39047 + if (!seq_putc(m, data[i]))
39048 + return -EFAULT;
39049
39050 return 0;
39051 }
39052 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39053 index cf7a561..c319ce0 100644
39054 --- a/drivers/char/virtio_console.c
39055 +++ b/drivers/char/virtio_console.c
39056 @@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39057 if (to_user) {
39058 ssize_t ret;
39059
39060 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39061 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39062 if (ret)
39063 return -EFAULT;
39064 } else {
39065 @@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39066 if (!port_has_data(port) && !port->host_connected)
39067 return 0;
39068
39069 - return fill_readbuf(port, ubuf, count, true);
39070 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39071 }
39072
39073 static int wait_port_writable(struct port *port, bool nonblock)
39074 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39075 index b9355da..9611f4e 100644
39076 --- a/drivers/clk/clk-composite.c
39077 +++ b/drivers/clk/clk-composite.c
39078 @@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39079 struct clk *clk;
39080 struct clk_init_data init;
39081 struct clk_composite *composite;
39082 - struct clk_ops *clk_composite_ops;
39083 + clk_ops_no_const *clk_composite_ops;
39084
39085 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39086 if (!composite) {
39087 diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39088 index dd3a78c..386d49c 100644
39089 --- a/drivers/clk/socfpga/clk-gate.c
39090 +++ b/drivers/clk/socfpga/clk-gate.c
39091 @@ -22,6 +22,7 @@
39092 #include <linux/mfd/syscon.h>
39093 #include <linux/of.h>
39094 #include <linux/regmap.h>
39095 +#include <asm/pgtable.h>
39096
39097 #include "clk.h"
39098
39099 @@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39100 return 0;
39101 }
39102
39103 -static struct clk_ops gateclk_ops = {
39104 +static clk_ops_no_const gateclk_ops __read_only = {
39105 .prepare = socfpga_clk_prepare,
39106 .recalc_rate = socfpga_clk_recalc_rate,
39107 .get_parent = socfpga_clk_get_parent,
39108 @@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39109 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39110 socfpga_clk->hw.bit_idx = clk_gate[1];
39111
39112 - gateclk_ops.enable = clk_gate_ops.enable;
39113 - gateclk_ops.disable = clk_gate_ops.disable;
39114 + pax_open_kernel();
39115 + *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39116 + *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39117 + pax_close_kernel();
39118 }
39119
39120 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39121 diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39122 index de6da95..c98278b 100644
39123 --- a/drivers/clk/socfpga/clk-pll.c
39124 +++ b/drivers/clk/socfpga/clk-pll.c
39125 @@ -21,6 +21,7 @@
39126 #include <linux/io.h>
39127 #include <linux/of.h>
39128 #include <linux/of_address.h>
39129 +#include <asm/pgtable.h>
39130
39131 #include "clk.h"
39132
39133 @@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39134 CLK_MGR_PLL_CLK_SRC_MASK;
39135 }
39136
39137 -static struct clk_ops clk_pll_ops = {
39138 +static clk_ops_no_const clk_pll_ops __read_only = {
39139 .recalc_rate = clk_pll_recalc_rate,
39140 .get_parent = clk_pll_get_parent,
39141 };
39142 @@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39143 pll_clk->hw.hw.init = &init;
39144
39145 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39146 - clk_pll_ops.enable = clk_gate_ops.enable;
39147 - clk_pll_ops.disable = clk_gate_ops.disable;
39148 + pax_open_kernel();
39149 + *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39150 + *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39151 + pax_close_kernel();
39152
39153 clk = clk_register(NULL, &pll_clk->hw.hw);
39154 if (WARN_ON(IS_ERR(clk))) {
39155 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39156 index b0c18ed..1713a80 100644
39157 --- a/drivers/cpufreq/acpi-cpufreq.c
39158 +++ b/drivers/cpufreq/acpi-cpufreq.c
39159 @@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39160 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39161 per_cpu(acfreq_data, cpu) = data;
39162
39163 - if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39164 - acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39165 + if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39166 + pax_open_kernel();
39167 + *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39168 + pax_close_kernel();
39169 + }
39170
39171 result = acpi_processor_register_performance(data->acpi_data, cpu);
39172 if (result)
39173 @@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39174 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39175 break;
39176 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39177 - acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39178 + pax_open_kernel();
39179 + *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39180 + pax_close_kernel();
39181 break;
39182 default:
39183 break;
39184 @@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39185 if (!msrs)
39186 return;
39187
39188 - acpi_cpufreq_driver.boost_supported = true;
39189 - acpi_cpufreq_driver.boost_enabled = boost_state(0);
39190 + pax_open_kernel();
39191 + *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39192 + *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39193 + pax_close_kernel();
39194
39195 cpu_notifier_register_begin();
39196
39197 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39198 index f657c57..31d97ae 100644
39199 --- a/drivers/cpufreq/cpufreq-dt.c
39200 +++ b/drivers/cpufreq/cpufreq-dt.c
39201 @@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39202 if (!IS_ERR(cpu_reg))
39203 regulator_put(cpu_reg);
39204
39205 - dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39206 + pax_open_kernel();
39207 + *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39208 + pax_close_kernel();
39209
39210 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39211 if (ret)
39212 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39213 index 4473eba..a4c9dc2 100644
39214 --- a/drivers/cpufreq/cpufreq.c
39215 +++ b/drivers/cpufreq/cpufreq.c
39216 @@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39217 }
39218
39219 mutex_lock(&cpufreq_governor_mutex);
39220 - list_del(&governor->governor_list);
39221 + pax_list_del(&governor->governor_list);
39222 mutex_unlock(&cpufreq_governor_mutex);
39223 return;
39224 }
39225 @@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39226 return NOTIFY_OK;
39227 }
39228
39229 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
39230 +static struct notifier_block cpufreq_cpu_notifier = {
39231 .notifier_call = cpufreq_cpu_callback,
39232 };
39233
39234 @@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39235 return 0;
39236
39237 write_lock_irqsave(&cpufreq_driver_lock, flags);
39238 - cpufreq_driver->boost_enabled = state;
39239 + pax_open_kernel();
39240 + *(bool *)&cpufreq_driver->boost_enabled = state;
39241 + pax_close_kernel();
39242 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39243
39244 ret = cpufreq_driver->set_boost(state);
39245 if (ret) {
39246 write_lock_irqsave(&cpufreq_driver_lock, flags);
39247 - cpufreq_driver->boost_enabled = !state;
39248 + pax_open_kernel();
39249 + *(bool *)&cpufreq_driver->boost_enabled = !state;
39250 + pax_close_kernel();
39251 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39252
39253 pr_err("%s: Cannot %s BOOST\n",
39254 @@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39255
39256 pr_debug("trying to register driver %s\n", driver_data->name);
39257
39258 - if (driver_data->setpolicy)
39259 - driver_data->flags |= CPUFREQ_CONST_LOOPS;
39260 + if (driver_data->setpolicy) {
39261 + pax_open_kernel();
39262 + *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39263 + pax_close_kernel();
39264 + }
39265
39266 write_lock_irqsave(&cpufreq_driver_lock, flags);
39267 if (cpufreq_driver) {
39268 @@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39269 * Check if driver provides function to enable boost -
39270 * if not, use cpufreq_boost_set_sw as default
39271 */
39272 - if (!cpufreq_driver->set_boost)
39273 - cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39274 + if (!cpufreq_driver->set_boost) {
39275 + pax_open_kernel();
39276 + *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39277 + pax_close_kernel();
39278 + }
39279
39280 ret = cpufreq_sysfs_create_file(&boost.attr);
39281 if (ret) {
39282 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39283 index 1b44496..b80ff5e 100644
39284 --- a/drivers/cpufreq/cpufreq_governor.c
39285 +++ b/drivers/cpufreq/cpufreq_governor.c
39286 @@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39287 struct dbs_data *dbs_data;
39288 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39289 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39290 - struct od_ops *od_ops = NULL;
39291 + const struct od_ops *od_ops = NULL;
39292 struct od_dbs_tuners *od_tuners = NULL;
39293 struct cs_dbs_tuners *cs_tuners = NULL;
39294 struct cpu_dbs_common_info *cpu_cdbs;
39295 @@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39296
39297 if ((cdata->governor == GOV_CONSERVATIVE) &&
39298 (!policy->governor->initialized)) {
39299 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39300 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39301
39302 cpufreq_register_notifier(cs_ops->notifier_block,
39303 CPUFREQ_TRANSITION_NOTIFIER);
39304 @@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39305
39306 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39307 (policy->governor->initialized == 1)) {
39308 - struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39309 + const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39310
39311 cpufreq_unregister_notifier(cs_ops->notifier_block,
39312 CPUFREQ_TRANSITION_NOTIFIER);
39313 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39314 index cc401d1..8197340 100644
39315 --- a/drivers/cpufreq/cpufreq_governor.h
39316 +++ b/drivers/cpufreq/cpufreq_governor.h
39317 @@ -212,7 +212,7 @@ struct common_dbs_data {
39318 void (*exit)(struct dbs_data *dbs_data);
39319
39320 /* Governor specific ops, see below */
39321 - void *gov_ops;
39322 + const void *gov_ops;
39323 };
39324
39325 /* Governor Per policy data */
39326 @@ -232,7 +232,7 @@ struct od_ops {
39327 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39328 unsigned int freq_next, unsigned int relation);
39329 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39330 -};
39331 +} __no_const;
39332
39333 struct cs_ops {
39334 struct notifier_block *notifier_block;
39335 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39336 index ad3f38f..8f086cd 100644
39337 --- a/drivers/cpufreq/cpufreq_ondemand.c
39338 +++ b/drivers/cpufreq/cpufreq_ondemand.c
39339 @@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39340
39341 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39342
39343 -static struct od_ops od_ops = {
39344 +static struct od_ops od_ops __read_only = {
39345 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39346 .powersave_bias_target = generic_powersave_bias_target,
39347 .freq_increase = dbs_freq_increase,
39348 @@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39349 (struct cpufreq_policy *, unsigned int, unsigned int),
39350 unsigned int powersave_bias)
39351 {
39352 - od_ops.powersave_bias_target = f;
39353 + pax_open_kernel();
39354 + *(void **)&od_ops.powersave_bias_target = f;
39355 + pax_close_kernel();
39356 od_set_powersave_bias(powersave_bias);
39357 }
39358 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39359
39360 void od_unregister_powersave_bias_handler(void)
39361 {
39362 - od_ops.powersave_bias_target = generic_powersave_bias_target;
39363 + pax_open_kernel();
39364 + *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39365 + pax_close_kernel();
39366 od_set_powersave_bias(0);
39367 }
39368 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39369 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39370 index 27bb6d3..4cf595c 100644
39371 --- a/drivers/cpufreq/intel_pstate.c
39372 +++ b/drivers/cpufreq/intel_pstate.c
39373 @@ -133,10 +133,10 @@ struct pstate_funcs {
39374 struct cpu_defaults {
39375 struct pstate_adjust_policy pid_policy;
39376 struct pstate_funcs funcs;
39377 -};
39378 +} __do_const;
39379
39380 static struct pstate_adjust_policy pid_params;
39381 -static struct pstate_funcs pstate_funcs;
39382 +static struct pstate_funcs *pstate_funcs;
39383
39384 struct perf_limits {
39385 int no_turbo;
39386 @@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39387
39388 cpu->pstate.current_pstate = pstate;
39389
39390 - pstate_funcs.set(cpu, pstate);
39391 + pstate_funcs->set(cpu, pstate);
39392 }
39393
39394 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39395 {
39396 - cpu->pstate.min_pstate = pstate_funcs.get_min();
39397 - cpu->pstate.max_pstate = pstate_funcs.get_max();
39398 - cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39399 - cpu->pstate.scaling = pstate_funcs.get_scaling();
39400 + cpu->pstate.min_pstate = pstate_funcs->get_min();
39401 + cpu->pstate.max_pstate = pstate_funcs->get_max();
39402 + cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39403 + cpu->pstate.scaling = pstate_funcs->get_scaling();
39404
39405 - if (pstate_funcs.get_vid)
39406 - pstate_funcs.get_vid(cpu);
39407 + if (pstate_funcs->get_vid)
39408 + pstate_funcs->get_vid(cpu);
39409 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39410 }
39411
39412 @@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39413 rdmsrl(MSR_IA32_APERF, aperf);
39414 rdmsrl(MSR_IA32_MPERF, mperf);
39415
39416 - if (!pstate_funcs.get_max() ||
39417 - !pstate_funcs.get_min() ||
39418 - !pstate_funcs.get_turbo())
39419 + if (!pstate_funcs->get_max() ||
39420 + !pstate_funcs->get_min() ||
39421 + !pstate_funcs->get_turbo())
39422 return -ENODEV;
39423
39424 rdmsrl(MSR_IA32_APERF, tmp);
39425 @@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39426 return 0;
39427 }
39428
39429 -static void copy_pid_params(struct pstate_adjust_policy *policy)
39430 +static void copy_pid_params(const struct pstate_adjust_policy *policy)
39431 {
39432 pid_params.sample_rate_ms = policy->sample_rate_ms;
39433 pid_params.p_gain_pct = policy->p_gain_pct;
39434 @@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39435
39436 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39437 {
39438 - pstate_funcs.get_max = funcs->get_max;
39439 - pstate_funcs.get_min = funcs->get_min;
39440 - pstate_funcs.get_turbo = funcs->get_turbo;
39441 - pstate_funcs.get_scaling = funcs->get_scaling;
39442 - pstate_funcs.set = funcs->set;
39443 - pstate_funcs.get_vid = funcs->get_vid;
39444 + pstate_funcs = funcs;
39445 }
39446
39447 #if IS_ENABLED(CONFIG_ACPI)
39448 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39449 index 529cfd9..0e28fff 100644
39450 --- a/drivers/cpufreq/p4-clockmod.c
39451 +++ b/drivers/cpufreq/p4-clockmod.c
39452 @@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39453 case 0x0F: /* Core Duo */
39454 case 0x16: /* Celeron Core */
39455 case 0x1C: /* Atom */
39456 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39457 + pax_open_kernel();
39458 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39459 + pax_close_kernel();
39460 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39461 case 0x0D: /* Pentium M (Dothan) */
39462 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39463 + pax_open_kernel();
39464 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39465 + pax_close_kernel();
39466 /* fall through */
39467 case 0x09: /* Pentium M (Banias) */
39468 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39469 @@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39470
39471 /* on P-4s, the TSC runs with constant frequency independent whether
39472 * throttling is active or not. */
39473 - p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39474 + pax_open_kernel();
39475 + *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39476 + pax_close_kernel();
39477
39478 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39479 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39480 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39481 index 9bb42ba..b01b4a2 100644
39482 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
39483 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39484 @@ -18,14 +18,12 @@
39485 #include <asm/head.h>
39486 #include <asm/timer.h>
39487
39488 -static struct cpufreq_driver *cpufreq_us3_driver;
39489 -
39490 struct us3_freq_percpu_info {
39491 struct cpufreq_frequency_table table[4];
39492 };
39493
39494 /* Indexed by cpu number. */
39495 -static struct us3_freq_percpu_info *us3_freq_table;
39496 +static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39497
39498 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39499 * in the Safari config register.
39500 @@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39501
39502 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39503 {
39504 - if (cpufreq_us3_driver)
39505 - us3_freq_target(policy, 0);
39506 + us3_freq_target(policy, 0);
39507
39508 return 0;
39509 }
39510
39511 +static int __init us3_freq_init(void);
39512 +static void __exit us3_freq_exit(void);
39513 +
39514 +static struct cpufreq_driver cpufreq_us3_driver = {
39515 + .init = us3_freq_cpu_init,
39516 + .verify = cpufreq_generic_frequency_table_verify,
39517 + .target_index = us3_freq_target,
39518 + .get = us3_freq_get,
39519 + .exit = us3_freq_cpu_exit,
39520 + .name = "UltraSPARC-III",
39521 +
39522 +};
39523 +
39524 static int __init us3_freq_init(void)
39525 {
39526 unsigned long manuf, impl, ver;
39527 - int ret;
39528
39529 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39530 return -ENODEV;
39531 @@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39532 (impl == CHEETAH_IMPL ||
39533 impl == CHEETAH_PLUS_IMPL ||
39534 impl == JAGUAR_IMPL ||
39535 - impl == PANTHER_IMPL)) {
39536 - struct cpufreq_driver *driver;
39537 -
39538 - ret = -ENOMEM;
39539 - driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39540 - if (!driver)
39541 - goto err_out;
39542 -
39543 - us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39544 - GFP_KERNEL);
39545 - if (!us3_freq_table)
39546 - goto err_out;
39547 -
39548 - driver->init = us3_freq_cpu_init;
39549 - driver->verify = cpufreq_generic_frequency_table_verify;
39550 - driver->target_index = us3_freq_target;
39551 - driver->get = us3_freq_get;
39552 - driver->exit = us3_freq_cpu_exit;
39553 - strcpy(driver->name, "UltraSPARC-III");
39554 -
39555 - cpufreq_us3_driver = driver;
39556 - ret = cpufreq_register_driver(driver);
39557 - if (ret)
39558 - goto err_out;
39559 -
39560 - return 0;
39561 -
39562 -err_out:
39563 - if (driver) {
39564 - kfree(driver);
39565 - cpufreq_us3_driver = NULL;
39566 - }
39567 - kfree(us3_freq_table);
39568 - us3_freq_table = NULL;
39569 - return ret;
39570 - }
39571 + impl == PANTHER_IMPL))
39572 + return cpufreq_register_driver(&cpufreq_us3_driver);
39573
39574 return -ENODEV;
39575 }
39576
39577 static void __exit us3_freq_exit(void)
39578 {
39579 - if (cpufreq_us3_driver) {
39580 - cpufreq_unregister_driver(cpufreq_us3_driver);
39581 - kfree(cpufreq_us3_driver);
39582 - cpufreq_us3_driver = NULL;
39583 - kfree(us3_freq_table);
39584 - us3_freq_table = NULL;
39585 - }
39586 + cpufreq_unregister_driver(&cpufreq_us3_driver);
39587 }
39588
39589 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39590 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39591 index 7d4a315..21bb886 100644
39592 --- a/drivers/cpufreq/speedstep-centrino.c
39593 +++ b/drivers/cpufreq/speedstep-centrino.c
39594 @@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39595 !cpu_has(cpu, X86_FEATURE_EST))
39596 return -ENODEV;
39597
39598 - if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39599 - centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39600 + if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39601 + pax_open_kernel();
39602 + *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39603 + pax_close_kernel();
39604 + }
39605
39606 if (policy->cpu != 0)
39607 return -ENODEV;
39608 diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39609 index e431d11..d0b997e 100644
39610 --- a/drivers/cpuidle/driver.c
39611 +++ b/drivers/cpuidle/driver.c
39612 @@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39613
39614 static void poll_idle_init(struct cpuidle_driver *drv)
39615 {
39616 - struct cpuidle_state *state = &drv->states[0];
39617 + cpuidle_state_no_const *state = &drv->states[0];
39618
39619 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39620 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39621 diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39622 index fb9f511..213e6cc 100644
39623 --- a/drivers/cpuidle/governor.c
39624 +++ b/drivers/cpuidle/governor.c
39625 @@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39626 mutex_lock(&cpuidle_lock);
39627 if (__cpuidle_find_governor(gov->name) == NULL) {
39628 ret = 0;
39629 - list_add_tail(&gov->governor_list, &cpuidle_governors);
39630 + pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39631 if (!cpuidle_curr_governor ||
39632 cpuidle_curr_governor->rating < gov->rating)
39633 cpuidle_switch_governor(gov);
39634 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39635 index 97c5903..023ad23 100644
39636 --- a/drivers/cpuidle/sysfs.c
39637 +++ b/drivers/cpuidle/sysfs.c
39638 @@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39639 NULL
39640 };
39641
39642 -static struct attribute_group cpuidle_attr_group = {
39643 +static attribute_group_no_const cpuidle_attr_group = {
39644 .attrs = cpuidle_default_attrs,
39645 .name = "cpuidle",
39646 };
39647 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39648 index 8d2a772..33826c9 100644
39649 --- a/drivers/crypto/hifn_795x.c
39650 +++ b/drivers/crypto/hifn_795x.c
39651 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39652 MODULE_PARM_DESC(hifn_pll_ref,
39653 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39654
39655 -static atomic_t hifn_dev_number;
39656 +static atomic_unchecked_t hifn_dev_number;
39657
39658 #define ACRYPTO_OP_DECRYPT 0
39659 #define ACRYPTO_OP_ENCRYPT 1
39660 @@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39661 goto err_out_disable_pci_device;
39662
39663 snprintf(name, sizeof(name), "hifn%d",
39664 - atomic_inc_return(&hifn_dev_number)-1);
39665 + atomic_inc_return_unchecked(&hifn_dev_number)-1);
39666
39667 err = pci_request_regions(pdev, name);
39668 if (err)
39669 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39670 index 30b538d8..1610d75 100644
39671 --- a/drivers/devfreq/devfreq.c
39672 +++ b/drivers/devfreq/devfreq.c
39673 @@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39674 goto err_out;
39675 }
39676
39677 - list_add(&governor->node, &devfreq_governor_list);
39678 + pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39679
39680 list_for_each_entry(devfreq, &devfreq_list, node) {
39681 int ret = 0;
39682 @@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39683 }
39684 }
39685
39686 - list_del(&governor->node);
39687 + pax_list_del((struct list_head *)&governor->node);
39688 err_out:
39689 mutex_unlock(&devfreq_list_lock);
39690
39691 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39692 index 42d4974..2714f36 100644
39693 --- a/drivers/dma/sh/shdma-base.c
39694 +++ b/drivers/dma/sh/shdma-base.c
39695 @@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39696 schan->slave_id = -EINVAL;
39697 }
39698
39699 - schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39700 - sdev->desc_size, GFP_KERNEL);
39701 + schan->desc = kcalloc(sdev->desc_size,
39702 + NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39703 if (!schan->desc) {
39704 ret = -ENOMEM;
39705 goto edescalloc;
39706 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39707 index 58eb857..d7e42c8 100644
39708 --- a/drivers/dma/sh/shdmac.c
39709 +++ b/drivers/dma/sh/shdmac.c
39710 @@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39711 return ret;
39712 }
39713
39714 -static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39715 +static struct notifier_block sh_dmae_nmi_notifier = {
39716 .notifier_call = sh_dmae_nmi_handler,
39717
39718 /* Run before NMI debug handler and KGDB */
39719 diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39720 index 592af5f..bb1d583 100644
39721 --- a/drivers/edac/edac_device.c
39722 +++ b/drivers/edac/edac_device.c
39723 @@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39724 */
39725 int edac_device_alloc_index(void)
39726 {
39727 - static atomic_t device_indexes = ATOMIC_INIT(0);
39728 + static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39729
39730 - return atomic_inc_return(&device_indexes) - 1;
39731 + return atomic_inc_return_unchecked(&device_indexes) - 1;
39732 }
39733 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39734
39735 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39736 index a6cd361..7bdbf53 100644
39737 --- a/drivers/edac/edac_mc_sysfs.c
39738 +++ b/drivers/edac/edac_mc_sysfs.c
39739 @@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39740 struct dev_ch_attribute {
39741 struct device_attribute attr;
39742 int channel;
39743 -};
39744 +} __do_const;
39745
39746 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39747 struct dev_ch_attribute dev_attr_legacy_##_name = \
39748 @@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39749 }
39750
39751 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39752 + pax_open_kernel();
39753 if (mci->get_sdram_scrub_rate) {
39754 - dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39755 - dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39756 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39757 + *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39758 }
39759 if (mci->set_sdram_scrub_rate) {
39760 - dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39761 - dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39762 + *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39763 + *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39764 }
39765 + pax_close_kernel();
39766 err = device_create_file(&mci->dev,
39767 &dev_attr_sdram_scrub_rate);
39768 if (err) {
39769 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39770 index 2cf44b4d..6dd2dc7 100644
39771 --- a/drivers/edac/edac_pci.c
39772 +++ b/drivers/edac/edac_pci.c
39773 @@ -29,7 +29,7 @@
39774
39775 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39776 static LIST_HEAD(edac_pci_list);
39777 -static atomic_t pci_indexes = ATOMIC_INIT(0);
39778 +static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39779
39780 /*
39781 * edac_pci_alloc_ctl_info
39782 @@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39783 */
39784 int edac_pci_alloc_index(void)
39785 {
39786 - return atomic_inc_return(&pci_indexes) - 1;
39787 + return atomic_inc_return_unchecked(&pci_indexes) - 1;
39788 }
39789 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39790
39791 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39792 index e8658e4..22746d6 100644
39793 --- a/drivers/edac/edac_pci_sysfs.c
39794 +++ b/drivers/edac/edac_pci_sysfs.c
39795 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39796 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39797 static int edac_pci_poll_msec = 1000; /* one second workq period */
39798
39799 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
39800 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39801 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39802 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39803
39804 static struct kobject *edac_pci_top_main_kobj;
39805 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39806 @@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39807 void *value;
39808 ssize_t(*show) (void *, char *);
39809 ssize_t(*store) (void *, const char *, size_t);
39810 -};
39811 +} __do_const;
39812
39813 /* Set of show/store abstract level functions for PCI Parity object */
39814 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39815 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39816 edac_printk(KERN_CRIT, EDAC_PCI,
39817 "Signaled System Error on %s\n",
39818 pci_name(dev));
39819 - atomic_inc(&pci_nonparity_count);
39820 + atomic_inc_unchecked(&pci_nonparity_count);
39821 }
39822
39823 if (status & (PCI_STATUS_PARITY)) {
39824 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39825 "Master Data Parity Error on %s\n",
39826 pci_name(dev));
39827
39828 - atomic_inc(&pci_parity_count);
39829 + atomic_inc_unchecked(&pci_parity_count);
39830 }
39831
39832 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39833 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39834 "Detected Parity Error on %s\n",
39835 pci_name(dev));
39836
39837 - atomic_inc(&pci_parity_count);
39838 + atomic_inc_unchecked(&pci_parity_count);
39839 }
39840 }
39841
39842 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39843 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39844 "Signaled System Error on %s\n",
39845 pci_name(dev));
39846 - atomic_inc(&pci_nonparity_count);
39847 + atomic_inc_unchecked(&pci_nonparity_count);
39848 }
39849
39850 if (status & (PCI_STATUS_PARITY)) {
39851 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39852 "Master Data Parity Error on "
39853 "%s\n", pci_name(dev));
39854
39855 - atomic_inc(&pci_parity_count);
39856 + atomic_inc_unchecked(&pci_parity_count);
39857 }
39858
39859 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39860 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39861 "Detected Parity Error on %s\n",
39862 pci_name(dev));
39863
39864 - atomic_inc(&pci_parity_count);
39865 + atomic_inc_unchecked(&pci_parity_count);
39866 }
39867 }
39868 }
39869 @@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39870 if (!check_pci_errors)
39871 return;
39872
39873 - before_count = atomic_read(&pci_parity_count);
39874 + before_count = atomic_read_unchecked(&pci_parity_count);
39875
39876 /* scan all PCI devices looking for a Parity Error on devices and
39877 * bridges.
39878 @@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39879 /* Only if operator has selected panic on PCI Error */
39880 if (edac_pci_get_panic_on_pe()) {
39881 /* If the count is different 'after' from 'before' */
39882 - if (before_count != atomic_read(&pci_parity_count))
39883 + if (before_count != atomic_read_unchecked(&pci_parity_count))
39884 panic("EDAC: PCI Parity Error");
39885 }
39886 }
39887 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39888 index 51b7e3a..aa8a3e8 100644
39889 --- a/drivers/edac/mce_amd.h
39890 +++ b/drivers/edac/mce_amd.h
39891 @@ -77,7 +77,7 @@ struct amd_decoder_ops {
39892 bool (*mc0_mce)(u16, u8);
39893 bool (*mc1_mce)(u16, u8);
39894 bool (*mc2_mce)(u16, u8);
39895 -};
39896 +} __no_const;
39897
39898 void amd_report_gart_errors(bool);
39899 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39900 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39901 index 57ea7f4..af06b76 100644
39902 --- a/drivers/firewire/core-card.c
39903 +++ b/drivers/firewire/core-card.c
39904 @@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39905 const struct fw_card_driver *driver,
39906 struct device *device)
39907 {
39908 - static atomic_t index = ATOMIC_INIT(-1);
39909 + static atomic_unchecked_t index = ATOMIC_INIT(-1);
39910
39911 - card->index = atomic_inc_return(&index);
39912 + card->index = atomic_inc_return_unchecked(&index);
39913 card->driver = driver;
39914 card->device = device;
39915 card->current_tlabel = 0;
39916 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39917
39918 void fw_core_remove_card(struct fw_card *card)
39919 {
39920 - struct fw_card_driver dummy_driver = dummy_driver_template;
39921 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
39922
39923 card->driver->update_phy_reg(card, 4,
39924 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39925 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39926 index 2c6d5e1..a2cca6b 100644
39927 --- a/drivers/firewire/core-device.c
39928 +++ b/drivers/firewire/core-device.c
39929 @@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39930 struct config_rom_attribute {
39931 struct device_attribute attr;
39932 u32 key;
39933 -};
39934 +} __do_const;
39935
39936 static ssize_t show_immediate(struct device *dev,
39937 struct device_attribute *dattr, char *buf)
39938 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39939 index eb6935c..3cc2bfa 100644
39940 --- a/drivers/firewire/core-transaction.c
39941 +++ b/drivers/firewire/core-transaction.c
39942 @@ -38,6 +38,7 @@
39943 #include <linux/timer.h>
39944 #include <linux/types.h>
39945 #include <linux/workqueue.h>
39946 +#include <linux/sched.h>
39947
39948 #include <asm/byteorder.h>
39949
39950 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39951 index e1480ff6..1a429bd 100644
39952 --- a/drivers/firewire/core.h
39953 +++ b/drivers/firewire/core.h
39954 @@ -111,6 +111,7 @@ struct fw_card_driver {
39955
39956 int (*stop_iso)(struct fw_iso_context *ctx);
39957 };
39958 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39959
39960 void fw_card_initialize(struct fw_card *card,
39961 const struct fw_card_driver *driver, struct device *device);
39962 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39963 index a66a321..f6caf20 100644
39964 --- a/drivers/firewire/ohci.c
39965 +++ b/drivers/firewire/ohci.c
39966 @@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
39967 be32_to_cpu(ohci->next_header));
39968 }
39969
39970 +#ifndef CONFIG_GRKERNSEC
39971 if (param_remote_dma) {
39972 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39973 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39974 }
39975 +#endif
39976
39977 spin_unlock_irq(&ohci->lock);
39978
39979 @@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39980 unsigned long flags;
39981 int n, ret = 0;
39982
39983 +#ifndef CONFIG_GRKERNSEC
39984 if (param_remote_dma)
39985 return 0;
39986 +#endif
39987
39988 /*
39989 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39990 diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39991 index 94a58a0..f5eba42 100644
39992 --- a/drivers/firmware/dmi-id.c
39993 +++ b/drivers/firmware/dmi-id.c
39994 @@ -16,7 +16,7 @@
39995 struct dmi_device_attribute{
39996 struct device_attribute dev_attr;
39997 int field;
39998 -};
39999 +} __do_const;
40000 #define to_dmi_dev_attr(_dev_attr) \
40001 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40002
40003 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40004 index 17afc51..0ef90cd 100644
40005 --- a/drivers/firmware/dmi_scan.c
40006 +++ b/drivers/firmware/dmi_scan.c
40007 @@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40008 if (buf == NULL)
40009 return -1;
40010
40011 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40012 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40013
40014 dmi_unmap(buf);
40015 return 0;
40016 diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40017 index 5b53d61..72cee96 100644
40018 --- a/drivers/firmware/efi/cper.c
40019 +++ b/drivers/firmware/efi/cper.c
40020 @@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40021 */
40022 u64 cper_next_record_id(void)
40023 {
40024 - static atomic64_t seq;
40025 + static atomic64_unchecked_t seq;
40026
40027 - if (!atomic64_read(&seq))
40028 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
40029 + if (!atomic64_read_unchecked(&seq))
40030 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40031
40032 - return atomic64_inc_return(&seq);
40033 + return atomic64_inc_return_unchecked(&seq);
40034 }
40035 EXPORT_SYMBOL_GPL(cper_next_record_id);
40036
40037 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40038 index 8590099..d83627a 100644
40039 --- a/drivers/firmware/efi/efi.c
40040 +++ b/drivers/firmware/efi/efi.c
40041 @@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40042 };
40043
40044 static struct efivars generic_efivars;
40045 -static struct efivar_operations generic_ops;
40046 +static efivar_operations_no_const generic_ops __read_only;
40047
40048 static int generic_ops_register(void)
40049 {
40050 - generic_ops.get_variable = efi.get_variable;
40051 - generic_ops.set_variable = efi.set_variable;
40052 - generic_ops.get_next_variable = efi.get_next_variable;
40053 - generic_ops.query_variable_store = efi_query_variable_store;
40054 + pax_open_kernel();
40055 + *(void **)&generic_ops.get_variable = efi.get_variable;
40056 + *(void **)&generic_ops.set_variable = efi.set_variable;
40057 + *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40058 + *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40059 + pax_close_kernel();
40060
40061 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40062 }
40063 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40064 index f256ecd..387dcb1 100644
40065 --- a/drivers/firmware/efi/efivars.c
40066 +++ b/drivers/firmware/efi/efivars.c
40067 @@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40068 static int
40069 create_efivars_bin_attributes(void)
40070 {
40071 - struct bin_attribute *attr;
40072 + bin_attribute_no_const *attr;
40073 int error;
40074
40075 /* new_var */
40076 diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40077 index 2f569aa..c95f4fb 100644
40078 --- a/drivers/firmware/google/memconsole.c
40079 +++ b/drivers/firmware/google/memconsole.c
40080 @@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40081 if (!found_memconsole())
40082 return -ENODEV;
40083
40084 - memconsole_bin_attr.size = memconsole_length;
40085 + pax_open_kernel();
40086 + *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40087 + pax_close_kernel();
40088 +
40089 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40090 }
40091
40092 diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40093 index fe49ec3..1ade794 100644
40094 --- a/drivers/gpio/gpio-em.c
40095 +++ b/drivers/gpio/gpio-em.c
40096 @@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40097 struct em_gio_priv *p;
40098 struct resource *io[2], *irq[2];
40099 struct gpio_chip *gpio_chip;
40100 - struct irq_chip *irq_chip;
40101 + irq_chip_no_const *irq_chip;
40102 const char *name = dev_name(&pdev->dev);
40103 int ret;
40104
40105 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40106 index 3784e81..73637b5 100644
40107 --- a/drivers/gpio/gpio-ich.c
40108 +++ b/drivers/gpio/gpio-ich.c
40109 @@ -94,7 +94,7 @@ struct ichx_desc {
40110 * this option allows driver caching written output values
40111 */
40112 bool use_outlvl_cache;
40113 -};
40114 +} __do_const;
40115
40116 static struct {
40117 spinlock_t lock;
40118 diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40119 index 415682f..08438b8 100644
40120 --- a/drivers/gpio/gpio-omap.c
40121 +++ b/drivers/gpio/gpio-omap.c
40122 @@ -1162,7 +1162,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40123 const struct omap_gpio_platform_data *pdata;
40124 struct resource *res;
40125 struct gpio_bank *bank;
40126 - struct irq_chip *irqc;
40127 + irq_chip_no_const *irqc;
40128 int ret;
40129
40130 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40131 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40132 index bf6c094..6573caf 100644
40133 --- a/drivers/gpio/gpio-rcar.c
40134 +++ b/drivers/gpio/gpio-rcar.c
40135 @@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40136 struct gpio_rcar_priv *p;
40137 struct resource *io, *irq;
40138 struct gpio_chip *gpio_chip;
40139 - struct irq_chip *irq_chip;
40140 + irq_chip_no_const *irq_chip;
40141 struct device *dev = &pdev->dev;
40142 const char *name = dev_name(dev);
40143 int ret;
40144 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40145 index dbf28fa..04dad4e 100644
40146 --- a/drivers/gpio/gpio-vr41xx.c
40147 +++ b/drivers/gpio/gpio-vr41xx.c
40148 @@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40149 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40150 maskl, pendl, maskh, pendh);
40151
40152 - atomic_inc(&irq_err_count);
40153 + atomic_inc_unchecked(&irq_err_count);
40154
40155 return -EINVAL;
40156 }
40157 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40158 index e8e98ca..10f416e 100644
40159 --- a/drivers/gpio/gpiolib.c
40160 +++ b/drivers/gpio/gpiolib.c
40161 @@ -537,8 +537,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40162 }
40163
40164 if (gpiochip->irqchip) {
40165 - gpiochip->irqchip->irq_request_resources = NULL;
40166 - gpiochip->irqchip->irq_release_resources = NULL;
40167 + pax_open_kernel();
40168 + *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40169 + *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40170 + pax_close_kernel();
40171 gpiochip->irqchip = NULL;
40172 }
40173 }
40174 @@ -604,8 +606,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40175 gpiochip->irqchip = NULL;
40176 return -EINVAL;
40177 }
40178 - irqchip->irq_request_resources = gpiochip_irq_reqres;
40179 - irqchip->irq_release_resources = gpiochip_irq_relres;
40180 +
40181 + pax_open_kernel();
40182 + *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40183 + *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40184 + pax_close_kernel();
40185
40186 /*
40187 * Prepare the mapping since the irqchip shall be orthogonal to
40188 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40189 index e79c8d3..a9370bc 100644
40190 --- a/drivers/gpu/drm/drm_crtc.c
40191 +++ b/drivers/gpu/drm/drm_crtc.c
40192 @@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40193 goto done;
40194 }
40195
40196 - if (copy_to_user(&enum_ptr[copied].name,
40197 + if (copy_to_user(enum_ptr[copied].name,
40198 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40199 ret = -EFAULT;
40200 goto done;
40201 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40202 index bc3da32..7289357 100644
40203 --- a/drivers/gpu/drm/drm_drv.c
40204 +++ b/drivers/gpu/drm/drm_drv.c
40205 @@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40206
40207 drm_device_set_unplugged(dev);
40208
40209 - if (dev->open_count == 0) {
40210 + if (local_read(&dev->open_count) == 0) {
40211 drm_put_dev(dev);
40212 }
40213 mutex_unlock(&drm_global_mutex);
40214 diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
40215 index 0c0c39b..70dd2f4 100644
40216 --- a/drivers/gpu/drm/drm_fb_helper.c
40217 +++ b/drivers/gpu/drm/drm_fb_helper.c
40218 @@ -732,7 +732,9 @@ int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info)
40219 int i, j, rc = 0;
40220 int start;
40221
40222 - drm_modeset_lock_all(dev);
40223 + if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
40224 + return -EBUSY;
40225 + }
40226 if (!drm_fb_helper_is_bound(fb_helper)) {
40227 drm_modeset_unlock_all(dev);
40228 return -EBUSY;
40229 @@ -910,7 +912,9 @@ int drm_fb_helper_pan_display(struct fb_var_screeninfo *var,
40230 int ret = 0;
40231 int i;
40232
40233 - drm_modeset_lock_all(dev);
40234 + if (__drm_modeset_lock_all(dev, !!oops_in_progress)) {
40235 + return -EBUSY;
40236 + }
40237 if (!drm_fb_helper_is_bound(fb_helper)) {
40238 drm_modeset_unlock_all(dev);
40239 return -EBUSY;
40240 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40241 index ed7bc68..0d536af 100644
40242 --- a/drivers/gpu/drm/drm_fops.c
40243 +++ b/drivers/gpu/drm/drm_fops.c
40244 @@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40245 return PTR_ERR(minor);
40246
40247 dev = minor->dev;
40248 - if (!dev->open_count++)
40249 + if (local_inc_return(&dev->open_count) == 1)
40250 need_setup = 1;
40251
40252 /* share address_space across all char-devs of a single device */
40253 @@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40254 return 0;
40255
40256 err_undo:
40257 - dev->open_count--;
40258 + local_dec(&dev->open_count);
40259 drm_minor_release(minor);
40260 return retcode;
40261 }
40262 @@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40263
40264 mutex_lock(&drm_global_mutex);
40265
40266 - DRM_DEBUG("open_count = %d\n", dev->open_count);
40267 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40268
40269 mutex_lock(&dev->struct_mutex);
40270 list_del(&file_priv->lhead);
40271 @@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40272 * Begin inline drm_release
40273 */
40274
40275 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40276 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40277 task_pid_nr(current),
40278 (long)old_encode_dev(file_priv->minor->kdev->devt),
40279 - dev->open_count);
40280 + local_read(&dev->open_count));
40281
40282 /* Release any auth tokens that might point to this file_priv,
40283 (do that under the drm_global_mutex) */
40284 @@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40285 * End inline drm_release
40286 */
40287
40288 - if (!--dev->open_count) {
40289 + if (local_dec_and_test(&dev->open_count)) {
40290 retcode = drm_lastclose(dev);
40291 if (drm_device_is_unplugged(dev))
40292 drm_put_dev(dev);
40293 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40294 index 3d2e91c..d31c4c9 100644
40295 --- a/drivers/gpu/drm/drm_global.c
40296 +++ b/drivers/gpu/drm/drm_global.c
40297 @@ -36,7 +36,7 @@
40298 struct drm_global_item {
40299 struct mutex mutex;
40300 void *object;
40301 - int refcount;
40302 + atomic_t refcount;
40303 };
40304
40305 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40306 @@ -49,7 +49,7 @@ void drm_global_init(void)
40307 struct drm_global_item *item = &glob[i];
40308 mutex_init(&item->mutex);
40309 item->object = NULL;
40310 - item->refcount = 0;
40311 + atomic_set(&item->refcount, 0);
40312 }
40313 }
40314
40315 @@ -59,7 +59,7 @@ void drm_global_release(void)
40316 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40317 struct drm_global_item *item = &glob[i];
40318 BUG_ON(item->object != NULL);
40319 - BUG_ON(item->refcount != 0);
40320 + BUG_ON(atomic_read(&item->refcount) != 0);
40321 }
40322 }
40323
40324 @@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40325 struct drm_global_item *item = &glob[ref->global_type];
40326
40327 mutex_lock(&item->mutex);
40328 - if (item->refcount == 0) {
40329 + if (atomic_read(&item->refcount) == 0) {
40330 item->object = kzalloc(ref->size, GFP_KERNEL);
40331 if (unlikely(item->object == NULL)) {
40332 ret = -ENOMEM;
40333 @@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40334 goto out_err;
40335
40336 }
40337 - ++item->refcount;
40338 + atomic_inc(&item->refcount);
40339 ref->object = item->object;
40340 mutex_unlock(&item->mutex);
40341 return 0;
40342 @@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40343 struct drm_global_item *item = &glob[ref->global_type];
40344
40345 mutex_lock(&item->mutex);
40346 - BUG_ON(item->refcount == 0);
40347 + BUG_ON(atomic_read(&item->refcount) == 0);
40348 BUG_ON(ref->object != item->object);
40349 - if (--item->refcount == 0) {
40350 + if (atomic_dec_and_test(&item->refcount)) {
40351 ref->release(ref);
40352 item->object = NULL;
40353 }
40354 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40355 index 51efebd..2b70935 100644
40356 --- a/drivers/gpu/drm/drm_info.c
40357 +++ b/drivers/gpu/drm/drm_info.c
40358 @@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40359 struct drm_local_map *map;
40360 struct drm_map_list *r_list;
40361
40362 - /* Hardcoded from _DRM_FRAME_BUFFER,
40363 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40364 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40365 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40366 + static const char * const types[] = {
40367 + [_DRM_FRAME_BUFFER] = "FB",
40368 + [_DRM_REGISTERS] = "REG",
40369 + [_DRM_SHM] = "SHM",
40370 + [_DRM_AGP] = "AGP",
40371 + [_DRM_SCATTER_GATHER] = "SG",
40372 + [_DRM_CONSISTENT] = "PCI"};
40373 const char *type;
40374 int i;
40375
40376 @@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40377 map = r_list->map;
40378 if (!map)
40379 continue;
40380 - if (map->type < 0 || map->type > 5)
40381 + if (map->type >= ARRAY_SIZE(types))
40382 type = "??";
40383 else
40384 type = types[map->type];
40385 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40386 index 2f4c4343..dd12cd2 100644
40387 --- a/drivers/gpu/drm/drm_ioc32.c
40388 +++ b/drivers/gpu/drm/drm_ioc32.c
40389 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40390 request = compat_alloc_user_space(nbytes);
40391 if (!access_ok(VERIFY_WRITE, request, nbytes))
40392 return -EFAULT;
40393 - list = (struct drm_buf_desc *) (request + 1);
40394 + list = (struct drm_buf_desc __user *) (request + 1);
40395
40396 if (__put_user(count, &request->count)
40397 || __put_user(list, &request->list))
40398 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40399 request = compat_alloc_user_space(nbytes);
40400 if (!access_ok(VERIFY_WRITE, request, nbytes))
40401 return -EFAULT;
40402 - list = (struct drm_buf_pub *) (request + 1);
40403 + list = (struct drm_buf_pub __user *) (request + 1);
40404
40405 if (__put_user(count, &request->count)
40406 || __put_user(list, &request->list))
40407 @@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40408 return 0;
40409 }
40410
40411 -drm_ioctl_compat_t *drm_compat_ioctls[] = {
40412 +drm_ioctl_compat_t drm_compat_ioctls[] = {
40413 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40414 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40415 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40416 @@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40417 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40418 {
40419 unsigned int nr = DRM_IOCTL_NR(cmd);
40420 - drm_ioctl_compat_t *fn;
40421 int ret;
40422
40423 /* Assume that ioctls without an explicit compat routine will just
40424 @@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40425 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40426 return drm_ioctl(filp, cmd, arg);
40427
40428 - fn = drm_compat_ioctls[nr];
40429 -
40430 - if (fn != NULL)
40431 - ret = (*fn) (filp, cmd, arg);
40432 + if (drm_compat_ioctls[nr] != NULL)
40433 + ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40434 else
40435 ret = drm_ioctl(filp, cmd, arg);
40436
40437 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40438 index 00587a1..57a65ca 100644
40439 --- a/drivers/gpu/drm/drm_ioctl.c
40440 +++ b/drivers/gpu/drm/drm_ioctl.c
40441 @@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40442 struct drm_file *file_priv = filp->private_data;
40443 struct drm_device *dev;
40444 const struct drm_ioctl_desc *ioctl = NULL;
40445 - drm_ioctl_t *func;
40446 + drm_ioctl_no_const_t func;
40447 unsigned int nr = DRM_IOCTL_NR(cmd);
40448 int retcode = -EINVAL;
40449 char stack_kdata[128];
40450 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40451 index 93ec5dc..82acbaf 100644
40452 --- a/drivers/gpu/drm/i810/i810_drv.h
40453 +++ b/drivers/gpu/drm/i810/i810_drv.h
40454 @@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40455 int page_flipping;
40456
40457 wait_queue_head_t irq_queue;
40458 - atomic_t irq_received;
40459 - atomic_t irq_emitted;
40460 + atomic_unchecked_t irq_received;
40461 + atomic_unchecked_t irq_emitted;
40462
40463 int front_offset;
40464 } drm_i810_private_t;
40465 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40466 index 318ade9..1f5de55 100644
40467 --- a/drivers/gpu/drm/i915/i915_dma.c
40468 +++ b/drivers/gpu/drm/i915/i915_dma.c
40469 @@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40470 * locking inversion with the driver load path. And the access here is
40471 * completely racy anyway. So don't bother with locking for now.
40472 */
40473 - return dev->open_count == 0;
40474 + return local_read(&dev->open_count) == 0;
40475 }
40476
40477 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40478 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40479 index 1a0611b..dd1fbfc 100644
40480 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40481 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40482 @@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40483 static int
40484 validate_exec_list(struct drm_device *dev,
40485 struct drm_i915_gem_exec_object2 *exec,
40486 - int count)
40487 + unsigned int count)
40488 {
40489 unsigned relocs_total = 0;
40490 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40491 unsigned invalid_flags;
40492 - int i;
40493 + unsigned int i;
40494
40495 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40496 if (USES_FULL_PPGTT(dev))
40497 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40498 index 2e0613e..a8b94d9 100644
40499 --- a/drivers/gpu/drm/i915/i915_ioc32.c
40500 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
40501 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40502 (unsigned long)request);
40503 }
40504
40505 -static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40506 +static drm_ioctl_compat_t i915_compat_ioctls[] = {
40507 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40508 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40509 [DRM_I915_GETPARAM] = compat_i915_getparam,
40510 @@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40511 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40512 {
40513 unsigned int nr = DRM_IOCTL_NR(cmd);
40514 - drm_ioctl_compat_t *fn = NULL;
40515 int ret;
40516
40517 if (nr < DRM_COMMAND_BASE)
40518 return drm_compat_ioctl(filp, cmd, arg);
40519
40520 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40521 - fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40522 -
40523 - if (fn != NULL)
40524 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40525 + drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40526 ret = (*fn) (filp, cmd, arg);
40527 - else
40528 + } else
40529 ret = drm_ioctl(filp, cmd, arg);
40530
40531 return ret;
40532 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40533 index 9cb5c95..9228666 100644
40534 --- a/drivers/gpu/drm/i915/intel_display.c
40535 +++ b/drivers/gpu/drm/i915/intel_display.c
40536 @@ -12811,13 +12811,13 @@ struct intel_quirk {
40537 int subsystem_vendor;
40538 int subsystem_device;
40539 void (*hook)(struct drm_device *dev);
40540 -};
40541 +} __do_const;
40542
40543 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40544 struct intel_dmi_quirk {
40545 void (*hook)(struct drm_device *dev);
40546 const struct dmi_system_id (*dmi_id_list)[];
40547 -};
40548 +} __do_const;
40549
40550 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40551 {
40552 @@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40553 return 1;
40554 }
40555
40556 -static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40557 +static const struct dmi_system_id intel_dmi_quirks_table[] = {
40558 {
40559 - .dmi_id_list = &(const struct dmi_system_id[]) {
40560 - {
40561 - .callback = intel_dmi_reverse_brightness,
40562 - .ident = "NCR Corporation",
40563 - .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40564 - DMI_MATCH(DMI_PRODUCT_NAME, ""),
40565 - },
40566 - },
40567 - { } /* terminating entry */
40568 + .callback = intel_dmi_reverse_brightness,
40569 + .ident = "NCR Corporation",
40570 + .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40571 + DMI_MATCH(DMI_PRODUCT_NAME, ""),
40572 },
40573 + },
40574 + { } /* terminating entry */
40575 +};
40576 +
40577 +static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40578 + {
40579 + .dmi_id_list = &intel_dmi_quirks_table,
40580 .hook = quirk_invert_brightness,
40581 },
40582 };
40583 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40584 index b4a2014..219ab78 100644
40585 --- a/drivers/gpu/drm/mga/mga_drv.h
40586 +++ b/drivers/gpu/drm/mga/mga_drv.h
40587 @@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40588 u32 clear_cmd;
40589 u32 maccess;
40590
40591 - atomic_t vbl_received; /**< Number of vblanks received. */
40592 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40593 wait_queue_head_t fence_queue;
40594 - atomic_t last_fence_retired;
40595 + atomic_unchecked_t last_fence_retired;
40596 u32 next_fence_to_post;
40597
40598 unsigned int fb_cpp;
40599 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40600 index 729bfd5..ead8823 100644
40601 --- a/drivers/gpu/drm/mga/mga_ioc32.c
40602 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
40603 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40604 return 0;
40605 }
40606
40607 -drm_ioctl_compat_t *mga_compat_ioctls[] = {
40608 +drm_ioctl_compat_t mga_compat_ioctls[] = {
40609 [DRM_MGA_INIT] = compat_mga_init,
40610 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40611 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40612 @@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40613 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40614 {
40615 unsigned int nr = DRM_IOCTL_NR(cmd);
40616 - drm_ioctl_compat_t *fn = NULL;
40617 int ret;
40618
40619 if (nr < DRM_COMMAND_BASE)
40620 return drm_compat_ioctl(filp, cmd, arg);
40621
40622 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40623 - fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40624 -
40625 - if (fn != NULL)
40626 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40627 + drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40628 ret = (*fn) (filp, cmd, arg);
40629 - else
40630 + } else
40631 ret = drm_ioctl(filp, cmd, arg);
40632
40633 return ret;
40634 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40635 index 1b071b8..de8601a 100644
40636 --- a/drivers/gpu/drm/mga/mga_irq.c
40637 +++ b/drivers/gpu/drm/mga/mga_irq.c
40638 @@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40639 if (crtc != 0)
40640 return 0;
40641
40642 - return atomic_read(&dev_priv->vbl_received);
40643 + return atomic_read_unchecked(&dev_priv->vbl_received);
40644 }
40645
40646
40647 @@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40648 /* VBLANK interrupt */
40649 if (status & MGA_VLINEPEN) {
40650 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40651 - atomic_inc(&dev_priv->vbl_received);
40652 + atomic_inc_unchecked(&dev_priv->vbl_received);
40653 drm_handle_vblank(dev, 0);
40654 handled = 1;
40655 }
40656 @@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40657 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40658 MGA_WRITE(MGA_PRIMEND, prim_end);
40659
40660 - atomic_inc(&dev_priv->last_fence_retired);
40661 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
40662 wake_up(&dev_priv->fence_queue);
40663 handled = 1;
40664 }
40665 @@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40666 * using fences.
40667 */
40668 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40669 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40670 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40671 - *sequence) <= (1 << 23)));
40672
40673 *sequence = cur_fence;
40674 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40675 index dae2c96..324dbe4 100644
40676 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40677 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40678 @@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40679 struct bit_table {
40680 const char id;
40681 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40682 -};
40683 +} __no_const;
40684
40685 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40686
40687 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40688 index 8ae36f2..1147a30 100644
40689 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40690 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40691 @@ -121,7 +121,6 @@ struct nouveau_drm {
40692 struct drm_global_reference mem_global_ref;
40693 struct ttm_bo_global_ref bo_global_ref;
40694 struct ttm_bo_device bdev;
40695 - atomic_t validate_sequence;
40696 int (*move)(struct nouveau_channel *,
40697 struct ttm_buffer_object *,
40698 struct ttm_mem_reg *, struct ttm_mem_reg *);
40699 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40700 index 462679a..88e32a7 100644
40701 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40702 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40703 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40704 unsigned long arg)
40705 {
40706 unsigned int nr = DRM_IOCTL_NR(cmd);
40707 - drm_ioctl_compat_t *fn = NULL;
40708 + drm_ioctl_compat_t fn = NULL;
40709 int ret;
40710
40711 if (nr < DRM_COMMAND_BASE)
40712 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40713 index 3d1cfcb..0542700 100644
40714 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40715 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40716 @@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40717 }
40718
40719 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40720 - nouveau_vram_manager_init,
40721 - nouveau_vram_manager_fini,
40722 - nouveau_vram_manager_new,
40723 - nouveau_vram_manager_del,
40724 - nouveau_vram_manager_debug
40725 + .init = nouveau_vram_manager_init,
40726 + .takedown = nouveau_vram_manager_fini,
40727 + .get_node = nouveau_vram_manager_new,
40728 + .put_node = nouveau_vram_manager_del,
40729 + .debug = nouveau_vram_manager_debug
40730 };
40731
40732 static int
40733 @@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40734 }
40735
40736 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40737 - nouveau_gart_manager_init,
40738 - nouveau_gart_manager_fini,
40739 - nouveau_gart_manager_new,
40740 - nouveau_gart_manager_del,
40741 - nouveau_gart_manager_debug
40742 + .init = nouveau_gart_manager_init,
40743 + .takedown = nouveau_gart_manager_fini,
40744 + .get_node = nouveau_gart_manager_new,
40745 + .put_node = nouveau_gart_manager_del,
40746 + .debug = nouveau_gart_manager_debug
40747 };
40748
40749 /*XXX*/
40750 @@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40751 }
40752
40753 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40754 - nv04_gart_manager_init,
40755 - nv04_gart_manager_fini,
40756 - nv04_gart_manager_new,
40757 - nv04_gart_manager_del,
40758 - nv04_gart_manager_debug
40759 + .init = nv04_gart_manager_init,
40760 + .takedown = nv04_gart_manager_fini,
40761 + .get_node = nv04_gart_manager_new,
40762 + .put_node = nv04_gart_manager_del,
40763 + .debug = nv04_gart_manager_debug
40764 };
40765
40766 int
40767 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40768 index c7592ec..dd45ebc 100644
40769 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40770 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40771 @@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40772 * locking inversion with the driver load path. And the access here is
40773 * completely racy anyway. So don't bother with locking for now.
40774 */
40775 - return dev->open_count == 0;
40776 + return local_read(&dev->open_count) == 0;
40777 }
40778
40779 static const struct vga_switcheroo_client_ops
40780 diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40781 index 9782364..89bd954 100644
40782 --- a/drivers/gpu/drm/qxl/qxl_cmd.c
40783 +++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40784 @@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40785 int ret;
40786
40787 mutex_lock(&qdev->async_io_mutex);
40788 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40789 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40790 if (qdev->last_sent_io_cmd > irq_num) {
40791 if (intr)
40792 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40793 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40794 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40795 else
40796 ret = wait_event_timeout(qdev->io_cmd_event,
40797 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40798 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40799 /* 0 is timeout, just bail the "hw" has gone away */
40800 if (ret <= 0)
40801 goto out;
40802 - irq_num = atomic_read(&qdev->irq_received_io_cmd);
40803 + irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40804 }
40805 outb(val, addr);
40806 qdev->last_sent_io_cmd = irq_num + 1;
40807 if (intr)
40808 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40809 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40810 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40811 else
40812 ret = wait_event_timeout(qdev->io_cmd_event,
40813 - atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40814 + atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40815 out:
40816 if (ret > 0)
40817 ret = 0;
40818 diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40819 index 6911b8c..89d6867 100644
40820 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40821 +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40822 @@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40823 struct drm_info_node *node = (struct drm_info_node *) m->private;
40824 struct qxl_device *qdev = node->minor->dev->dev_private;
40825
40826 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40827 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40828 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40829 - seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40830 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40831 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40832 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40833 + seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40834 seq_printf(m, "%d\n", qdev->irq_received_error);
40835 return 0;
40836 }
40837 diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40838 index 7c6cafe..460f542 100644
40839 --- a/drivers/gpu/drm/qxl/qxl_drv.h
40840 +++ b/drivers/gpu/drm/qxl/qxl_drv.h
40841 @@ -290,10 +290,10 @@ struct qxl_device {
40842 unsigned int last_sent_io_cmd;
40843
40844 /* interrupt handling */
40845 - atomic_t irq_received;
40846 - atomic_t irq_received_display;
40847 - atomic_t irq_received_cursor;
40848 - atomic_t irq_received_io_cmd;
40849 + atomic_unchecked_t irq_received;
40850 + atomic_unchecked_t irq_received_display;
40851 + atomic_unchecked_t irq_received_cursor;
40852 + atomic_unchecked_t irq_received_io_cmd;
40853 unsigned irq_received_error;
40854 wait_queue_head_t display_event;
40855 wait_queue_head_t cursor_event;
40856 diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40857 index b110883..dd06418 100644
40858 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40859 +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40860 @@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40861
40862 /* TODO copy slow path code from i915 */
40863 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40864 - unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void *)(unsigned long)cmd->command, cmd->command_size);
40865 + unwritten = __copy_from_user_inatomic_nocache(fb_cmd + sizeof(union qxl_release_info) + (release->release_offset & ~PAGE_SIZE), (void __force_user *)(unsigned long)cmd->command, cmd->command_size);
40866
40867 {
40868 struct qxl_drawable *draw = fb_cmd;
40869 @@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40870 struct drm_qxl_reloc reloc;
40871
40872 if (copy_from_user(&reloc,
40873 - &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40874 + &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40875 sizeof(reloc))) {
40876 ret = -EFAULT;
40877 goto out_free_bos;
40878 @@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40879
40880 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40881
40882 - struct drm_qxl_command *commands =
40883 - (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40884 + struct drm_qxl_command __user *commands =
40885 + (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40886
40887 - if (copy_from_user(&user_cmd, &commands[cmd_num],
40888 + if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40889 sizeof(user_cmd)))
40890 return -EFAULT;
40891
40892 diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40893 index 0bf1e20..42a7310 100644
40894 --- a/drivers/gpu/drm/qxl/qxl_irq.c
40895 +++ b/drivers/gpu/drm/qxl/qxl_irq.c
40896 @@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40897 if (!pending)
40898 return IRQ_NONE;
40899
40900 - atomic_inc(&qdev->irq_received);
40901 + atomic_inc_unchecked(&qdev->irq_received);
40902
40903 if (pending & QXL_INTERRUPT_DISPLAY) {
40904 - atomic_inc(&qdev->irq_received_display);
40905 + atomic_inc_unchecked(&qdev->irq_received_display);
40906 wake_up_all(&qdev->display_event);
40907 qxl_queue_garbage_collect(qdev, false);
40908 }
40909 if (pending & QXL_INTERRUPT_CURSOR) {
40910 - atomic_inc(&qdev->irq_received_cursor);
40911 + atomic_inc_unchecked(&qdev->irq_received_cursor);
40912 wake_up_all(&qdev->cursor_event);
40913 }
40914 if (pending & QXL_INTERRUPT_IO_CMD) {
40915 - atomic_inc(&qdev->irq_received_io_cmd);
40916 + atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40917 wake_up_all(&qdev->io_cmd_event);
40918 }
40919 if (pending & QXL_INTERRUPT_ERROR) {
40920 @@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40921 init_waitqueue_head(&qdev->io_cmd_event);
40922 INIT_WORK(&qdev->client_monitors_config_work,
40923 qxl_client_monitors_config_work_func);
40924 - atomic_set(&qdev->irq_received, 0);
40925 - atomic_set(&qdev->irq_received_display, 0);
40926 - atomic_set(&qdev->irq_received_cursor, 0);
40927 - atomic_set(&qdev->irq_received_io_cmd, 0);
40928 + atomic_set_unchecked(&qdev->irq_received, 0);
40929 + atomic_set_unchecked(&qdev->irq_received_display, 0);
40930 + atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40931 + atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40932 qdev->irq_received_error = 0;
40933 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40934 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40935 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40936 index 0cbc4c9..0e46686 100644
40937 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
40938 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40939 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40940 }
40941 }
40942
40943 -static struct vm_operations_struct qxl_ttm_vm_ops;
40944 +static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40945 static const struct vm_operations_struct *ttm_vm_ops;
40946
40947 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40948 @@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40949 return r;
40950 if (unlikely(ttm_vm_ops == NULL)) {
40951 ttm_vm_ops = vma->vm_ops;
40952 + pax_open_kernel();
40953 qxl_ttm_vm_ops = *ttm_vm_ops;
40954 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40955 + pax_close_kernel();
40956 }
40957 vma->vm_ops = &qxl_ttm_vm_ops;
40958 return 0;
40959 @@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40960 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40961 {
40962 #if defined(CONFIG_DEBUG_FS)
40963 - static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40964 - static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40965 - unsigned i;
40966 + static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40967 + {
40968 + .name = "qxl_mem_mm",
40969 + .show = &qxl_mm_dump_table,
40970 + },
40971 + {
40972 + .name = "qxl_surf_mm",
40973 + .show = &qxl_mm_dump_table,
40974 + }
40975 + };
40976
40977 - for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40978 - if (i == 0)
40979 - sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40980 - else
40981 - sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40982 - qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40983 - qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40984 - qxl_mem_types_list[i].driver_features = 0;
40985 - if (i == 0)
40986 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40987 - else
40988 - qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40989 + pax_open_kernel();
40990 + *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40991 + *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40992 + pax_close_kernel();
40993
40994 - }
40995 - return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40996 + return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40997 #else
40998 return 0;
40999 #endif
41000 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41001 index 2c45ac9..5d740f8 100644
41002 --- a/drivers/gpu/drm/r128/r128_cce.c
41003 +++ b/drivers/gpu/drm/r128/r128_cce.c
41004 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41005
41006 /* GH: Simple idle check.
41007 */
41008 - atomic_set(&dev_priv->idle_count, 0);
41009 + atomic_set_unchecked(&dev_priv->idle_count, 0);
41010
41011 /* We don't support anything other than bus-mastering ring mode,
41012 * but the ring can be in either AGP or PCI space for the ring
41013 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41014 index 723e5d6..102dbaf 100644
41015 --- a/drivers/gpu/drm/r128/r128_drv.h
41016 +++ b/drivers/gpu/drm/r128/r128_drv.h
41017 @@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41018 int is_pci;
41019 unsigned long cce_buffers_offset;
41020
41021 - atomic_t idle_count;
41022 + atomic_unchecked_t idle_count;
41023
41024 int page_flipping;
41025 int current_page;
41026 u32 crtc_offset;
41027 u32 crtc_offset_cntl;
41028
41029 - atomic_t vbl_received;
41030 + atomic_unchecked_t vbl_received;
41031
41032 u32 color_fmt;
41033 unsigned int front_offset;
41034 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41035 index 663f38c..c689495 100644
41036 --- a/drivers/gpu/drm/r128/r128_ioc32.c
41037 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
41038 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41039 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41040 }
41041
41042 -drm_ioctl_compat_t *r128_compat_ioctls[] = {
41043 +drm_ioctl_compat_t r128_compat_ioctls[] = {
41044 [DRM_R128_INIT] = compat_r128_init,
41045 [DRM_R128_DEPTH] = compat_r128_depth,
41046 [DRM_R128_STIPPLE] = compat_r128_stipple,
41047 @@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41048 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41049 {
41050 unsigned int nr = DRM_IOCTL_NR(cmd);
41051 - drm_ioctl_compat_t *fn = NULL;
41052 int ret;
41053
41054 if (nr < DRM_COMMAND_BASE)
41055 return drm_compat_ioctl(filp, cmd, arg);
41056
41057 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41058 - fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41059 -
41060 - if (fn != NULL)
41061 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41062 + drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41063 ret = (*fn) (filp, cmd, arg);
41064 - else
41065 + } else
41066 ret = drm_ioctl(filp, cmd, arg);
41067
41068 return ret;
41069 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41070 index c2ae496..30b5993 100644
41071 --- a/drivers/gpu/drm/r128/r128_irq.c
41072 +++ b/drivers/gpu/drm/r128/r128_irq.c
41073 @@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41074 if (crtc != 0)
41075 return 0;
41076
41077 - return atomic_read(&dev_priv->vbl_received);
41078 + return atomic_read_unchecked(&dev_priv->vbl_received);
41079 }
41080
41081 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41082 @@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41083 /* VBLANK interrupt */
41084 if (status & R128_CRTC_VBLANK_INT) {
41085 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41086 - atomic_inc(&dev_priv->vbl_received);
41087 + atomic_inc_unchecked(&dev_priv->vbl_received);
41088 drm_handle_vblank(dev, 0);
41089 return IRQ_HANDLED;
41090 }
41091 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41092 index 575e986..66e62ca 100644
41093 --- a/drivers/gpu/drm/r128/r128_state.c
41094 +++ b/drivers/gpu/drm/r128/r128_state.c
41095 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41096
41097 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41098 {
41099 - if (atomic_read(&dev_priv->idle_count) == 0)
41100 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41101 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41102 else
41103 - atomic_set(&dev_priv->idle_count, 0);
41104 + atomic_set_unchecked(&dev_priv->idle_count, 0);
41105 }
41106
41107 #endif
41108 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41109 index 4a85bb6..aaea819 100644
41110 --- a/drivers/gpu/drm/radeon/mkregtable.c
41111 +++ b/drivers/gpu/drm/radeon/mkregtable.c
41112 @@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41113 regex_t mask_rex;
41114 regmatch_t match[4];
41115 char buf[1024];
41116 - size_t end;
41117 + long end;
41118 int len;
41119 int done = 0;
41120 int r;
41121 unsigned o;
41122 struct offset *offset;
41123 char last_reg_s[10];
41124 - int last_reg;
41125 + unsigned long last_reg;
41126
41127 if (regcomp
41128 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41129 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41130 index 995a8b1..b7cb898 100644
41131 --- a/drivers/gpu/drm/radeon/radeon_device.c
41132 +++ b/drivers/gpu/drm/radeon/radeon_device.c
41133 @@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41134 * locking inversion with the driver load path. And the access here is
41135 * completely racy anyway. So don't bother with locking for now.
41136 */
41137 - return dev->open_count == 0;
41138 + return local_read(&dev->open_count) == 0;
41139 }
41140
41141 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41142 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41143 index 46bd393..6ae4719 100644
41144 --- a/drivers/gpu/drm/radeon/radeon_drv.h
41145 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
41146 @@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41147
41148 /* SW interrupt */
41149 wait_queue_head_t swi_queue;
41150 - atomic_t swi_emitted;
41151 + atomic_unchecked_t swi_emitted;
41152 int vblank_crtc;
41153 uint32_t irq_enable_reg;
41154 uint32_t r500_disp_irq_reg;
41155 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41156 index 0b98ea1..0881827 100644
41157 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41158 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41159 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41160 request = compat_alloc_user_space(sizeof(*request));
41161 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41162 || __put_user(req32.param, &request->param)
41163 - || __put_user((void __user *)(unsigned long)req32.value,
41164 + || __put_user((unsigned long)req32.value,
41165 &request->value))
41166 return -EFAULT;
41167
41168 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41169 #define compat_radeon_cp_setparam NULL
41170 #endif /* X86_64 || IA64 */
41171
41172 -static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41173 +static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41174 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41175 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41176 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41177 @@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41178 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41179 {
41180 unsigned int nr = DRM_IOCTL_NR(cmd);
41181 - drm_ioctl_compat_t *fn = NULL;
41182 int ret;
41183
41184 if (nr < DRM_COMMAND_BASE)
41185 return drm_compat_ioctl(filp, cmd, arg);
41186
41187 - if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41188 - fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41189 -
41190 - if (fn != NULL)
41191 + if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41192 + drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41193 ret = (*fn) (filp, cmd, arg);
41194 - else
41195 + } else
41196 ret = drm_ioctl(filp, cmd, arg);
41197
41198 return ret;
41199 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41200 index 244b19b..c19226d 100644
41201 --- a/drivers/gpu/drm/radeon/radeon_irq.c
41202 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
41203 @@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41204 unsigned int ret;
41205 RING_LOCALS;
41206
41207 - atomic_inc(&dev_priv->swi_emitted);
41208 - ret = atomic_read(&dev_priv->swi_emitted);
41209 + atomic_inc_unchecked(&dev_priv->swi_emitted);
41210 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41211
41212 BEGIN_RING(4);
41213 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41214 @@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41215 drm_radeon_private_t *dev_priv =
41216 (drm_radeon_private_t *) dev->dev_private;
41217
41218 - atomic_set(&dev_priv->swi_emitted, 0);
41219 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41220 init_waitqueue_head(&dev_priv->swi_queue);
41221
41222 dev->max_vblank_count = 0x001fffff;
41223 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41224 index 535403e..5dd655b 100644
41225 --- a/drivers/gpu/drm/radeon/radeon_state.c
41226 +++ b/drivers/gpu/drm/radeon/radeon_state.c
41227 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41228 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41229 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41230
41231 - if (copy_from_user(&depth_boxes, clear->depth_boxes,
41232 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41233 sarea_priv->nbox * sizeof(depth_boxes[0])))
41234 return -EFAULT;
41235
41236 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41237 {
41238 drm_radeon_private_t *dev_priv = dev->dev_private;
41239 drm_radeon_getparam_t *param = data;
41240 - int value;
41241 + int value = 0;
41242
41243 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41244
41245 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41246 index 8624979..65e5243 100644
41247 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
41248 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41249 @@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41250 man->size = size >> PAGE_SHIFT;
41251 }
41252
41253 -static struct vm_operations_struct radeon_ttm_vm_ops;
41254 +static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41255 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41256
41257 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41258 @@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41259 }
41260 if (unlikely(ttm_vm_ops == NULL)) {
41261 ttm_vm_ops = vma->vm_ops;
41262 + pax_open_kernel();
41263 radeon_ttm_vm_ops = *ttm_vm_ops;
41264 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41265 + pax_close_kernel();
41266 }
41267 vma->vm_ops = &radeon_ttm_vm_ops;
41268 return 0;
41269 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41270 index 054a79f..30d9ac4 100644
41271 --- a/drivers/gpu/drm/tegra/dc.c
41272 +++ b/drivers/gpu/drm/tegra/dc.c
41273 @@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41274 }
41275
41276 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41277 - dc->debugfs_files[i].data = dc;
41278 + *(void **)&dc->debugfs_files[i].data = dc;
41279
41280 err = drm_debugfs_create_files(dc->debugfs_files,
41281 ARRAY_SIZE(debugfs_files),
41282 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41283 index f787445..2df2c65 100644
41284 --- a/drivers/gpu/drm/tegra/dsi.c
41285 +++ b/drivers/gpu/drm/tegra/dsi.c
41286 @@ -41,7 +41,7 @@ struct tegra_dsi {
41287 struct clk *clk_lp;
41288 struct clk *clk;
41289
41290 - struct drm_info_list *debugfs_files;
41291 + drm_info_list_no_const *debugfs_files;
41292 struct drm_minor *minor;
41293 struct dentry *debugfs;
41294
41295 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41296 index ffe2654..03c7b1c 100644
41297 --- a/drivers/gpu/drm/tegra/hdmi.c
41298 +++ b/drivers/gpu/drm/tegra/hdmi.c
41299 @@ -60,7 +60,7 @@ struct tegra_hdmi {
41300 bool stereo;
41301 bool dvi;
41302
41303 - struct drm_info_list *debugfs_files;
41304 + drm_info_list_no_const *debugfs_files;
41305 struct drm_minor *minor;
41306 struct dentry *debugfs;
41307 };
41308 diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41309 index 964387f..4eafc00 100644
41310 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41311 +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41312 @@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41313 }
41314
41315 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41316 - ttm_bo_man_init,
41317 - ttm_bo_man_takedown,
41318 - ttm_bo_man_get_node,
41319 - ttm_bo_man_put_node,
41320 - ttm_bo_man_debug
41321 + .init = ttm_bo_man_init,
41322 + .takedown = ttm_bo_man_takedown,
41323 + .get_node = ttm_bo_man_get_node,
41324 + .put_node = ttm_bo_man_put_node,
41325 + .debug = ttm_bo_man_debug
41326 };
41327 EXPORT_SYMBOL(ttm_bo_manager_func);
41328 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41329 index a1803fb..c53f6b0 100644
41330 --- a/drivers/gpu/drm/ttm/ttm_memory.c
41331 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
41332 @@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41333 zone->glob = glob;
41334 glob->zone_kernel = zone;
41335 ret = kobject_init_and_add(
41336 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41337 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41338 if (unlikely(ret != 0)) {
41339 kobject_put(&zone->kobj);
41340 return ret;
41341 @@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41342 zone->glob = glob;
41343 glob->zone_dma32 = zone;
41344 ret = kobject_init_and_add(
41345 - &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41346 + &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41347 if (unlikely(ret != 0)) {
41348 kobject_put(&zone->kobj);
41349 return ret;
41350 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41351 index 09874d6..d6da1de 100644
41352 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41353 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41354 @@ -54,7 +54,7 @@
41355
41356 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41357 #define SMALL_ALLOCATION 16
41358 -#define FREE_ALL_PAGES (~0U)
41359 +#define FREE_ALL_PAGES (~0UL)
41360 /* times are in msecs */
41361 #define PAGE_FREE_INTERVAL 1000
41362
41363 @@ -299,14 +299,13 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41364 * @free_all: If set to true will free all pages in pool
41365 * @gfp: GFP flags.
41366 **/
41367 -static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41368 +static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41369 gfp_t gfp)
41370 {
41371 unsigned long irq_flags;
41372 struct page *p;
41373 struct page **pages_to_free;
41374 - unsigned freed_pages = 0,
41375 - npages_to_free = nr_free;
41376 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41377
41378 if (NUM_PAGES_TO_ALLOC < nr_free)
41379 npages_to_free = NUM_PAGES_TO_ALLOC;
41380 @@ -366,7 +365,8 @@ restart:
41381 __list_del(&p->lru, &pool->list);
41382
41383 ttm_pool_update_free_locked(pool, freed_pages);
41384 - nr_free -= freed_pages;
41385 + if (likely(nr_free != FREE_ALL_PAGES))
41386 + nr_free -= freed_pages;
41387 }
41388
41389 spin_unlock_irqrestore(&pool->lock, irq_flags);
41390 @@ -395,7 +395,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41391 unsigned i;
41392 unsigned pool_offset;
41393 struct ttm_page_pool *pool;
41394 - int shrink_pages = sc->nr_to_scan;
41395 + unsigned long shrink_pages = sc->nr_to_scan;
41396 unsigned long freed = 0;
41397
41398 if (!mutex_trylock(&lock))
41399 @@ -403,7 +403,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41400 pool_offset = ++start_pool % NUM_POOLS;
41401 /* select start pool in round robin fashion */
41402 for (i = 0; i < NUM_POOLS; ++i) {
41403 - unsigned nr_free = shrink_pages;
41404 + unsigned long nr_free = shrink_pages;
41405 if (shrink_pages == 0)
41406 break;
41407 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41408 @@ -669,7 +669,7 @@ out:
41409 }
41410
41411 /* Put all pages in pages list to correct pool to wait for reuse */
41412 -static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41413 +static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41414 enum ttm_caching_state cstate)
41415 {
41416 unsigned long irq_flags;
41417 @@ -724,7 +724,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41418 struct list_head plist;
41419 struct page *p = NULL;
41420 gfp_t gfp_flags = GFP_USER;
41421 - unsigned count;
41422 + unsigned long count;
41423 int r;
41424
41425 /* set zero flag for page allocation if required */
41426 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41427 index c96db43..c367557 100644
41428 --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41429 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41430 @@ -56,7 +56,7 @@
41431
41432 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41433 #define SMALL_ALLOCATION 4
41434 -#define FREE_ALL_PAGES (~0U)
41435 +#define FREE_ALL_PAGES (~0UL)
41436 /* times are in msecs */
41437 #define IS_UNDEFINED (0)
41438 #define IS_WC (1<<1)
41439 @@ -413,15 +413,14 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41440 * @nr_free: If set to true will free all pages in pool
41441 * @gfp: GFP flags.
41442 **/
41443 -static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41444 +static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41445 gfp_t gfp)
41446 {
41447 unsigned long irq_flags;
41448 struct dma_page *dma_p, *tmp;
41449 struct page **pages_to_free;
41450 struct list_head d_pages;
41451 - unsigned freed_pages = 0,
41452 - npages_to_free = nr_free;
41453 + unsigned long freed_pages = 0, npages_to_free = nr_free;
41454
41455 if (NUM_PAGES_TO_ALLOC < nr_free)
41456 npages_to_free = NUM_PAGES_TO_ALLOC;
41457 @@ -494,7 +493,8 @@ restart:
41458 /* remove range of pages from the pool */
41459 if (freed_pages) {
41460 ttm_pool_update_free_locked(pool, freed_pages);
41461 - nr_free -= freed_pages;
41462 + if (likely(nr_free != FREE_ALL_PAGES))
41463 + nr_free -= freed_pages;
41464 }
41465
41466 spin_unlock_irqrestore(&pool->lock, irq_flags);
41467 @@ -929,7 +929,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41468 struct dma_page *d_page, *next;
41469 enum pool_type type;
41470 bool is_cached = false;
41471 - unsigned count = 0, i, npages = 0;
41472 + unsigned long count = 0, i, npages = 0;
41473 unsigned long irq_flags;
41474
41475 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41476 @@ -1007,7 +1007,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41477 static unsigned start_pool;
41478 unsigned idx = 0;
41479 unsigned pool_offset;
41480 - unsigned shrink_pages = sc->nr_to_scan;
41481 + unsigned long shrink_pages = sc->nr_to_scan;
41482 struct device_pools *p;
41483 unsigned long freed = 0;
41484
41485 @@ -1020,7 +1020,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41486 goto out;
41487 pool_offset = ++start_pool % _manager->npools;
41488 list_for_each_entry(p, &_manager->pools, pools) {
41489 - unsigned nr_free;
41490 + unsigned long nr_free;
41491
41492 if (!p->dev)
41493 continue;
41494 @@ -1034,7 +1034,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41495 sc->gfp_mask);
41496 freed += nr_free - shrink_pages;
41497
41498 - pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41499 + pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41500 p->pool->dev_name, p->pool->name, current->pid,
41501 nr_free, shrink_pages);
41502 }
41503 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41504 index 8cbcb45..a4d9cf7 100644
41505 --- a/drivers/gpu/drm/udl/udl_fb.c
41506 +++ b/drivers/gpu/drm/udl/udl_fb.c
41507 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41508 fb_deferred_io_cleanup(info);
41509 kfree(info->fbdefio);
41510 info->fbdefio = NULL;
41511 - info->fbops->fb_mmap = udl_fb_mmap;
41512 }
41513
41514 pr_warn("released /dev/fb%d user=%d count=%d\n",
41515 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41516 index ef8c500..01030c8 100644
41517 --- a/drivers/gpu/drm/via/via_drv.h
41518 +++ b/drivers/gpu/drm/via/via_drv.h
41519 @@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41520 typedef uint32_t maskarray_t[5];
41521
41522 typedef struct drm_via_irq {
41523 - atomic_t irq_received;
41524 + atomic_unchecked_t irq_received;
41525 uint32_t pending_mask;
41526 uint32_t enable_mask;
41527 wait_queue_head_t irq_queue;
41528 @@ -77,7 +77,7 @@ typedef struct drm_via_private {
41529 struct timeval last_vblank;
41530 int last_vblank_valid;
41531 unsigned usec_per_vblank;
41532 - atomic_t vbl_received;
41533 + atomic_unchecked_t vbl_received;
41534 drm_via_state_t hc_state;
41535 char pci_buf[VIA_PCI_BUF_SIZE];
41536 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41537 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41538 index 1319433..a993b0c 100644
41539 --- a/drivers/gpu/drm/via/via_irq.c
41540 +++ b/drivers/gpu/drm/via/via_irq.c
41541 @@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41542 if (crtc != 0)
41543 return 0;
41544
41545 - return atomic_read(&dev_priv->vbl_received);
41546 + return atomic_read_unchecked(&dev_priv->vbl_received);
41547 }
41548
41549 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41550 @@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41551
41552 status = VIA_READ(VIA_REG_INTERRUPT);
41553 if (status & VIA_IRQ_VBLANK_PENDING) {
41554 - atomic_inc(&dev_priv->vbl_received);
41555 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41556 + atomic_inc_unchecked(&dev_priv->vbl_received);
41557 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41558 do_gettimeofday(&cur_vblank);
41559 if (dev_priv->last_vblank_valid) {
41560 dev_priv->usec_per_vblank =
41561 @@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41562 dev_priv->last_vblank = cur_vblank;
41563 dev_priv->last_vblank_valid = 1;
41564 }
41565 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41566 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41567 DRM_DEBUG("US per vblank is: %u\n",
41568 dev_priv->usec_per_vblank);
41569 }
41570 @@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41571
41572 for (i = 0; i < dev_priv->num_irqs; ++i) {
41573 if (status & cur_irq->pending_mask) {
41574 - atomic_inc(&cur_irq->irq_received);
41575 + atomic_inc_unchecked(&cur_irq->irq_received);
41576 wake_up(&cur_irq->irq_queue);
41577 handled = 1;
41578 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41579 @@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41580 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41581 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41582 masks[irq][4]));
41583 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41584 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41585 } else {
41586 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41587 (((cur_irq_sequence =
41588 - atomic_read(&cur_irq->irq_received)) -
41589 + atomic_read_unchecked(&cur_irq->irq_received)) -
41590 *sequence) <= (1 << 23)));
41591 }
41592 *sequence = cur_irq_sequence;
41593 @@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41594 }
41595
41596 for (i = 0; i < dev_priv->num_irqs; ++i) {
41597 - atomic_set(&cur_irq->irq_received, 0);
41598 + atomic_set_unchecked(&cur_irq->irq_received, 0);
41599 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41600 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41601 init_waitqueue_head(&cur_irq->irq_queue);
41602 @@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41603 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41604 case VIA_IRQ_RELATIVE:
41605 irqwait->request.sequence +=
41606 - atomic_read(&cur_irq->irq_received);
41607 + atomic_read_unchecked(&cur_irq->irq_received);
41608 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41609 case VIA_IRQ_ABSOLUTE:
41610 break;
41611 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41612 index 4ee799b..69fc0d1 100644
41613 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41614 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41615 @@ -446,7 +446,7 @@ struct vmw_private {
41616 * Fencing and IRQs.
41617 */
41618
41619 - atomic_t marker_seq;
41620 + atomic_unchecked_t marker_seq;
41621 wait_queue_head_t fence_queue;
41622 wait_queue_head_t fifo_queue;
41623 int fence_queue_waiters; /* Protected by hw_mutex */
41624 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41625 index 09e10ae..cb76c60 100644
41626 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41627 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41628 @@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41629 (unsigned int) min,
41630 (unsigned int) fifo->capabilities);
41631
41632 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41633 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41634 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41635 vmw_marker_queue_init(&fifo->marker_queue);
41636 return vmw_fifo_send_fence(dev_priv, &dummy);
41637 @@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41638 if (reserveable)
41639 iowrite32(bytes, fifo_mem +
41640 SVGA_FIFO_RESERVED);
41641 - return fifo_mem + (next_cmd >> 2);
41642 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41643 } else {
41644 need_bounce = true;
41645 }
41646 @@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41647
41648 fm = vmw_fifo_reserve(dev_priv, bytes);
41649 if (unlikely(fm == NULL)) {
41650 - *seqno = atomic_read(&dev_priv->marker_seq);
41651 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41652 ret = -ENOMEM;
41653 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41654 false, 3*HZ);
41655 @@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41656 }
41657
41658 do {
41659 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41660 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41661 } while (*seqno == 0);
41662
41663 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41664 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41665 index 170b61b..fec7348 100644
41666 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41667 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41668 @@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41669 }
41670
41671 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41672 - vmw_gmrid_man_init,
41673 - vmw_gmrid_man_takedown,
41674 - vmw_gmrid_man_get_node,
41675 - vmw_gmrid_man_put_node,
41676 - vmw_gmrid_man_debug
41677 + .init = vmw_gmrid_man_init,
41678 + .takedown = vmw_gmrid_man_takedown,
41679 + .get_node = vmw_gmrid_man_get_node,
41680 + .put_node = vmw_gmrid_man_put_node,
41681 + .debug = vmw_gmrid_man_debug
41682 };
41683 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41684 index 37881ec..319065d 100644
41685 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41686 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41687 @@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41688 int ret;
41689
41690 num_clips = arg->num_clips;
41691 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41692 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41693
41694 if (unlikely(num_clips == 0))
41695 return 0;
41696 @@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41697 int ret;
41698
41699 num_clips = arg->num_clips;
41700 - clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41701 + clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41702
41703 if (unlikely(num_clips == 0))
41704 return 0;
41705 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41706 index 0c42376..6febe77 100644
41707 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41708 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41709 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41710 * emitted. Then the fence is stale and signaled.
41711 */
41712
41713 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41714 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41715 > VMW_FENCE_WRAP);
41716
41717 return ret;
41718 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41719
41720 if (fifo_idle)
41721 down_read(&fifo_state->rwsem);
41722 - signal_seq = atomic_read(&dev_priv->marker_seq);
41723 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41724 ret = 0;
41725
41726 for (;;) {
41727 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41728 index efd1ffd..0ae13ca 100644
41729 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41730 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41731 @@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41732 while (!vmw_lag_lt(queue, us)) {
41733 spin_lock(&queue->lock);
41734 if (list_empty(&queue->head))
41735 - seqno = atomic_read(&dev_priv->marker_seq);
41736 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41737 else {
41738 marker = list_first_entry(&queue->head,
41739 struct vmw_marker, head);
41740 diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41741 index 37ac7b5..d52a5c9 100644
41742 --- a/drivers/gpu/vga/vga_switcheroo.c
41743 +++ b/drivers/gpu/vga/vga_switcheroo.c
41744 @@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41745
41746 /* this version is for the case where the power switch is separate
41747 to the device being powered down. */
41748 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41749 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41750 {
41751 /* copy over all the bus versions */
41752 if (dev->bus && dev->bus->pm) {
41753 @@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41754 return ret;
41755 }
41756
41757 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41758 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41759 {
41760 /* copy over all the bus versions */
41761 if (dev->bus && dev->bus->pm) {
41762 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41763 index dfaccfc..bfea740 100644
41764 --- a/drivers/hid/hid-core.c
41765 +++ b/drivers/hid/hid-core.c
41766 @@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41767
41768 int hid_add_device(struct hid_device *hdev)
41769 {
41770 - static atomic_t id = ATOMIC_INIT(0);
41771 + static atomic_unchecked_t id = ATOMIC_INIT(0);
41772 int ret;
41773
41774 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41775 @@ -2549,7 +2549,7 @@ int hid_add_device(struct hid_device *hdev)
41776 /* XXX hack, any other cleaner solution after the driver core
41777 * is converted to allow more than 20 bytes as the device name? */
41778 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41779 - hdev->vendor, hdev->product, atomic_inc_return(&id));
41780 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41781
41782 hid_debug_register(hdev, dev_name(&hdev->dev));
41783 ret = device_add(&hdev->dev);
41784 diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41785 index 71f5692..147d3da 100644
41786 --- a/drivers/hid/hid-logitech-dj.c
41787 +++ b/drivers/hid/hid-logitech-dj.c
41788 @@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41789 * device (via hid_input_report() ) and return 1 so hid-core does not do
41790 * anything else with it.
41791 */
41792 + if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41793 + (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41794 + dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41795 + __func__, dj_report->device_index);
41796 + return false;
41797 + }
41798
41799 /* case 1) */
41800 if (data[0] != REPORT_ID_DJ_SHORT)
41801 diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41802 index bc4269e..b6e6102 100644
41803 --- a/drivers/hid/hid-sony.c
41804 +++ b/drivers/hid/hid-sony.c
41805 @@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41806 __u8 buf[36];
41807 };
41808
41809 +#define DS4_REPORT_0x02_SIZE 37
41810 +#define DS4_REPORT_0x05_SIZE 32
41811 +#define DS4_REPORT_0x11_SIZE 78
41812 +#define DS4_REPORT_0x81_SIZE 7
41813 +#define SIXAXIS_REPORT_0xF2_SIZE 18
41814 +
41815 static spinlock_t sony_dev_list_lock;
41816 static LIST_HEAD(sony_device_list);
41817 static DEFINE_IDA(sony_device_id_allocator);
41818 @@ -811,6 +817,7 @@ struct sony_sc {
41819 struct work_struct state_worker;
41820 struct power_supply battery;
41821 int device_id;
41822 + __u8 *output_report_dmabuf;
41823
41824 #ifdef CONFIG_SONY_FF
41825 __u8 left;
41826 @@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41827
41828 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41829 {
41830 - unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41831 - return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41832 + static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41833 + __u8 *buf;
41834 + int ret;
41835 +
41836 + buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41837 + if (!buf)
41838 + return -ENOMEM;
41839 +
41840 + ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41841 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41842 +
41843 + kfree(buf);
41844 +
41845 + return ret;
41846 }
41847
41848 /*
41849 @@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41850 */
41851 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41852 {
41853 - __u8 buf[37] = { 0 };
41854 + __u8 *buf;
41855 + int ret;
41856
41857 - return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41858 + buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41859 + if (!buf)
41860 + return -ENOMEM;
41861 +
41862 + ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41863 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41864 +
41865 + kfree(buf);
41866 +
41867 + return ret;
41868 }
41869
41870 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41871 @@ -1471,9 +1498,7 @@ error_leds:
41872
41873 static void sixaxis_state_worker(struct work_struct *work)
41874 {
41875 - struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41876 - int n;
41877 - union sixaxis_output_report_01 report = {
41878 + static const union sixaxis_output_report_01 default_report = {
41879 .buf = {
41880 0x01,
41881 0x00, 0xff, 0x00, 0xff, 0x00,
41882 @@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41883 0x00, 0x00, 0x00, 0x00, 0x00
41884 }
41885 };
41886 + struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41887 + struct sixaxis_output_report *report =
41888 + (struct sixaxis_output_report *)sc->output_report_dmabuf;
41889 + int n;
41890 +
41891 + /* Initialize the report with default values */
41892 + memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41893
41894 #ifdef CONFIG_SONY_FF
41895 - report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41896 - report.data.rumble.left_motor_force = sc->left;
41897 + report->rumble.right_motor_on = sc->right ? 1 : 0;
41898 + report->rumble.left_motor_force = sc->left;
41899 #endif
41900
41901 - report.data.leds_bitmap |= sc->led_state[0] << 1;
41902 - report.data.leds_bitmap |= sc->led_state[1] << 2;
41903 - report.data.leds_bitmap |= sc->led_state[2] << 3;
41904 - report.data.leds_bitmap |= sc->led_state[3] << 4;
41905 + report->leds_bitmap |= sc->led_state[0] << 1;
41906 + report->leds_bitmap |= sc->led_state[1] << 2;
41907 + report->leds_bitmap |= sc->led_state[2] << 3;
41908 + report->leds_bitmap |= sc->led_state[3] << 4;
41909
41910 /* Set flag for all leds off, required for 3rd party INTEC controller */
41911 - if ((report.data.leds_bitmap & 0x1E) == 0)
41912 - report.data.leds_bitmap |= 0x20;
41913 + if ((report->leds_bitmap & 0x1E) == 0)
41914 + report->leds_bitmap |= 0x20;
41915
41916 /*
41917 * The LEDs in the report are indexed in reverse order to their
41918 @@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41919 */
41920 for (n = 0; n < 4; n++) {
41921 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41922 - report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41923 - report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41924 + report->led[3 - n].duty_off = sc->led_delay_off[n];
41925 + report->led[3 - n].duty_on = sc->led_delay_on[n];
41926 }
41927 }
41928
41929 - hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41930 - sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41931 + hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41932 + sizeof(struct sixaxis_output_report),
41933 + HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41934 }
41935
41936 static void dualshock4_state_worker(struct work_struct *work)
41937 {
41938 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41939 struct hid_device *hdev = sc->hdev;
41940 + __u8 *buf = sc->output_report_dmabuf;
41941 int offset;
41942
41943 - __u8 buf[78] = { 0 };
41944 -
41945 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41946 + memset(buf, 0, DS4_REPORT_0x05_SIZE);
41947 buf[0] = 0x05;
41948 buf[1] = 0xFF;
41949 offset = 4;
41950 } else {
41951 + memset(buf, 0, DS4_REPORT_0x11_SIZE);
41952 buf[0] = 0x11;
41953 buf[1] = 0xB0;
41954 buf[3] = 0x0F;
41955 @@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41956 buf[offset++] = sc->led_delay_off[3];
41957
41958 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41959 - hid_hw_output_report(hdev, buf, 32);
41960 + hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41961 else
41962 - hid_hw_raw_request(hdev, 0x11, buf, 78,
41963 + hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41964 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41965 }
41966
41967 +static int sony_allocate_output_report(struct sony_sc *sc)
41968 +{
41969 + if (sc->quirks & SIXAXIS_CONTROLLER)
41970 + sc->output_report_dmabuf =
41971 + kmalloc(sizeof(union sixaxis_output_report_01),
41972 + GFP_KERNEL);
41973 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41974 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41975 + GFP_KERNEL);
41976 + else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41977 + sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41978 + GFP_KERNEL);
41979 + else
41980 + return 0;
41981 +
41982 + if (!sc->output_report_dmabuf)
41983 + return -ENOMEM;
41984 +
41985 + return 0;
41986 +}
41987 +
41988 #ifdef CONFIG_SONY_FF
41989 static int sony_play_effect(struct input_dev *dev, void *data,
41990 struct ff_effect *effect)
41991 @@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41992
41993 static int sony_check_add(struct sony_sc *sc)
41994 {
41995 + __u8 *buf = NULL;
41996 int n, ret;
41997
41998 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
41999 @@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
42000 return 0;
42001 }
42002 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
42003 - __u8 buf[7];
42004 + buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
42005 + if (!buf)
42006 + return -ENOMEM;
42007
42008 /*
42009 * The MAC address of a DS4 controller connected via USB can be
42010 * retrieved with feature report 0x81. The address begins at
42011 * offset 1.
42012 */
42013 - ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
42014 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42015 + ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
42016 + DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
42017 + HID_REQ_GET_REPORT);
42018
42019 - if (ret != 7) {
42020 + if (ret != DS4_REPORT_0x81_SIZE) {
42021 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
42022 - return ret < 0 ? ret : -EINVAL;
42023 + ret = ret < 0 ? ret : -EINVAL;
42024 + goto out_free;
42025 }
42026
42027 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
42028 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
42029 - __u8 buf[18];
42030 + buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
42031 + if (!buf)
42032 + return -ENOMEM;
42033
42034 /*
42035 * The MAC address of a Sixaxis controller connected via USB can
42036 * be retrieved with feature report 0xf2. The address begins at
42037 * offset 4.
42038 */
42039 - ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
42040 - HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42041 + ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
42042 + SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
42043 + HID_REQ_GET_REPORT);
42044
42045 - if (ret != 18) {
42046 + if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
42047 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
42048 - return ret < 0 ? ret : -EINVAL;
42049 + ret = ret < 0 ? ret : -EINVAL;
42050 + goto out_free;
42051 }
42052
42053 /*
42054 @@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
42055 return 0;
42056 }
42057
42058 - return sony_check_add_dev_list(sc);
42059 + ret = sony_check_add_dev_list(sc);
42060 +
42061 +out_free:
42062 +
42063 + kfree(buf);
42064 +
42065 + return ret;
42066 }
42067
42068 static int sony_set_device_id(struct sony_sc *sc)
42069 @@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42070 return ret;
42071 }
42072
42073 + ret = sony_allocate_output_report(sc);
42074 + if (ret < 0) {
42075 + hid_err(hdev, "failed to allocate the output report buffer\n");
42076 + goto err_stop;
42077 + }
42078 +
42079 ret = sony_set_device_id(sc);
42080 if (ret < 0) {
42081 hid_err(hdev, "failed to allocate the device id\n");
42082 @@ -1984,6 +2060,7 @@ err_stop:
42083 if (sc->quirks & SONY_BATTERY_SUPPORT)
42084 sony_battery_remove(sc);
42085 sony_cancel_work_sync(sc);
42086 + kfree(sc->output_report_dmabuf);
42087 sony_remove_dev_list(sc);
42088 sony_release_device_id(sc);
42089 hid_hw_stop(hdev);
42090 @@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42091
42092 sony_cancel_work_sync(sc);
42093
42094 + kfree(sc->output_report_dmabuf);
42095 +
42096 sony_remove_dev_list(sc);
42097
42098 sony_release_device_id(sc);
42099 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42100 index c13fb5b..55a3802 100644
42101 --- a/drivers/hid/hid-wiimote-debug.c
42102 +++ b/drivers/hid/hid-wiimote-debug.c
42103 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42104 else if (size == 0)
42105 return -EIO;
42106
42107 - if (copy_to_user(u, buf, size))
42108 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
42109 return -EFAULT;
42110
42111 *off += size;
42112 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42113 index 433f72a..2926005 100644
42114 --- a/drivers/hv/channel.c
42115 +++ b/drivers/hv/channel.c
42116 @@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42117 unsigned long flags;
42118 int ret = 0;
42119
42120 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42121 - atomic_inc(&vmbus_connection.next_gpadl_handle);
42122 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42123 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42124
42125 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42126 if (ret)
42127 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42128 index 3e4235c..877d0e5 100644
42129 --- a/drivers/hv/hv.c
42130 +++ b/drivers/hv/hv.c
42131 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42132 u64 output_address = (output) ? virt_to_phys(output) : 0;
42133 u32 output_address_hi = output_address >> 32;
42134 u32 output_address_lo = output_address & 0xFFFFFFFF;
42135 - void *hypercall_page = hv_context.hypercall_page;
42136 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42137
42138 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42139 "=a"(hv_status_lo) : "d" (control_hi),
42140 @@ -156,7 +156,7 @@ int hv_init(void)
42141 /* See if the hypercall page is already set */
42142 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42143
42144 - virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42145 + virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42146
42147 if (!virtaddr)
42148 goto cleanup;
42149 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42150 index 5e90c5d..d8fcefb 100644
42151 --- a/drivers/hv/hv_balloon.c
42152 +++ b/drivers/hv/hv_balloon.c
42153 @@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42154
42155 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42156 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42157 -static atomic_t trans_id = ATOMIC_INIT(0);
42158 +static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42159
42160 static int dm_ring_size = (5 * PAGE_SIZE);
42161
42162 @@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42163 pr_info("Memory hot add failed\n");
42164
42165 dm->state = DM_INITIALIZED;
42166 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42167 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42168 vmbus_sendpacket(dm->dev->channel, &resp,
42169 sizeof(struct dm_hot_add_response),
42170 (unsigned long)NULL,
42171 @@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42172 memset(&status, 0, sizeof(struct dm_status));
42173 status.hdr.type = DM_STATUS_REPORT;
42174 status.hdr.size = sizeof(struct dm_status);
42175 - status.hdr.trans_id = atomic_inc_return(&trans_id);
42176 + status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42177
42178 /*
42179 * The host expects the guest to report free memory.
42180 @@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42181 * send the status. This can happen if we were interrupted
42182 * after we picked our transaction ID.
42183 */
42184 - if (status.hdr.trans_id != atomic_read(&trans_id))
42185 + if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42186 return;
42187
42188 /*
42189 @@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42190 */
42191
42192 do {
42193 - bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42194 + bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42195 ret = vmbus_sendpacket(dm_device.dev->channel,
42196 bl_resp,
42197 bl_resp->hdr.size,
42198 @@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42199
42200 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42201 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42202 - resp.hdr.trans_id = atomic_inc_return(&trans_id);
42203 + resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42204 resp.hdr.size = sizeof(struct dm_unballoon_response);
42205
42206 vmbus_sendpacket(dm_device.dev->channel, &resp,
42207 @@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42208 memset(&version_req, 0, sizeof(struct dm_version_request));
42209 version_req.hdr.type = DM_VERSION_REQUEST;
42210 version_req.hdr.size = sizeof(struct dm_version_request);
42211 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42212 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42213 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42214 version_req.is_last_attempt = 1;
42215
42216 @@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42217 memset(&version_req, 0, sizeof(struct dm_version_request));
42218 version_req.hdr.type = DM_VERSION_REQUEST;
42219 version_req.hdr.size = sizeof(struct dm_version_request);
42220 - version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42221 + version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42222 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42223 version_req.is_last_attempt = 0;
42224
42225 @@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42226 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42227 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42228 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42229 - cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42230 + cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42231
42232 cap_msg.caps.cap_bits.balloon = 1;
42233 cap_msg.caps.cap_bits.hot_add = 1;
42234 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42235 index c386d8d..d6004c4 100644
42236 --- a/drivers/hv/hyperv_vmbus.h
42237 +++ b/drivers/hv/hyperv_vmbus.h
42238 @@ -611,7 +611,7 @@ enum vmbus_connect_state {
42239 struct vmbus_connection {
42240 enum vmbus_connect_state conn_state;
42241
42242 - atomic_t next_gpadl_handle;
42243 + atomic_unchecked_t next_gpadl_handle;
42244
42245 /*
42246 * Represents channel interrupts. Each bit position represents a
42247 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42248 index 4d6b269..2e23b86 100644
42249 --- a/drivers/hv/vmbus_drv.c
42250 +++ b/drivers/hv/vmbus_drv.c
42251 @@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42252 {
42253 int ret = 0;
42254
42255 - static atomic_t device_num = ATOMIC_INIT(0);
42256 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42257
42258 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42259 - atomic_inc_return(&device_num));
42260 + atomic_inc_return_unchecked(&device_num));
42261
42262 child_device_obj->device.bus = &hv_bus;
42263 child_device_obj->device.parent = &hv_acpi_dev->dev;
42264 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42265 index 579bdf9..75118b5 100644
42266 --- a/drivers/hwmon/acpi_power_meter.c
42267 +++ b/drivers/hwmon/acpi_power_meter.c
42268 @@ -116,7 +116,7 @@ struct sensor_template {
42269 struct device_attribute *devattr,
42270 const char *buf, size_t count);
42271 int index;
42272 -};
42273 +} __do_const;
42274
42275 /* Averaging interval */
42276 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42277 @@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42278 struct sensor_template *attrs)
42279 {
42280 struct device *dev = &resource->acpi_dev->dev;
42281 - struct sensor_device_attribute *sensors =
42282 + sensor_device_attribute_no_const *sensors =
42283 &resource->sensors[resource->num_sensors];
42284 int res = 0;
42285
42286 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42287 index 3288f13..71cfb4e 100644
42288 --- a/drivers/hwmon/applesmc.c
42289 +++ b/drivers/hwmon/applesmc.c
42290 @@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42291 {
42292 struct applesmc_node_group *grp;
42293 struct applesmc_dev_attr *node;
42294 - struct attribute *attr;
42295 + attribute_no_const *attr;
42296 int ret, i;
42297
42298 for (grp = groups; grp->format; grp++) {
42299 diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42300 index cccef87..06ce8ec 100644
42301 --- a/drivers/hwmon/asus_atk0110.c
42302 +++ b/drivers/hwmon/asus_atk0110.c
42303 @@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42304 struct atk_sensor_data {
42305 struct list_head list;
42306 struct atk_data *data;
42307 - struct device_attribute label_attr;
42308 - struct device_attribute input_attr;
42309 - struct device_attribute limit1_attr;
42310 - struct device_attribute limit2_attr;
42311 + device_attribute_no_const label_attr;
42312 + device_attribute_no_const input_attr;
42313 + device_attribute_no_const limit1_attr;
42314 + device_attribute_no_const limit2_attr;
42315 char label_attr_name[ATTR_NAME_SIZE];
42316 char input_attr_name[ATTR_NAME_SIZE];
42317 char limit1_attr_name[ATTR_NAME_SIZE];
42318 @@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42319 static struct device_attribute atk_name_attr =
42320 __ATTR(name, 0444, atk_name_show, NULL);
42321
42322 -static void atk_init_attribute(struct device_attribute *attr, char *name,
42323 +static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42324 sysfs_show_func show)
42325 {
42326 sysfs_attr_init(&attr->attr);
42327 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42328 index d76f0b7..55ae976 100644
42329 --- a/drivers/hwmon/coretemp.c
42330 +++ b/drivers/hwmon/coretemp.c
42331 @@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42332 return NOTIFY_OK;
42333 }
42334
42335 -static struct notifier_block coretemp_cpu_notifier __refdata = {
42336 +static struct notifier_block coretemp_cpu_notifier = {
42337 .notifier_call = coretemp_cpu_callback,
42338 };
42339
42340 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42341 index 7a8a6fb..015c1fd 100644
42342 --- a/drivers/hwmon/ibmaem.c
42343 +++ b/drivers/hwmon/ibmaem.c
42344 @@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42345 struct aem_rw_sensor_template *rw)
42346 {
42347 struct device *dev = &data->pdev->dev;
42348 - struct sensor_device_attribute *sensors = data->sensors;
42349 + sensor_device_attribute_no_const *sensors = data->sensors;
42350 int err;
42351
42352 /* Set up read-only sensors */
42353 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42354 index 14c82da..09b25d7 100644
42355 --- a/drivers/hwmon/iio_hwmon.c
42356 +++ b/drivers/hwmon/iio_hwmon.c
42357 @@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42358 {
42359 struct device *dev = &pdev->dev;
42360 struct iio_hwmon_state *st;
42361 - struct sensor_device_attribute *a;
42362 + sensor_device_attribute_no_const *a;
42363 int ret, i;
42364 int in_i = 1, temp_i = 1, curr_i = 1;
42365 enum iio_chan_type type;
42366 diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42367 index 7710f46..427a28d 100644
42368 --- a/drivers/hwmon/nct6683.c
42369 +++ b/drivers/hwmon/nct6683.c
42370 @@ -397,11 +397,11 @@ static struct attribute_group *
42371 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42372 int repeat)
42373 {
42374 - struct sensor_device_attribute_2 *a2;
42375 - struct sensor_device_attribute *a;
42376 + sensor_device_attribute_2_no_const *a2;
42377 + sensor_device_attribute_no_const *a;
42378 struct sensor_device_template **t;
42379 struct sensor_device_attr_u *su;
42380 - struct attribute_group *group;
42381 + attribute_group_no_const *group;
42382 struct attribute **attrs;
42383 int i, j, count;
42384
42385 diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42386 index 504cbdd..35d6f25 100644
42387 --- a/drivers/hwmon/nct6775.c
42388 +++ b/drivers/hwmon/nct6775.c
42389 @@ -943,10 +943,10 @@ static struct attribute_group *
42390 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42391 int repeat)
42392 {
42393 - struct attribute_group *group;
42394 + attribute_group_no_const *group;
42395 struct sensor_device_attr_u *su;
42396 - struct sensor_device_attribute *a;
42397 - struct sensor_device_attribute_2 *a2;
42398 + sensor_device_attribute_no_const *a;
42399 + sensor_device_attribute_2_no_const *a2;
42400 struct attribute **attrs;
42401 struct sensor_device_template **t;
42402 int i, count;
42403 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42404 index 291d11f..3f0dbbd 100644
42405 --- a/drivers/hwmon/pmbus/pmbus_core.c
42406 +++ b/drivers/hwmon/pmbus/pmbus_core.c
42407 @@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42408 return 0;
42409 }
42410
42411 -static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42412 +static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42413 const char *name,
42414 umode_t mode,
42415 ssize_t (*show)(struct device *dev,
42416 @@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42417 dev_attr->store = store;
42418 }
42419
42420 -static void pmbus_attr_init(struct sensor_device_attribute *a,
42421 +static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42422 const char *name,
42423 umode_t mode,
42424 ssize_t (*show)(struct device *dev,
42425 @@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42426 u16 reg, u8 mask)
42427 {
42428 struct pmbus_boolean *boolean;
42429 - struct sensor_device_attribute *a;
42430 + sensor_device_attribute_no_const *a;
42431
42432 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42433 if (!boolean)
42434 @@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42435 bool update, bool readonly)
42436 {
42437 struct pmbus_sensor *sensor;
42438 - struct device_attribute *a;
42439 + device_attribute_no_const *a;
42440
42441 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42442 if (!sensor)
42443 @@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42444 const char *lstring, int index)
42445 {
42446 struct pmbus_label *label;
42447 - struct device_attribute *a;
42448 + device_attribute_no_const *a;
42449
42450 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42451 if (!label)
42452 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42453 index 97cd45a..ac54d8b 100644
42454 --- a/drivers/hwmon/sht15.c
42455 +++ b/drivers/hwmon/sht15.c
42456 @@ -169,7 +169,7 @@ struct sht15_data {
42457 int supply_uv;
42458 bool supply_uv_valid;
42459 struct work_struct update_supply_work;
42460 - atomic_t interrupt_handled;
42461 + atomic_unchecked_t interrupt_handled;
42462 };
42463
42464 /**
42465 @@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42466 ret = gpio_direction_input(data->pdata->gpio_data);
42467 if (ret)
42468 return ret;
42469 - atomic_set(&data->interrupt_handled, 0);
42470 + atomic_set_unchecked(&data->interrupt_handled, 0);
42471
42472 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42473 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42474 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42475 /* Only relevant if the interrupt hasn't occurred. */
42476 - if (!atomic_read(&data->interrupt_handled))
42477 + if (!atomic_read_unchecked(&data->interrupt_handled))
42478 schedule_work(&data->read_work);
42479 }
42480 ret = wait_event_timeout(data->wait_queue,
42481 @@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42482
42483 /* First disable the interrupt */
42484 disable_irq_nosync(irq);
42485 - atomic_inc(&data->interrupt_handled);
42486 + atomic_inc_unchecked(&data->interrupt_handled);
42487 /* Then schedule a reading work struct */
42488 if (data->state != SHT15_READING_NOTHING)
42489 schedule_work(&data->read_work);
42490 @@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42491 * If not, then start the interrupt again - care here as could
42492 * have gone low in meantime so verify it hasn't!
42493 */
42494 - atomic_set(&data->interrupt_handled, 0);
42495 + atomic_set_unchecked(&data->interrupt_handled, 0);
42496 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42497 /* If still not occurred or another handler was scheduled */
42498 if (gpio_get_value(data->pdata->gpio_data)
42499 - || atomic_read(&data->interrupt_handled))
42500 + || atomic_read_unchecked(&data->interrupt_handled))
42501 return;
42502 }
42503
42504 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42505 index 8df43c5..b07b91d 100644
42506 --- a/drivers/hwmon/via-cputemp.c
42507 +++ b/drivers/hwmon/via-cputemp.c
42508 @@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42509 return NOTIFY_OK;
42510 }
42511
42512 -static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42513 +static struct notifier_block via_cputemp_cpu_notifier = {
42514 .notifier_call = via_cputemp_cpu_callback,
42515 };
42516
42517 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42518 index 65e3240..e6c511d 100644
42519 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
42520 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42521 @@ -39,7 +39,7 @@
42522 extern struct i2c_adapter amd756_smbus;
42523
42524 static struct i2c_adapter *s4882_adapter;
42525 -static struct i2c_algorithm *s4882_algo;
42526 +static i2c_algorithm_no_const *s4882_algo;
42527
42528 /* Wrapper access functions for multiplexed SMBus */
42529 static DEFINE_MUTEX(amd756_lock);
42530 diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42531 index b19a310..d6eece0 100644
42532 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
42533 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42534 @@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42535 /* usb layer */
42536
42537 /* Send command to device, and get response. */
42538 -static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42539 +static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42540 {
42541 int ret = 0;
42542 int actual;
42543 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42544 index 88eda09..cf40434 100644
42545 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42546 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42547 @@ -37,7 +37,7 @@
42548 extern struct i2c_adapter *nforce2_smbus;
42549
42550 static struct i2c_adapter *s4985_adapter;
42551 -static struct i2c_algorithm *s4985_algo;
42552 +static i2c_algorithm_no_const *s4985_algo;
42553
42554 /* Wrapper access functions for multiplexed SMBus */
42555 static DEFINE_MUTEX(nforce2_lock);
42556 diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42557 index 71c7a39..71dd3e0 100644
42558 --- a/drivers/i2c/i2c-dev.c
42559 +++ b/drivers/i2c/i2c-dev.c
42560 @@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42561 break;
42562 }
42563
42564 - data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42565 + data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42566 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42567 if (IS_ERR(rdwr_pa[i].buf)) {
42568 res = PTR_ERR(rdwr_pa[i].buf);
42569 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42570 index 0b510ba..4fbb5085 100644
42571 --- a/drivers/ide/ide-cd.c
42572 +++ b/drivers/ide/ide-cd.c
42573 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42574 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42575 if ((unsigned long)buf & alignment
42576 || blk_rq_bytes(rq) & q->dma_pad_mask
42577 - || object_is_on_stack(buf))
42578 + || object_starts_on_stack(buf))
42579 drive->dma = 0;
42580 }
42581 }
42582 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42583 index af3e76d..96dfe5e 100644
42584 --- a/drivers/iio/industrialio-core.c
42585 +++ b/drivers/iio/industrialio-core.c
42586 @@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42587 }
42588
42589 static
42590 -int __iio_device_attr_init(struct device_attribute *dev_attr,
42591 +int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42592 const char *postfix,
42593 struct iio_chan_spec const *chan,
42594 ssize_t (*readfunc)(struct device *dev,
42595 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42596 index e28a494..f7c2671 100644
42597 --- a/drivers/infiniband/core/cm.c
42598 +++ b/drivers/infiniband/core/cm.c
42599 @@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42600
42601 struct cm_counter_group {
42602 struct kobject obj;
42603 - atomic_long_t counter[CM_ATTR_COUNT];
42604 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42605 };
42606
42607 struct cm_counter_attribute {
42608 @@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42609 struct ib_mad_send_buf *msg = NULL;
42610 int ret;
42611
42612 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42613 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42614 counter[CM_REQ_COUNTER]);
42615
42616 /* Quick state check to discard duplicate REQs. */
42617 @@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42618 if (!cm_id_priv)
42619 return;
42620
42621 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42622 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42623 counter[CM_REP_COUNTER]);
42624 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42625 if (ret)
42626 @@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42627 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42628 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42629 spin_unlock_irq(&cm_id_priv->lock);
42630 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42631 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42632 counter[CM_RTU_COUNTER]);
42633 goto out;
42634 }
42635 @@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42636 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42637 dreq_msg->local_comm_id);
42638 if (!cm_id_priv) {
42639 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42640 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42641 counter[CM_DREQ_COUNTER]);
42642 cm_issue_drep(work->port, work->mad_recv_wc);
42643 return -EINVAL;
42644 @@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42645 case IB_CM_MRA_REP_RCVD:
42646 break;
42647 case IB_CM_TIMEWAIT:
42648 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42649 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42650 counter[CM_DREQ_COUNTER]);
42651 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42652 goto unlock;
42653 @@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42654 cm_free_msg(msg);
42655 goto deref;
42656 case IB_CM_DREQ_RCVD:
42657 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42658 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42659 counter[CM_DREQ_COUNTER]);
42660 goto unlock;
42661 default:
42662 @@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42663 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42664 cm_id_priv->msg, timeout)) {
42665 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42666 - atomic_long_inc(&work->port->
42667 + atomic_long_inc_unchecked(&work->port->
42668 counter_group[CM_RECV_DUPLICATES].
42669 counter[CM_MRA_COUNTER]);
42670 goto out;
42671 @@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42672 break;
42673 case IB_CM_MRA_REQ_RCVD:
42674 case IB_CM_MRA_REP_RCVD:
42675 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42676 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42677 counter[CM_MRA_COUNTER]);
42678 /* fall through */
42679 default:
42680 @@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42681 case IB_CM_LAP_IDLE:
42682 break;
42683 case IB_CM_MRA_LAP_SENT:
42684 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42685 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42686 counter[CM_LAP_COUNTER]);
42687 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42688 goto unlock;
42689 @@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42690 cm_free_msg(msg);
42691 goto deref;
42692 case IB_CM_LAP_RCVD:
42693 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42694 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42695 counter[CM_LAP_COUNTER]);
42696 goto unlock;
42697 default:
42698 @@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42699 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42700 if (cur_cm_id_priv) {
42701 spin_unlock_irq(&cm.lock);
42702 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42703 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42704 counter[CM_SIDR_REQ_COUNTER]);
42705 goto out; /* Duplicate message. */
42706 }
42707 @@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42708 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42709 msg->retries = 1;
42710
42711 - atomic_long_add(1 + msg->retries,
42712 + atomic_long_add_unchecked(1 + msg->retries,
42713 &port->counter_group[CM_XMIT].counter[attr_index]);
42714 if (msg->retries)
42715 - atomic_long_add(msg->retries,
42716 + atomic_long_add_unchecked(msg->retries,
42717 &port->counter_group[CM_XMIT_RETRIES].
42718 counter[attr_index]);
42719
42720 @@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42721 }
42722
42723 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42724 - atomic_long_inc(&port->counter_group[CM_RECV].
42725 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42726 counter[attr_id - CM_ATTR_ID_OFFSET]);
42727
42728 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42729 @@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42730 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42731
42732 return sprintf(buf, "%ld\n",
42733 - atomic_long_read(&group->counter[cm_attr->index]));
42734 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42735 }
42736
42737 static const struct sysfs_ops cm_counter_ops = {
42738 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42739 index 9f5ad7c..588cd84 100644
42740 --- a/drivers/infiniband/core/fmr_pool.c
42741 +++ b/drivers/infiniband/core/fmr_pool.c
42742 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
42743
42744 struct task_struct *thread;
42745
42746 - atomic_t req_ser;
42747 - atomic_t flush_ser;
42748 + atomic_unchecked_t req_ser;
42749 + atomic_unchecked_t flush_ser;
42750
42751 wait_queue_head_t force_wait;
42752 };
42753 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42754 struct ib_fmr_pool *pool = pool_ptr;
42755
42756 do {
42757 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42758 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42759 ib_fmr_batch_release(pool);
42760
42761 - atomic_inc(&pool->flush_ser);
42762 + atomic_inc_unchecked(&pool->flush_ser);
42763 wake_up_interruptible(&pool->force_wait);
42764
42765 if (pool->flush_function)
42766 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42767 }
42768
42769 set_current_state(TASK_INTERRUPTIBLE);
42770 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42771 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42772 !kthread_should_stop())
42773 schedule();
42774 __set_current_state(TASK_RUNNING);
42775 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42776 pool->dirty_watermark = params->dirty_watermark;
42777 pool->dirty_len = 0;
42778 spin_lock_init(&pool->pool_lock);
42779 - atomic_set(&pool->req_ser, 0);
42780 - atomic_set(&pool->flush_ser, 0);
42781 + atomic_set_unchecked(&pool->req_ser, 0);
42782 + atomic_set_unchecked(&pool->flush_ser, 0);
42783 init_waitqueue_head(&pool->force_wait);
42784
42785 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42786 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42787 }
42788 spin_unlock_irq(&pool->pool_lock);
42789
42790 - serial = atomic_inc_return(&pool->req_ser);
42791 + serial = atomic_inc_return_unchecked(&pool->req_ser);
42792 wake_up_process(pool->thread);
42793
42794 if (wait_event_interruptible(pool->force_wait,
42795 - atomic_read(&pool->flush_ser) - serial >= 0))
42796 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42797 return -EINTR;
42798
42799 return 0;
42800 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42801 } else {
42802 list_add_tail(&fmr->list, &pool->dirty_list);
42803 if (++pool->dirty_len >= pool->dirty_watermark) {
42804 - atomic_inc(&pool->req_ser);
42805 + atomic_inc_unchecked(&pool->req_ser);
42806 wake_up_process(pool->thread);
42807 }
42808 }
42809 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42810 index ec7a298..8742e59 100644
42811 --- a/drivers/infiniband/hw/cxgb4/mem.c
42812 +++ b/drivers/infiniband/hw/cxgb4/mem.c
42813 @@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42814 int err;
42815 struct fw_ri_tpte tpt;
42816 u32 stag_idx;
42817 - static atomic_t key;
42818 + static atomic_unchecked_t key;
42819
42820 if (c4iw_fatal_error(rdev))
42821 return -EIO;
42822 @@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42823 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42824 rdev->stats.stag.max = rdev->stats.stag.cur;
42825 mutex_unlock(&rdev->stats.lock);
42826 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42827 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42828 }
42829 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42830 __func__, stag_state, type, pdid, stag_idx);
42831 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42832 index 79b3dbc..96e5fcc 100644
42833 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
42834 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42835 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42836 struct ib_atomic_eth *ateth;
42837 struct ipath_ack_entry *e;
42838 u64 vaddr;
42839 - atomic64_t *maddr;
42840 + atomic64_unchecked_t *maddr;
42841 u64 sdata;
42842 u32 rkey;
42843 u8 next;
42844 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42845 IB_ACCESS_REMOTE_ATOMIC)))
42846 goto nack_acc_unlck;
42847 /* Perform atomic OP and save result. */
42848 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42849 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42850 sdata = be64_to_cpu(ateth->swap_data);
42851 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42852 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42853 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42854 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42855 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42856 be64_to_cpu(ateth->compare_data),
42857 sdata);
42858 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42859 index 1f95bba..9530f87 100644
42860 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42861 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42862 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42863 unsigned long flags;
42864 struct ib_wc wc;
42865 u64 sdata;
42866 - atomic64_t *maddr;
42867 + atomic64_unchecked_t *maddr;
42868 enum ib_wc_status send_status;
42869
42870 /*
42871 @@ -382,11 +382,11 @@ again:
42872 IB_ACCESS_REMOTE_ATOMIC)))
42873 goto acc_err;
42874 /* Perform atomic OP and save result. */
42875 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42876 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42877 sdata = wqe->wr.wr.atomic.compare_add;
42878 *(u64 *) sqp->s_sge.sge.vaddr =
42879 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42880 - (u64) atomic64_add_return(sdata, maddr) - sdata :
42881 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42882 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42883 sdata, wqe->wr.wr.atomic.swap);
42884 goto send_comp;
42885 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42886 index 82a7dd8..8fb6ba6 100644
42887 --- a/drivers/infiniband/hw/mlx4/mad.c
42888 +++ b/drivers/infiniband/hw/mlx4/mad.c
42889 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42890
42891 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42892 {
42893 - return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42894 + return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42895 cpu_to_be64(0xff00000000000000LL);
42896 }
42897
42898 diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42899 index ed327e6..ca1739e0 100644
42900 --- a/drivers/infiniband/hw/mlx4/mcg.c
42901 +++ b/drivers/infiniband/hw/mlx4/mcg.c
42902 @@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42903 {
42904 char name[20];
42905
42906 - atomic_set(&ctx->tid, 0);
42907 + atomic_set_unchecked(&ctx->tid, 0);
42908 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42909 ctx->mcg_wq = create_singlethread_workqueue(name);
42910 if (!ctx->mcg_wq)
42911 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42912 index 6eb743f..a7b0f6d 100644
42913 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42914 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42915 @@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42916 struct list_head mcg_mgid0_list;
42917 struct workqueue_struct *mcg_wq;
42918 struct mlx4_ib_demux_pv_ctx **tun;
42919 - atomic_t tid;
42920 + atomic_unchecked_t tid;
42921 int flushing; /* flushing the work queue */
42922 };
42923
42924 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42925 index 9d3e5c1..6f166df 100644
42926 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42927 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42928 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42929 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42930 }
42931
42932 -int mthca_QUERY_FW(struct mthca_dev *dev)
42933 +int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42934 {
42935 struct mthca_mailbox *mailbox;
42936 u32 *outbox;
42937 @@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42938 CMD_TIME_CLASS_B);
42939 }
42940
42941 -int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42942 +int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42943 int num_mtt)
42944 {
42945 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42946 @@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42947 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42948 }
42949
42950 -int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42951 +int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42952 int eq_num)
42953 {
42954 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42955 @@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42956 CMD_TIME_CLASS_B);
42957 }
42958
42959 -int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42960 +int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42961 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42962 void *in_mad, void *response_mad)
42963 {
42964 diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42965 index ded76c1..0cf0a08 100644
42966 --- a/drivers/infiniband/hw/mthca/mthca_main.c
42967 +++ b/drivers/infiniband/hw/mthca/mthca_main.c
42968 @@ -692,7 +692,7 @@ err_close:
42969 return err;
42970 }
42971
42972 -static int mthca_setup_hca(struct mthca_dev *dev)
42973 +static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42974 {
42975 int err;
42976
42977 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42978 index ed9a989..6aa5dc2 100644
42979 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
42980 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42981 @@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42982 * through the bitmaps)
42983 */
42984
42985 -static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42986 +static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42987 {
42988 int o;
42989 int m;
42990 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42991 return key;
42992 }
42993
42994 -int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42995 +int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42996 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42997 {
42998 struct mthca_mailbox *mailbox;
42999 @@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43000 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43001 }
43002
43003 -int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43004 +int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43005 u64 *buffer_list, int buffer_size_shift,
43006 int list_len, u64 iova, u64 total_size,
43007 u32 access, struct mthca_mr *mr)
43008 diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43009 index 415f8e1..e34214e 100644
43010 --- a/drivers/infiniband/hw/mthca/mthca_provider.c
43011 +++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43012 @@ -764,7 +764,7 @@ unlock:
43013 return 0;
43014 }
43015
43016 -static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43017 +static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43018 {
43019 struct mthca_dev *dev = to_mdev(ibcq->device);
43020 struct mthca_cq *cq = to_mcq(ibcq);
43021 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43022 index 3b2a6dc..bce26ff 100644
43023 --- a/drivers/infiniband/hw/nes/nes.c
43024 +++ b/drivers/infiniband/hw/nes/nes.c
43025 @@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43026 LIST_HEAD(nes_adapter_list);
43027 static LIST_HEAD(nes_dev_list);
43028
43029 -atomic_t qps_destroyed;
43030 +atomic_unchecked_t qps_destroyed;
43031
43032 static unsigned int ee_flsh_adapter;
43033 static unsigned int sysfs_nonidx_addr;
43034 @@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43035 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43036 struct nes_adapter *nesadapter = nesdev->nesadapter;
43037
43038 - atomic_inc(&qps_destroyed);
43039 + atomic_inc_unchecked(&qps_destroyed);
43040
43041 /* Free the control structures */
43042
43043 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43044 index bd9d132..70d84f4 100644
43045 --- a/drivers/infiniband/hw/nes/nes.h
43046 +++ b/drivers/infiniband/hw/nes/nes.h
43047 @@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43048 extern unsigned int wqm_quanta;
43049 extern struct list_head nes_adapter_list;
43050
43051 -extern atomic_t cm_connects;
43052 -extern atomic_t cm_accepts;
43053 -extern atomic_t cm_disconnects;
43054 -extern atomic_t cm_closes;
43055 -extern atomic_t cm_connecteds;
43056 -extern atomic_t cm_connect_reqs;
43057 -extern atomic_t cm_rejects;
43058 -extern atomic_t mod_qp_timouts;
43059 -extern atomic_t qps_created;
43060 -extern atomic_t qps_destroyed;
43061 -extern atomic_t sw_qps_destroyed;
43062 +extern atomic_unchecked_t cm_connects;
43063 +extern atomic_unchecked_t cm_accepts;
43064 +extern atomic_unchecked_t cm_disconnects;
43065 +extern atomic_unchecked_t cm_closes;
43066 +extern atomic_unchecked_t cm_connecteds;
43067 +extern atomic_unchecked_t cm_connect_reqs;
43068 +extern atomic_unchecked_t cm_rejects;
43069 +extern atomic_unchecked_t mod_qp_timouts;
43070 +extern atomic_unchecked_t qps_created;
43071 +extern atomic_unchecked_t qps_destroyed;
43072 +extern atomic_unchecked_t sw_qps_destroyed;
43073 extern u32 mh_detected;
43074 extern u32 mh_pauses_sent;
43075 extern u32 cm_packets_sent;
43076 @@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43077 extern u32 cm_packets_received;
43078 extern u32 cm_packets_dropped;
43079 extern u32 cm_packets_retrans;
43080 -extern atomic_t cm_listens_created;
43081 -extern atomic_t cm_listens_destroyed;
43082 +extern atomic_unchecked_t cm_listens_created;
43083 +extern atomic_unchecked_t cm_listens_destroyed;
43084 extern u32 cm_backlog_drops;
43085 -extern atomic_t cm_loopbacks;
43086 -extern atomic_t cm_nodes_created;
43087 -extern atomic_t cm_nodes_destroyed;
43088 -extern atomic_t cm_accel_dropped_pkts;
43089 -extern atomic_t cm_resets_recvd;
43090 -extern atomic_t pau_qps_created;
43091 -extern atomic_t pau_qps_destroyed;
43092 +extern atomic_unchecked_t cm_loopbacks;
43093 +extern atomic_unchecked_t cm_nodes_created;
43094 +extern atomic_unchecked_t cm_nodes_destroyed;
43095 +extern atomic_unchecked_t cm_accel_dropped_pkts;
43096 +extern atomic_unchecked_t cm_resets_recvd;
43097 +extern atomic_unchecked_t pau_qps_created;
43098 +extern atomic_unchecked_t pau_qps_destroyed;
43099
43100 extern u32 int_mod_timer_init;
43101 extern u32 int_mod_cq_depth_256;
43102 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43103 index 6f09a72..cf4399d 100644
43104 --- a/drivers/infiniband/hw/nes/nes_cm.c
43105 +++ b/drivers/infiniband/hw/nes/nes_cm.c
43106 @@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43107 u32 cm_packets_retrans;
43108 u32 cm_packets_created;
43109 u32 cm_packets_received;
43110 -atomic_t cm_listens_created;
43111 -atomic_t cm_listens_destroyed;
43112 +atomic_unchecked_t cm_listens_created;
43113 +atomic_unchecked_t cm_listens_destroyed;
43114 u32 cm_backlog_drops;
43115 -atomic_t cm_loopbacks;
43116 -atomic_t cm_nodes_created;
43117 -atomic_t cm_nodes_destroyed;
43118 -atomic_t cm_accel_dropped_pkts;
43119 -atomic_t cm_resets_recvd;
43120 +atomic_unchecked_t cm_loopbacks;
43121 +atomic_unchecked_t cm_nodes_created;
43122 +atomic_unchecked_t cm_nodes_destroyed;
43123 +atomic_unchecked_t cm_accel_dropped_pkts;
43124 +atomic_unchecked_t cm_resets_recvd;
43125
43126 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43127 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43128 @@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43129 /* instance of function pointers for client API */
43130 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43131 static struct nes_cm_ops nes_cm_api = {
43132 - mini_cm_accelerated,
43133 - mini_cm_listen,
43134 - mini_cm_del_listen,
43135 - mini_cm_connect,
43136 - mini_cm_close,
43137 - mini_cm_accept,
43138 - mini_cm_reject,
43139 - mini_cm_recv_pkt,
43140 - mini_cm_dealloc_core,
43141 - mini_cm_get,
43142 - mini_cm_set
43143 + .accelerated = mini_cm_accelerated,
43144 + .listen = mini_cm_listen,
43145 + .stop_listener = mini_cm_del_listen,
43146 + .connect = mini_cm_connect,
43147 + .close = mini_cm_close,
43148 + .accept = mini_cm_accept,
43149 + .reject = mini_cm_reject,
43150 + .recv_pkt = mini_cm_recv_pkt,
43151 + .destroy_cm_core = mini_cm_dealloc_core,
43152 + .get = mini_cm_get,
43153 + .set = mini_cm_set
43154 };
43155
43156 static struct nes_cm_core *g_cm_core;
43157
43158 -atomic_t cm_connects;
43159 -atomic_t cm_accepts;
43160 -atomic_t cm_disconnects;
43161 -atomic_t cm_closes;
43162 -atomic_t cm_connecteds;
43163 -atomic_t cm_connect_reqs;
43164 -atomic_t cm_rejects;
43165 +atomic_unchecked_t cm_connects;
43166 +atomic_unchecked_t cm_accepts;
43167 +atomic_unchecked_t cm_disconnects;
43168 +atomic_unchecked_t cm_closes;
43169 +atomic_unchecked_t cm_connecteds;
43170 +atomic_unchecked_t cm_connect_reqs;
43171 +atomic_unchecked_t cm_rejects;
43172
43173 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43174 {
43175 @@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43176 kfree(listener);
43177 listener = NULL;
43178 ret = 0;
43179 - atomic_inc(&cm_listens_destroyed);
43180 + atomic_inc_unchecked(&cm_listens_destroyed);
43181 } else {
43182 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43183 }
43184 @@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43185 cm_node->rem_mac);
43186
43187 add_hte_node(cm_core, cm_node);
43188 - atomic_inc(&cm_nodes_created);
43189 + atomic_inc_unchecked(&cm_nodes_created);
43190
43191 return cm_node;
43192 }
43193 @@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43194 }
43195
43196 atomic_dec(&cm_core->node_cnt);
43197 - atomic_inc(&cm_nodes_destroyed);
43198 + atomic_inc_unchecked(&cm_nodes_destroyed);
43199 nesqp = cm_node->nesqp;
43200 if (nesqp) {
43201 nesqp->cm_node = NULL;
43202 @@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43203
43204 static void drop_packet(struct sk_buff *skb)
43205 {
43206 - atomic_inc(&cm_accel_dropped_pkts);
43207 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43208 dev_kfree_skb_any(skb);
43209 }
43210
43211 @@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43212 {
43213
43214 int reset = 0; /* whether to send reset in case of err.. */
43215 - atomic_inc(&cm_resets_recvd);
43216 + atomic_inc_unchecked(&cm_resets_recvd);
43217 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43218 " refcnt=%d\n", cm_node, cm_node->state,
43219 atomic_read(&cm_node->ref_count));
43220 @@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43221 rem_ref_cm_node(cm_node->cm_core, cm_node);
43222 return NULL;
43223 }
43224 - atomic_inc(&cm_loopbacks);
43225 + atomic_inc_unchecked(&cm_loopbacks);
43226 loopbackremotenode->loopbackpartner = cm_node;
43227 loopbackremotenode->tcp_cntxt.rcv_wscale =
43228 NES_CM_DEFAULT_RCV_WND_SCALE;
43229 @@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43230 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43231 else {
43232 rem_ref_cm_node(cm_core, cm_node);
43233 - atomic_inc(&cm_accel_dropped_pkts);
43234 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
43235 dev_kfree_skb_any(skb);
43236 }
43237 break;
43238 @@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43239
43240 if ((cm_id) && (cm_id->event_handler)) {
43241 if (issue_disconn) {
43242 - atomic_inc(&cm_disconnects);
43243 + atomic_inc_unchecked(&cm_disconnects);
43244 cm_event.event = IW_CM_EVENT_DISCONNECT;
43245 cm_event.status = disconn_status;
43246 cm_event.local_addr = cm_id->local_addr;
43247 @@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43248 }
43249
43250 if (issue_close) {
43251 - atomic_inc(&cm_closes);
43252 + atomic_inc_unchecked(&cm_closes);
43253 nes_disconnect(nesqp, 1);
43254
43255 cm_id->provider_data = nesqp;
43256 @@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43257
43258 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43259 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43260 - atomic_inc(&cm_accepts);
43261 + atomic_inc_unchecked(&cm_accepts);
43262
43263 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43264 netdev_refcnt_read(nesvnic->netdev));
43265 @@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43266 struct nes_cm_core *cm_core;
43267 u8 *start_buff;
43268
43269 - atomic_inc(&cm_rejects);
43270 + atomic_inc_unchecked(&cm_rejects);
43271 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43272 loopback = cm_node->loopbackpartner;
43273 cm_core = cm_node->cm_core;
43274 @@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43275 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43276 ntohs(laddr->sin_port));
43277
43278 - atomic_inc(&cm_connects);
43279 + atomic_inc_unchecked(&cm_connects);
43280 nesqp->active_conn = 1;
43281
43282 /* cache the cm_id in the qp */
43283 @@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43284 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43285 return err;
43286 }
43287 - atomic_inc(&cm_listens_created);
43288 + atomic_inc_unchecked(&cm_listens_created);
43289 }
43290
43291 cm_id->add_ref(cm_id);
43292 @@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43293
43294 if (nesqp->destroyed)
43295 return;
43296 - atomic_inc(&cm_connecteds);
43297 + atomic_inc_unchecked(&cm_connecteds);
43298 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43299 " local port 0x%04X. jiffies = %lu.\n",
43300 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43301 @@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43302
43303 cm_id->add_ref(cm_id);
43304 ret = cm_id->event_handler(cm_id, &cm_event);
43305 - atomic_inc(&cm_closes);
43306 + atomic_inc_unchecked(&cm_closes);
43307 cm_event.event = IW_CM_EVENT_CLOSE;
43308 cm_event.status = 0;
43309 cm_event.provider_data = cm_id->provider_data;
43310 @@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43311 return;
43312 cm_id = cm_node->cm_id;
43313
43314 - atomic_inc(&cm_connect_reqs);
43315 + atomic_inc_unchecked(&cm_connect_reqs);
43316 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43317 cm_node, cm_id, jiffies);
43318
43319 @@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43320 return;
43321 cm_id = cm_node->cm_id;
43322
43323 - atomic_inc(&cm_connect_reqs);
43324 + atomic_inc_unchecked(&cm_connect_reqs);
43325 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43326 cm_node, cm_id, jiffies);
43327
43328 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43329 index 4166452..fc952c3 100644
43330 --- a/drivers/infiniband/hw/nes/nes_mgt.c
43331 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
43332 @@ -40,8 +40,8 @@
43333 #include "nes.h"
43334 #include "nes_mgt.h"
43335
43336 -atomic_t pau_qps_created;
43337 -atomic_t pau_qps_destroyed;
43338 +atomic_unchecked_t pau_qps_created;
43339 +atomic_unchecked_t pau_qps_destroyed;
43340
43341 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43342 {
43343 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43344 {
43345 struct sk_buff *skb;
43346 unsigned long flags;
43347 - atomic_inc(&pau_qps_destroyed);
43348 + atomic_inc_unchecked(&pau_qps_destroyed);
43349
43350 /* Free packets that have not yet been forwarded */
43351 /* Lock is acquired by skb_dequeue when removing the skb */
43352 @@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43353 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43354 skb_queue_head_init(&nesqp->pau_list);
43355 spin_lock_init(&nesqp->pau_lock);
43356 - atomic_inc(&pau_qps_created);
43357 + atomic_inc_unchecked(&pau_qps_created);
43358 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43359 }
43360
43361 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43362 index 49eb511..a774366 100644
43363 --- a/drivers/infiniband/hw/nes/nes_nic.c
43364 +++ b/drivers/infiniband/hw/nes/nes_nic.c
43365 @@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43366 target_stat_values[++index] = mh_detected;
43367 target_stat_values[++index] = mh_pauses_sent;
43368 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43369 - target_stat_values[++index] = atomic_read(&cm_connects);
43370 - target_stat_values[++index] = atomic_read(&cm_accepts);
43371 - target_stat_values[++index] = atomic_read(&cm_disconnects);
43372 - target_stat_values[++index] = atomic_read(&cm_connecteds);
43373 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43374 - target_stat_values[++index] = atomic_read(&cm_rejects);
43375 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43376 - target_stat_values[++index] = atomic_read(&qps_created);
43377 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43378 - target_stat_values[++index] = atomic_read(&qps_destroyed);
43379 - target_stat_values[++index] = atomic_read(&cm_closes);
43380 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43381 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43382 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43383 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43384 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43385 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43386 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43387 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43388 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43389 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43390 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43391 target_stat_values[++index] = cm_packets_sent;
43392 target_stat_values[++index] = cm_packets_bounced;
43393 target_stat_values[++index] = cm_packets_created;
43394 target_stat_values[++index] = cm_packets_received;
43395 target_stat_values[++index] = cm_packets_dropped;
43396 target_stat_values[++index] = cm_packets_retrans;
43397 - target_stat_values[++index] = atomic_read(&cm_listens_created);
43398 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43399 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43400 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43401 target_stat_values[++index] = cm_backlog_drops;
43402 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
43403 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
43404 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43405 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43406 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43407 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43408 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43409 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43410 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43411 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43412 target_stat_values[++index] = nesadapter->free_4kpbl;
43413 target_stat_values[++index] = nesadapter->free_256pbl;
43414 target_stat_values[++index] = int_mod_timer_init;
43415 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43416 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43417 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43418 - target_stat_values[++index] = atomic_read(&pau_qps_created);
43419 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43420 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43421 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43422 }
43423
43424 /**
43425 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43426 index fef067c..6a25ccd 100644
43427 --- a/drivers/infiniband/hw/nes/nes_verbs.c
43428 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
43429 @@ -46,9 +46,9 @@
43430
43431 #include <rdma/ib_umem.h>
43432
43433 -atomic_t mod_qp_timouts;
43434 -atomic_t qps_created;
43435 -atomic_t sw_qps_destroyed;
43436 +atomic_unchecked_t mod_qp_timouts;
43437 +atomic_unchecked_t qps_created;
43438 +atomic_unchecked_t sw_qps_destroyed;
43439
43440 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43441
43442 @@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43443 if (init_attr->create_flags)
43444 return ERR_PTR(-EINVAL);
43445
43446 - atomic_inc(&qps_created);
43447 + atomic_inc_unchecked(&qps_created);
43448 switch (init_attr->qp_type) {
43449 case IB_QPT_RC:
43450 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43451 @@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43452 struct iw_cm_event cm_event;
43453 int ret = 0;
43454
43455 - atomic_inc(&sw_qps_destroyed);
43456 + atomic_inc_unchecked(&sw_qps_destroyed);
43457 nesqp->destroyed = 1;
43458
43459 /* Blow away the connection if it exists. */
43460 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43461 index c00ae09..04e91be 100644
43462 --- a/drivers/infiniband/hw/qib/qib.h
43463 +++ b/drivers/infiniband/hw/qib/qib.h
43464 @@ -52,6 +52,7 @@
43465 #include <linux/kref.h>
43466 #include <linux/sched.h>
43467 #include <linux/kthread.h>
43468 +#include <linux/slab.h>
43469
43470 #include "qib_common.h"
43471 #include "qib_verbs.h"
43472 diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43473 index cdc7df4..a2fdfdb 100644
43474 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43475 +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43476 @@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43477 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43478 }
43479
43480 -static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43481 +static struct rtnl_link_ops ipoib_link_ops = {
43482 .kind = "ipoib",
43483 .maxtype = IFLA_IPOIB_MAX,
43484 .policy = ipoib_policy,
43485 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43486 index e29c04e..adbf68c 100644
43487 --- a/drivers/input/gameport/gameport.c
43488 +++ b/drivers/input/gameport/gameport.c
43489 @@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43490 */
43491 static void gameport_init_port(struct gameport *gameport)
43492 {
43493 - static atomic_t gameport_no = ATOMIC_INIT(0);
43494 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43495
43496 __module_get(THIS_MODULE);
43497
43498 mutex_init(&gameport->drv_mutex);
43499 device_initialize(&gameport->dev);
43500 dev_set_name(&gameport->dev, "gameport%lu",
43501 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
43502 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43503 gameport->dev.bus = &gameport_bus;
43504 gameport->dev.release = gameport_release_port;
43505 if (gameport->parent)
43506 diff --git a/drivers/input/input.c b/drivers/input/input.c
43507 index 0f175f5..4c481c0 100644
43508 --- a/drivers/input/input.c
43509 +++ b/drivers/input/input.c
43510 @@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43511 */
43512 struct input_dev *input_allocate_device(void)
43513 {
43514 - static atomic_t input_no = ATOMIC_INIT(0);
43515 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43516 struct input_dev *dev;
43517
43518 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43519 @@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43520 INIT_LIST_HEAD(&dev->node);
43521
43522 dev_set_name(&dev->dev, "input%lu",
43523 - (unsigned long) atomic_inc_return(&input_no) - 1);
43524 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43525
43526 __module_get(THIS_MODULE);
43527 }
43528 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43529 index 4a95b22..874c182 100644
43530 --- a/drivers/input/joystick/sidewinder.c
43531 +++ b/drivers/input/joystick/sidewinder.c
43532 @@ -30,6 +30,7 @@
43533 #include <linux/kernel.h>
43534 #include <linux/module.h>
43535 #include <linux/slab.h>
43536 +#include <linux/sched.h>
43537 #include <linux/input.h>
43538 #include <linux/gameport.h>
43539 #include <linux/jiffies.h>
43540 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43541 index fc55f0d..11e2aa6 100644
43542 --- a/drivers/input/joystick/xpad.c
43543 +++ b/drivers/input/joystick/xpad.c
43544 @@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43545
43546 static int xpad_led_probe(struct usb_xpad *xpad)
43547 {
43548 - static atomic_t led_seq = ATOMIC_INIT(0);
43549 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43550 long led_no;
43551 struct xpad_led *led;
43552 struct led_classdev *led_cdev;
43553 @@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43554 if (!led)
43555 return -ENOMEM;
43556
43557 - led_no = (long)atomic_inc_return(&led_seq) - 1;
43558 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43559
43560 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43561 led->xpad = xpad;
43562 diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43563 index afed8e2..3aa8a18 100644
43564 --- a/drivers/input/misc/ims-pcu.c
43565 +++ b/drivers/input/misc/ims-pcu.c
43566 @@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43567
43568 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43569 {
43570 - static atomic_t device_no = ATOMIC_INIT(0);
43571 + static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43572
43573 const struct ims_pcu_device_info *info;
43574 int error;
43575 @@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43576 }
43577
43578 /* Device appears to be operable, complete initialization */
43579 - pcu->device_no = atomic_inc_return(&device_no) - 1;
43580 + pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43581
43582 /*
43583 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43584 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43585 index f4cf664..3204fda 100644
43586 --- a/drivers/input/mouse/psmouse.h
43587 +++ b/drivers/input/mouse/psmouse.h
43588 @@ -117,7 +117,7 @@ struct psmouse_attribute {
43589 ssize_t (*set)(struct psmouse *psmouse, void *data,
43590 const char *buf, size_t count);
43591 bool protect;
43592 -};
43593 +} __do_const;
43594 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43595
43596 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43597 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43598 index b604564..3f14ae4 100644
43599 --- a/drivers/input/mousedev.c
43600 +++ b/drivers/input/mousedev.c
43601 @@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43602
43603 spin_unlock_irq(&client->packet_lock);
43604
43605 - if (copy_to_user(buffer, data, count))
43606 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
43607 return -EFAULT;
43608
43609 return count;
43610 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43611 index d399b8b..4913ede 100644
43612 --- a/drivers/input/serio/serio.c
43613 +++ b/drivers/input/serio/serio.c
43614 @@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43615 */
43616 static void serio_init_port(struct serio *serio)
43617 {
43618 - static atomic_t serio_no = ATOMIC_INIT(0);
43619 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43620
43621 __module_get(THIS_MODULE);
43622
43623 @@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43624 mutex_init(&serio->drv_mutex);
43625 device_initialize(&serio->dev);
43626 dev_set_name(&serio->dev, "serio%lu",
43627 - (unsigned long)atomic_inc_return(&serio_no) - 1);
43628 + (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43629 serio->dev.bus = &serio_bus;
43630 serio->dev.release = serio_release_port;
43631 serio->dev.groups = serio_device_attr_groups;
43632 diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43633 index c9a02fe..0debc75 100644
43634 --- a/drivers/input/serio/serio_raw.c
43635 +++ b/drivers/input/serio/serio_raw.c
43636 @@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43637
43638 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43639 {
43640 - static atomic_t serio_raw_no = ATOMIC_INIT(0);
43641 + static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43642 struct serio_raw *serio_raw;
43643 int err;
43644
43645 @@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43646 }
43647
43648 snprintf(serio_raw->name, sizeof(serio_raw->name),
43649 - "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43650 + "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43651 kref_init(&serio_raw->kref);
43652 INIT_LIST_HEAD(&serio_raw->client_list);
43653 init_waitqueue_head(&serio_raw->wait);
43654 diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43655 index 505a9ad..356734c 100644
43656 --- a/drivers/iommu/amd_iommu.c
43657 +++ b/drivers/iommu/amd_iommu.c
43658 @@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43659
43660 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43661 {
43662 + phys_addr_t physaddr;
43663 WARN_ON(address & 0x7ULL);
43664
43665 memset(cmd, 0, sizeof(*cmd));
43666 - cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43667 - cmd->data[1] = upper_32_bits(__pa(address));
43668 +
43669 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43670 + if (object_starts_on_stack((void *)address)) {
43671 + void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43672 + physaddr = __pa((u64)adjbuf);
43673 + } else
43674 +#endif
43675 + physaddr = __pa(address);
43676 +
43677 + cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43678 + cmd->data[1] = upper_32_bits(physaddr);
43679 cmd->data[2] = 1;
43680 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43681 }
43682 diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43683 index 60558f7..5a02369 100644
43684 --- a/drivers/iommu/arm-smmu.c
43685 +++ b/drivers/iommu/arm-smmu.c
43686 @@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43687 cfg->irptndx = cfg->cbndx;
43688 }
43689
43690 - ACCESS_ONCE(smmu_domain->smmu) = smmu;
43691 + ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43692 arm_smmu_init_context_bank(smmu_domain);
43693 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43694
43695 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43696 index ed8b048..7fbcc01 100644
43697 --- a/drivers/iommu/iommu.c
43698 +++ b/drivers/iommu/iommu.c
43699 @@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43700 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43701 {
43702 int err;
43703 - struct notifier_block *nb;
43704 + notifier_block_no_const *nb;
43705 struct iommu_callback_data cb = {
43706 .ops = ops,
43707 };
43708 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43709 index 74a1767..5a359e8 100644
43710 --- a/drivers/iommu/irq_remapping.c
43711 +++ b/drivers/iommu/irq_remapping.c
43712 @@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43713 void panic_if_irq_remap(const char *msg)
43714 {
43715 if (irq_remapping_enabled)
43716 - panic(msg);
43717 + panic("%s", msg);
43718 }
43719
43720 static void ir_ack_apic_edge(struct irq_data *data)
43721 @@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43722
43723 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43724 {
43725 - chip->irq_print_chip = ir_print_prefix;
43726 - chip->irq_ack = ir_ack_apic_edge;
43727 - chip->irq_eoi = ir_ack_apic_level;
43728 - chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43729 + pax_open_kernel();
43730 + *(void **)&chip->irq_print_chip = ir_print_prefix;
43731 + *(void **)&chip->irq_ack = ir_ack_apic_edge;
43732 + *(void **)&chip->irq_eoi = ir_ack_apic_level;
43733 + *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43734 + pax_close_kernel();
43735 }
43736
43737 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43738 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43739 index 38493ff..001538b 100644
43740 --- a/drivers/irqchip/irq-gic.c
43741 +++ b/drivers/irqchip/irq-gic.c
43742 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43743 * Supported arch specific GIC irq extension.
43744 * Default make them NULL.
43745 */
43746 -struct irq_chip gic_arch_extn = {
43747 +irq_chip_no_const gic_arch_extn = {
43748 .irq_eoi = NULL,
43749 .irq_mask = NULL,
43750 .irq_unmask = NULL,
43751 @@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43752 chained_irq_exit(chip, desc);
43753 }
43754
43755 -static struct irq_chip gic_chip = {
43756 +static irq_chip_no_const gic_chip __read_only = {
43757 .name = "GIC",
43758 .irq_mask = gic_mask_irq,
43759 .irq_unmask = gic_unmask_irq,
43760 diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
43761 index 542e850..1bb094c 100644
43762 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c
43763 +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
43764 @@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
43765 struct intc_irqpin_iomem *i;
43766 struct resource *io[INTC_IRQPIN_REG_NR];
43767 struct resource *irq;
43768 - struct irq_chip *irq_chip;
43769 + irq_chip_no_const *irq_chip;
43770 void (*enable_fn)(struct irq_data *d);
43771 void (*disable_fn)(struct irq_data *d);
43772 const char *name = dev_name(dev);
43773 diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43774 index 8777065..a4a9967 100644
43775 --- a/drivers/irqchip/irq-renesas-irqc.c
43776 +++ b/drivers/irqchip/irq-renesas-irqc.c
43777 @@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43778 struct irqc_priv *p;
43779 struct resource *io;
43780 struct resource *irq;
43781 - struct irq_chip *irq_chip;
43782 + irq_chip_no_const *irq_chip;
43783 const char *name = dev_name(&pdev->dev);
43784 int ret;
43785 int k;
43786 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43787 index 6a2df32..dc962f1 100644
43788 --- a/drivers/isdn/capi/capi.c
43789 +++ b/drivers/isdn/capi/capi.c
43790 @@ -81,8 +81,8 @@ struct capiminor {
43791
43792 struct capi20_appl *ap;
43793 u32 ncci;
43794 - atomic_t datahandle;
43795 - atomic_t msgid;
43796 + atomic_unchecked_t datahandle;
43797 + atomic_unchecked_t msgid;
43798
43799 struct tty_port port;
43800 int ttyinstop;
43801 @@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43802 capimsg_setu16(s, 2, mp->ap->applid);
43803 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43804 capimsg_setu8 (s, 5, CAPI_RESP);
43805 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43806 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43807 capimsg_setu32(s, 8, mp->ncci);
43808 capimsg_setu16(s, 12, datahandle);
43809 }
43810 @@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43811 mp->outbytes -= len;
43812 spin_unlock_bh(&mp->outlock);
43813
43814 - datahandle = atomic_inc_return(&mp->datahandle);
43815 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43816 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43817 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43818 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43819 capimsg_setu16(skb->data, 2, mp->ap->applid);
43820 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43821 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43822 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43823 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43824 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43825 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43826 capimsg_setu16(skb->data, 16, len); /* Data length */
43827 diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43828 index aecec6d..11e13c5 100644
43829 --- a/drivers/isdn/gigaset/bas-gigaset.c
43830 +++ b/drivers/isdn/gigaset/bas-gigaset.c
43831 @@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43832
43833
43834 static const struct gigaset_ops gigops = {
43835 - gigaset_write_cmd,
43836 - gigaset_write_room,
43837 - gigaset_chars_in_buffer,
43838 - gigaset_brkchars,
43839 - gigaset_init_bchannel,
43840 - gigaset_close_bchannel,
43841 - gigaset_initbcshw,
43842 - gigaset_freebcshw,
43843 - gigaset_reinitbcshw,
43844 - gigaset_initcshw,
43845 - gigaset_freecshw,
43846 - gigaset_set_modem_ctrl,
43847 - gigaset_baud_rate,
43848 - gigaset_set_line_ctrl,
43849 - gigaset_isoc_send_skb,
43850 - gigaset_isoc_input,
43851 + .write_cmd = gigaset_write_cmd,
43852 + .write_room = gigaset_write_room,
43853 + .chars_in_buffer = gigaset_chars_in_buffer,
43854 + .brkchars = gigaset_brkchars,
43855 + .init_bchannel = gigaset_init_bchannel,
43856 + .close_bchannel = gigaset_close_bchannel,
43857 + .initbcshw = gigaset_initbcshw,
43858 + .freebcshw = gigaset_freebcshw,
43859 + .reinitbcshw = gigaset_reinitbcshw,
43860 + .initcshw = gigaset_initcshw,
43861 + .freecshw = gigaset_freecshw,
43862 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43863 + .baud_rate = gigaset_baud_rate,
43864 + .set_line_ctrl = gigaset_set_line_ctrl,
43865 + .send_skb = gigaset_isoc_send_skb,
43866 + .handle_input = gigaset_isoc_input,
43867 };
43868
43869 /* bas_gigaset_init
43870 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43871 index 600c79b..3752bab 100644
43872 --- a/drivers/isdn/gigaset/interface.c
43873 +++ b/drivers/isdn/gigaset/interface.c
43874 @@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43875 }
43876 tty->driver_data = cs;
43877
43878 - ++cs->port.count;
43879 + atomic_inc(&cs->port.count);
43880
43881 - if (cs->port.count == 1) {
43882 + if (atomic_read(&cs->port.count) == 1) {
43883 tty_port_tty_set(&cs->port, tty);
43884 cs->port.low_latency = 1;
43885 }
43886 @@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43887
43888 if (!cs->connected)
43889 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43890 - else if (!cs->port.count)
43891 + else if (!atomic_read(&cs->port.count))
43892 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43893 - else if (!--cs->port.count)
43894 + else if (!atomic_dec_return(&cs->port.count))
43895 tty_port_tty_set(&cs->port, NULL);
43896
43897 mutex_unlock(&cs->mutex);
43898 diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43899 index 8c91fd5..14f13ce 100644
43900 --- a/drivers/isdn/gigaset/ser-gigaset.c
43901 +++ b/drivers/isdn/gigaset/ser-gigaset.c
43902 @@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43903 }
43904
43905 static const struct gigaset_ops ops = {
43906 - gigaset_write_cmd,
43907 - gigaset_write_room,
43908 - gigaset_chars_in_buffer,
43909 - gigaset_brkchars,
43910 - gigaset_init_bchannel,
43911 - gigaset_close_bchannel,
43912 - gigaset_initbcshw,
43913 - gigaset_freebcshw,
43914 - gigaset_reinitbcshw,
43915 - gigaset_initcshw,
43916 - gigaset_freecshw,
43917 - gigaset_set_modem_ctrl,
43918 - gigaset_baud_rate,
43919 - gigaset_set_line_ctrl,
43920 - gigaset_m10x_send_skb, /* asyncdata.c */
43921 - gigaset_m10x_input, /* asyncdata.c */
43922 + .write_cmd = gigaset_write_cmd,
43923 + .write_room = gigaset_write_room,
43924 + .chars_in_buffer = gigaset_chars_in_buffer,
43925 + .brkchars = gigaset_brkchars,
43926 + .init_bchannel = gigaset_init_bchannel,
43927 + .close_bchannel = gigaset_close_bchannel,
43928 + .initbcshw = gigaset_initbcshw,
43929 + .freebcshw = gigaset_freebcshw,
43930 + .reinitbcshw = gigaset_reinitbcshw,
43931 + .initcshw = gigaset_initcshw,
43932 + .freecshw = gigaset_freecshw,
43933 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43934 + .baud_rate = gigaset_baud_rate,
43935 + .set_line_ctrl = gigaset_set_line_ctrl,
43936 + .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43937 + .handle_input = gigaset_m10x_input, /* asyncdata.c */
43938 };
43939
43940
43941 diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43942 index a8e652d..edadaa4 100644
43943 --- a/drivers/isdn/gigaset/usb-gigaset.c
43944 +++ b/drivers/isdn/gigaset/usb-gigaset.c
43945 @@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43946 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43947 memcpy(cs->hw.usb->bchars, buf, 6);
43948 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43949 - 0, 0, &buf, 6, 2000);
43950 + 0, 0, buf, 6, 2000);
43951 }
43952
43953 static void gigaset_freebcshw(struct bc_state *bcs)
43954 @@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43955 }
43956
43957 static const struct gigaset_ops ops = {
43958 - gigaset_write_cmd,
43959 - gigaset_write_room,
43960 - gigaset_chars_in_buffer,
43961 - gigaset_brkchars,
43962 - gigaset_init_bchannel,
43963 - gigaset_close_bchannel,
43964 - gigaset_initbcshw,
43965 - gigaset_freebcshw,
43966 - gigaset_reinitbcshw,
43967 - gigaset_initcshw,
43968 - gigaset_freecshw,
43969 - gigaset_set_modem_ctrl,
43970 - gigaset_baud_rate,
43971 - gigaset_set_line_ctrl,
43972 - gigaset_m10x_send_skb,
43973 - gigaset_m10x_input,
43974 + .write_cmd = gigaset_write_cmd,
43975 + .write_room = gigaset_write_room,
43976 + .chars_in_buffer = gigaset_chars_in_buffer,
43977 + .brkchars = gigaset_brkchars,
43978 + .init_bchannel = gigaset_init_bchannel,
43979 + .close_bchannel = gigaset_close_bchannel,
43980 + .initbcshw = gigaset_initbcshw,
43981 + .freebcshw = gigaset_freebcshw,
43982 + .reinitbcshw = gigaset_reinitbcshw,
43983 + .initcshw = gigaset_initcshw,
43984 + .freecshw = gigaset_freecshw,
43985 + .set_modem_ctrl = gigaset_set_modem_ctrl,
43986 + .baud_rate = gigaset_baud_rate,
43987 + .set_line_ctrl = gigaset_set_line_ctrl,
43988 + .send_skb = gigaset_m10x_send_skb,
43989 + .handle_input = gigaset_m10x_input,
43990 };
43991
43992 /*
43993 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43994 index 4d9b195..455075c 100644
43995 --- a/drivers/isdn/hardware/avm/b1.c
43996 +++ b/drivers/isdn/hardware/avm/b1.c
43997 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43998 }
43999 if (left) {
44000 if (t4file->user) {
44001 - if (copy_from_user(buf, dp, left))
44002 + if (left > sizeof buf || copy_from_user(buf, dp, left))
44003 return -EFAULT;
44004 } else {
44005 memcpy(buf, dp, left);
44006 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44007 }
44008 if (left) {
44009 if (config->user) {
44010 - if (copy_from_user(buf, dp, left))
44011 + if (left > sizeof buf || copy_from_user(buf, dp, left))
44012 return -EFAULT;
44013 } else {
44014 memcpy(buf, dp, left);
44015 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44016 index 9b856e1..fa03c92 100644
44017 --- a/drivers/isdn/i4l/isdn_common.c
44018 +++ b/drivers/isdn/i4l/isdn_common.c
44019 @@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44020 } else
44021 return -EINVAL;
44022 case IIOCDBGVAR:
44023 + if (!capable(CAP_SYS_RAWIO))
44024 + return -EPERM;
44025 if (arg) {
44026 if (copy_to_user(argp, &dev, sizeof(ulong)))
44027 return -EFAULT;
44028 diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44029 index 91d5730..336523e 100644
44030 --- a/drivers/isdn/i4l/isdn_concap.c
44031 +++ b/drivers/isdn/i4l/isdn_concap.c
44032 @@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44033 }
44034
44035 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44036 - &isdn_concap_dl_data_req,
44037 - &isdn_concap_dl_connect_req,
44038 - &isdn_concap_dl_disconn_req
44039 + .data_req = &isdn_concap_dl_data_req,
44040 + .connect_req = &isdn_concap_dl_connect_req,
44041 + .disconn_req = &isdn_concap_dl_disconn_req
44042 };
44043
44044 /* The following should better go into a dedicated source file such that
44045 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44046 index bc91261..2ef7e36 100644
44047 --- a/drivers/isdn/i4l/isdn_tty.c
44048 +++ b/drivers/isdn/i4l/isdn_tty.c
44049 @@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44050
44051 #ifdef ISDN_DEBUG_MODEM_OPEN
44052 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44053 - port->count);
44054 + atomic_read(&port->count));
44055 #endif
44056 - port->count++;
44057 + atomic_inc(&port->count);
44058 port->tty = tty;
44059 /*
44060 * Start up serial port
44061 @@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44062 #endif
44063 return;
44064 }
44065 - if ((tty->count == 1) && (port->count != 1)) {
44066 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44067 /*
44068 * Uh, oh. tty->count is 1, which means that the tty
44069 * structure will be freed. Info->count should always
44070 @@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44071 * serial port won't be shutdown.
44072 */
44073 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44074 - "info->count is %d\n", port->count);
44075 - port->count = 1;
44076 + "info->count is %d\n", atomic_read(&port->count));
44077 + atomic_set(&port->count, 1);
44078 }
44079 - if (--port->count < 0) {
44080 + if (atomic_dec_return(&port->count) < 0) {
44081 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44082 - info->line, port->count);
44083 - port->count = 0;
44084 + info->line, atomic_read(&port->count));
44085 + atomic_set(&port->count, 0);
44086 }
44087 - if (port->count) {
44088 + if (atomic_read(&port->count)) {
44089 #ifdef ISDN_DEBUG_MODEM_OPEN
44090 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44091 #endif
44092 @@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44093 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44094 return;
44095 isdn_tty_shutdown(info);
44096 - port->count = 0;
44097 + atomic_set(&port->count, 0);
44098 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44099 port->tty = NULL;
44100 wake_up_interruptible(&port->open_wait);
44101 @@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44102 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44103 modem_info *info = &dev->mdm.info[i];
44104
44105 - if (info->port.count == 0)
44106 + if (atomic_read(&info->port.count) == 0)
44107 continue;
44108 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44109 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44110 diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44111 index e2d4e58..40cd045 100644
44112 --- a/drivers/isdn/i4l/isdn_x25iface.c
44113 +++ b/drivers/isdn/i4l/isdn_x25iface.c
44114 @@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44115
44116
44117 static struct concap_proto_ops ix25_pops = {
44118 - &isdn_x25iface_proto_new,
44119 - &isdn_x25iface_proto_del,
44120 - &isdn_x25iface_proto_restart,
44121 - &isdn_x25iface_proto_close,
44122 - &isdn_x25iface_xmit,
44123 - &isdn_x25iface_receive,
44124 - &isdn_x25iface_connect_ind,
44125 - &isdn_x25iface_disconn_ind
44126 + .proto_new = &isdn_x25iface_proto_new,
44127 + .proto_del = &isdn_x25iface_proto_del,
44128 + .restart = &isdn_x25iface_proto_restart,
44129 + .close = &isdn_x25iface_proto_close,
44130 + .encap_and_xmit = &isdn_x25iface_xmit,
44131 + .data_ind = &isdn_x25iface_receive,
44132 + .connect_ind = &isdn_x25iface_connect_ind,
44133 + .disconn_ind = &isdn_x25iface_disconn_ind
44134 };
44135
44136 /* error message helper function */
44137 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44138 index 6a7447c..cae33fe 100644
44139 --- a/drivers/isdn/icn/icn.c
44140 +++ b/drivers/isdn/icn/icn.c
44141 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44142 if (count > len)
44143 count = len;
44144 if (user) {
44145 - if (copy_from_user(msg, buf, count))
44146 + if (count > sizeof msg || copy_from_user(msg, buf, count))
44147 return -EFAULT;
44148 } else
44149 memcpy(msg, buf, count);
44150 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44151 index 87f7dff..7300125 100644
44152 --- a/drivers/isdn/mISDN/dsp_cmx.c
44153 +++ b/drivers/isdn/mISDN/dsp_cmx.c
44154 @@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44155 static u16 dsp_count; /* last sample count */
44156 static int dsp_count_valid; /* if we have last sample count */
44157
44158 -void
44159 +void __intentional_overflow(-1)
44160 dsp_cmx_send(void *arg)
44161 {
44162 struct dsp_conf *conf;
44163 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44164 index f58a354..fbae176 100644
44165 --- a/drivers/leds/leds-clevo-mail.c
44166 +++ b/drivers/leds/leds-clevo-mail.c
44167 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44168 * detected as working, but in reality it is not) as low as
44169 * possible.
44170 */
44171 -static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44172 +static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44173 {
44174 .callback = clevo_mail_led_dmi_callback,
44175 .ident = "Clevo D410J",
44176 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44177 index 046cb70..6b20d39 100644
44178 --- a/drivers/leds/leds-ss4200.c
44179 +++ b/drivers/leds/leds-ss4200.c
44180 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44181 * detected as working, but in reality it is not) as low as
44182 * possible.
44183 */
44184 -static struct dmi_system_id nas_led_whitelist[] __initdata = {
44185 +static struct dmi_system_id nas_led_whitelist[] __initconst = {
44186 {
44187 .callback = ss4200_led_dmi_callback,
44188 .ident = "Intel SS4200-E",
44189 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44190 index 6590558..a74c5dd 100644
44191 --- a/drivers/lguest/core.c
44192 +++ b/drivers/lguest/core.c
44193 @@ -96,9 +96,17 @@ static __init int map_switcher(void)
44194 * The end address needs +1 because __get_vm_area allocates an
44195 * extra guard page, so we need space for that.
44196 */
44197 +
44198 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44199 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44200 + VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44201 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44202 +#else
44203 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44204 VM_ALLOC, switcher_addr, switcher_addr
44205 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44206 +#endif
44207 +
44208 if (!switcher_vma) {
44209 err = -ENOMEM;
44210 printk("lguest: could not map switcher pages high\n");
44211 @@ -121,7 +129,7 @@ static __init int map_switcher(void)
44212 * Now the Switcher is mapped at the right address, we can't fail!
44213 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44214 */
44215 - memcpy(switcher_vma->addr, start_switcher_text,
44216 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44217 end_switcher_text - start_switcher_text);
44218
44219 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44220 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44221 index e8b55c3..3514c37 100644
44222 --- a/drivers/lguest/page_tables.c
44223 +++ b/drivers/lguest/page_tables.c
44224 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44225 /*:*/
44226
44227 #ifdef CONFIG_X86_PAE
44228 -static void release_pmd(pmd_t *spmd)
44229 +static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44230 {
44231 /* If the entry's not present, there's nothing to release. */
44232 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44233 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44234 index 922a1ac..9dd0c2a 100644
44235 --- a/drivers/lguest/x86/core.c
44236 +++ b/drivers/lguest/x86/core.c
44237 @@ -59,7 +59,7 @@ static struct {
44238 /* Offset from where switcher.S was compiled to where we've copied it */
44239 static unsigned long switcher_offset(void)
44240 {
44241 - return switcher_addr - (unsigned long)start_switcher_text;
44242 + return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44243 }
44244
44245 /* This cpu's struct lguest_pages (after the Switcher text page) */
44246 @@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44247 * These copies are pretty cheap, so we do them unconditionally: */
44248 /* Save the current Host top-level page directory.
44249 */
44250 +
44251 +#ifdef CONFIG_PAX_PER_CPU_PGD
44252 + pages->state.host_cr3 = read_cr3();
44253 +#else
44254 pages->state.host_cr3 = __pa(current->mm->pgd);
44255 +#endif
44256 +
44257 /*
44258 * Set up the Guest's page tables to see this CPU's pages (and no
44259 * other CPU's pages).
44260 @@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44261 * compiled-in switcher code and the high-mapped copy we just made.
44262 */
44263 for (i = 0; i < IDT_ENTRIES; i++)
44264 - default_idt_entries[i] += switcher_offset();
44265 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44266
44267 /*
44268 * Set up the Switcher's per-cpu areas.
44269 @@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44270 * it will be undisturbed when we switch. To change %cs and jump we
44271 * need this structure to feed to Intel's "lcall" instruction.
44272 */
44273 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44274 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44275 lguest_entry.segment = LGUEST_CS;
44276
44277 /*
44278 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44279 index 40634b0..4f5855e 100644
44280 --- a/drivers/lguest/x86/switcher_32.S
44281 +++ b/drivers/lguest/x86/switcher_32.S
44282 @@ -87,6 +87,7 @@
44283 #include <asm/page.h>
44284 #include <asm/segment.h>
44285 #include <asm/lguest.h>
44286 +#include <asm/processor-flags.h>
44287
44288 // We mark the start of the code to copy
44289 // It's placed in .text tho it's never run here
44290 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44291 // Changes type when we load it: damn Intel!
44292 // For after we switch over our page tables
44293 // That entry will be read-only: we'd crash.
44294 +
44295 +#ifdef CONFIG_PAX_KERNEXEC
44296 + mov %cr0, %edx
44297 + xor $X86_CR0_WP, %edx
44298 + mov %edx, %cr0
44299 +#endif
44300 +
44301 movl $(GDT_ENTRY_TSS*8), %edx
44302 ltr %dx
44303
44304 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44305 // Let's clear it again for our return.
44306 // The GDT descriptor of the Host
44307 // Points to the table after two "size" bytes
44308 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44309 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44310 // Clear "used" from type field (byte 5, bit 2)
44311 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44312 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44313 +
44314 +#ifdef CONFIG_PAX_KERNEXEC
44315 + mov %cr0, %eax
44316 + xor $X86_CR0_WP, %eax
44317 + mov %eax, %cr0
44318 +#endif
44319
44320 // Once our page table's switched, the Guest is live!
44321 // The Host fades as we run this final step.
44322 @@ -295,13 +309,12 @@ deliver_to_host:
44323 // I consulted gcc, and it gave
44324 // These instructions, which I gladly credit:
44325 leal (%edx,%ebx,8), %eax
44326 - movzwl (%eax),%edx
44327 - movl 4(%eax), %eax
44328 - xorw %ax, %ax
44329 - orl %eax, %edx
44330 + movl 4(%eax), %edx
44331 + movw (%eax), %dx
44332 // Now the address of the handler's in %edx
44333 // We call it now: its "iret" drops us home.
44334 - jmp *%edx
44335 + ljmp $__KERNEL_CS, $1f
44336 +1: jmp *%edx
44337
44338 // Every interrupt can come to us here
44339 // But we must truly tell each apart.
44340 diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44341 index a08e3ee..df8ade2 100644
44342 --- a/drivers/md/bcache/closure.h
44343 +++ b/drivers/md/bcache/closure.h
44344 @@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44345 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44346 struct workqueue_struct *wq)
44347 {
44348 - BUG_ON(object_is_on_stack(cl));
44349 + BUG_ON(object_starts_on_stack(cl));
44350 closure_set_ip(cl);
44351 cl->fn = fn;
44352 cl->wq = wq;
44353 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44354 index da3604e..7789cb4c 100644
44355 --- a/drivers/md/bitmap.c
44356 +++ b/drivers/md/bitmap.c
44357 @@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44358 chunk_kb ? "KB" : "B");
44359 if (bitmap->storage.file) {
44360 seq_printf(seq, ", file: ");
44361 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44362 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44363 }
44364
44365 seq_printf(seq, "\n");
44366 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44367 index 0be9381..114262b 100644
44368 --- a/drivers/md/dm-ioctl.c
44369 +++ b/drivers/md/dm-ioctl.c
44370 @@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44371 cmd == DM_LIST_VERSIONS_CMD)
44372 return 0;
44373
44374 - if ((cmd == DM_DEV_CREATE_CMD)) {
44375 + if (cmd == DM_DEV_CREATE_CMD) {
44376 if (!*param->name) {
44377 DMWARN("name not supplied when creating device");
44378 return -EINVAL;
44379 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44380 index 7dfdb5c..4caada6 100644
44381 --- a/drivers/md/dm-raid1.c
44382 +++ b/drivers/md/dm-raid1.c
44383 @@ -40,7 +40,7 @@ enum dm_raid1_error {
44384
44385 struct mirror {
44386 struct mirror_set *ms;
44387 - atomic_t error_count;
44388 + atomic_unchecked_t error_count;
44389 unsigned long error_type;
44390 struct dm_dev *dev;
44391 sector_t offset;
44392 @@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44393 struct mirror *m;
44394
44395 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44396 - if (!atomic_read(&m->error_count))
44397 + if (!atomic_read_unchecked(&m->error_count))
44398 return m;
44399
44400 return NULL;
44401 @@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44402 * simple way to tell if a device has encountered
44403 * errors.
44404 */
44405 - atomic_inc(&m->error_count);
44406 + atomic_inc_unchecked(&m->error_count);
44407
44408 if (test_and_set_bit(error_type, &m->error_type))
44409 return;
44410 @@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44411 struct mirror *m = get_default_mirror(ms);
44412
44413 do {
44414 - if (likely(!atomic_read(&m->error_count)))
44415 + if (likely(!atomic_read_unchecked(&m->error_count)))
44416 return m;
44417
44418 if (m-- == ms->mirror)
44419 @@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44420 {
44421 struct mirror *default_mirror = get_default_mirror(m->ms);
44422
44423 - return !atomic_read(&default_mirror->error_count);
44424 + return !atomic_read_unchecked(&default_mirror->error_count);
44425 }
44426
44427 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44428 @@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44429 */
44430 if (likely(region_in_sync(ms, region, 1)))
44431 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44432 - else if (m && atomic_read(&m->error_count))
44433 + else if (m && atomic_read_unchecked(&m->error_count))
44434 m = NULL;
44435
44436 if (likely(m))
44437 @@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44438 }
44439
44440 ms->mirror[mirror].ms = ms;
44441 - atomic_set(&(ms->mirror[mirror].error_count), 0);
44442 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44443 ms->mirror[mirror].error_type = 0;
44444 ms->mirror[mirror].offset = offset;
44445
44446 @@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44447 */
44448 static char device_status_char(struct mirror *m)
44449 {
44450 - if (!atomic_read(&(m->error_count)))
44451 + if (!atomic_read_unchecked(&(m->error_count)))
44452 return 'A';
44453
44454 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44455 diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44456 index 87f86c7..a1a4100 100644
44457 --- a/drivers/md/dm-stats.c
44458 +++ b/drivers/md/dm-stats.c
44459 @@ -382,7 +382,7 @@ do_sync_free:
44460 synchronize_rcu_expedited();
44461 dm_stat_free(&s->rcu_head);
44462 } else {
44463 - ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44464 + ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44465 call_rcu(&s->rcu_head, dm_stat_free);
44466 }
44467 return 0;
44468 @@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44469 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44470 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44471 ));
44472 - ACCESS_ONCE(last->last_sector) = end_sector;
44473 - ACCESS_ONCE(last->last_rw) = bi_rw;
44474 + ACCESS_ONCE_RW(last->last_sector) = end_sector;
44475 + ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44476 }
44477
44478 rcu_read_lock();
44479 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44480 index f8b37d4..5c5cafd 100644
44481 --- a/drivers/md/dm-stripe.c
44482 +++ b/drivers/md/dm-stripe.c
44483 @@ -21,7 +21,7 @@ struct stripe {
44484 struct dm_dev *dev;
44485 sector_t physical_start;
44486
44487 - atomic_t error_count;
44488 + atomic_unchecked_t error_count;
44489 };
44490
44491 struct stripe_c {
44492 @@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44493 kfree(sc);
44494 return r;
44495 }
44496 - atomic_set(&(sc->stripe[i].error_count), 0);
44497 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44498 }
44499
44500 ti->private = sc;
44501 @@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44502 DMEMIT("%d ", sc->stripes);
44503 for (i = 0; i < sc->stripes; i++) {
44504 DMEMIT("%s ", sc->stripe[i].dev->name);
44505 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44506 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44507 'D' : 'A';
44508 }
44509 buffer[i] = '\0';
44510 @@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44511 */
44512 for (i = 0; i < sc->stripes; i++)
44513 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44514 - atomic_inc(&(sc->stripe[i].error_count));
44515 - if (atomic_read(&(sc->stripe[i].error_count)) <
44516 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
44517 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44518 DM_IO_ERROR_THRESHOLD)
44519 schedule_work(&sc->trigger_event);
44520 }
44521 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44522 index b2bd1eb..38f7a44 100644
44523 --- a/drivers/md/dm-table.c
44524 +++ b/drivers/md/dm-table.c
44525 @@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44526 if (!dev_size)
44527 return 0;
44528
44529 - if ((start >= dev_size) || (start + len > dev_size)) {
44530 + if ((start >= dev_size) || (len > dev_size - start)) {
44531 DMWARN("%s: %s too small for target: "
44532 "start=%llu, len=%llu, dev_size=%llu",
44533 dm_device_name(ti->table->md), bdevname(bdev, b),
44534 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44535 index e9d33ad..dae9880d 100644
44536 --- a/drivers/md/dm-thin-metadata.c
44537 +++ b/drivers/md/dm-thin-metadata.c
44538 @@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44539 {
44540 pmd->info.tm = pmd->tm;
44541 pmd->info.levels = 2;
44542 - pmd->info.value_type.context = pmd->data_sm;
44543 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44544 pmd->info.value_type.size = sizeof(__le64);
44545 pmd->info.value_type.inc = data_block_inc;
44546 pmd->info.value_type.dec = data_block_dec;
44547 @@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44548
44549 pmd->bl_info.tm = pmd->tm;
44550 pmd->bl_info.levels = 1;
44551 - pmd->bl_info.value_type.context = pmd->data_sm;
44552 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44553 pmd->bl_info.value_type.size = sizeof(__le64);
44554 pmd->bl_info.value_type.inc = data_block_inc;
44555 pmd->bl_info.value_type.dec = data_block_dec;
44556 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44557 index 58f3927..bfbad3e 100644
44558 --- a/drivers/md/dm.c
44559 +++ b/drivers/md/dm.c
44560 @@ -183,9 +183,9 @@ struct mapped_device {
44561 /*
44562 * Event handling.
44563 */
44564 - atomic_t event_nr;
44565 + atomic_unchecked_t event_nr;
44566 wait_queue_head_t eventq;
44567 - atomic_t uevent_seq;
44568 + atomic_unchecked_t uevent_seq;
44569 struct list_head uevent_list;
44570 spinlock_t uevent_lock; /* Protect access to uevent_list */
44571
44572 @@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44573 spin_lock_init(&md->deferred_lock);
44574 atomic_set(&md->holders, 1);
44575 atomic_set(&md->open_count, 0);
44576 - atomic_set(&md->event_nr, 0);
44577 - atomic_set(&md->uevent_seq, 0);
44578 + atomic_set_unchecked(&md->event_nr, 0);
44579 + atomic_set_unchecked(&md->uevent_seq, 0);
44580 INIT_LIST_HEAD(&md->uevent_list);
44581 INIT_LIST_HEAD(&md->table_devices);
44582 spin_lock_init(&md->uevent_lock);
44583 @@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44584
44585 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44586
44587 - atomic_inc(&md->event_nr);
44588 + atomic_inc_unchecked(&md->event_nr);
44589 wake_up(&md->eventq);
44590 }
44591
44592 @@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44593
44594 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44595 {
44596 - return atomic_add_return(1, &md->uevent_seq);
44597 + return atomic_add_return_unchecked(1, &md->uevent_seq);
44598 }
44599
44600 uint32_t dm_get_event_nr(struct mapped_device *md)
44601 {
44602 - return atomic_read(&md->event_nr);
44603 + return atomic_read_unchecked(&md->event_nr);
44604 }
44605
44606 int dm_wait_event(struct mapped_device *md, int event_nr)
44607 {
44608 return wait_event_interruptible(md->eventq,
44609 - (event_nr != atomic_read(&md->event_nr)));
44610 + (event_nr != atomic_read_unchecked(&md->event_nr)));
44611 }
44612
44613 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44614 diff --git a/drivers/md/md.c b/drivers/md/md.c
44615 index 9233c71..ed5243a 100644
44616 --- a/drivers/md/md.c
44617 +++ b/drivers/md/md.c
44618 @@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44619 * start build, activate spare
44620 */
44621 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44622 -static atomic_t md_event_count;
44623 +static atomic_unchecked_t md_event_count;
44624 void md_new_event(struct mddev *mddev)
44625 {
44626 - atomic_inc(&md_event_count);
44627 + atomic_inc_unchecked(&md_event_count);
44628 wake_up(&md_event_waiters);
44629 }
44630 EXPORT_SYMBOL_GPL(md_new_event);
44631 @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44632 */
44633 static void md_new_event_inintr(struct mddev *mddev)
44634 {
44635 - atomic_inc(&md_event_count);
44636 + atomic_inc_unchecked(&md_event_count);
44637 wake_up(&md_event_waiters);
44638 }
44639
44640 @@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44641 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44642 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44643 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44644 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44645 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44646
44647 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44648 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44649 @@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44650 else
44651 sb->resync_offset = cpu_to_le64(0);
44652
44653 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44654 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44655
44656 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44657 sb->size = cpu_to_le64(mddev->dev_sectors);
44658 @@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44659 static ssize_t
44660 errors_show(struct md_rdev *rdev, char *page)
44661 {
44662 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44663 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44664 }
44665
44666 static ssize_t
44667 @@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44668 char *e;
44669 unsigned long n = simple_strtoul(buf, &e, 10);
44670 if (*buf && (*e == 0 || *e == '\n')) {
44671 - atomic_set(&rdev->corrected_errors, n);
44672 + atomic_set_unchecked(&rdev->corrected_errors, n);
44673 return len;
44674 }
44675 return -EINVAL;
44676 @@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44677 rdev->sb_loaded = 0;
44678 rdev->bb_page = NULL;
44679 atomic_set(&rdev->nr_pending, 0);
44680 - atomic_set(&rdev->read_errors, 0);
44681 - atomic_set(&rdev->corrected_errors, 0);
44682 + atomic_set_unchecked(&rdev->read_errors, 0);
44683 + atomic_set_unchecked(&rdev->corrected_errors, 0);
44684
44685 INIT_LIST_HEAD(&rdev->same_set);
44686 init_waitqueue_head(&rdev->blocked_wait);
44687 @@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44688
44689 spin_unlock(&pers_lock);
44690 seq_printf(seq, "\n");
44691 - seq->poll_event = atomic_read(&md_event_count);
44692 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44693 return 0;
44694 }
44695 if (v == (void*)2) {
44696 @@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44697 return error;
44698
44699 seq = file->private_data;
44700 - seq->poll_event = atomic_read(&md_event_count);
44701 + seq->poll_event = atomic_read_unchecked(&md_event_count);
44702 return error;
44703 }
44704
44705 @@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44706 /* always allow read */
44707 mask = POLLIN | POLLRDNORM;
44708
44709 - if (seq->poll_event != atomic_read(&md_event_count))
44710 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44711 mask |= POLLERR | POLLPRI;
44712 return mask;
44713 }
44714 @@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44715 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44716 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44717 (int)part_stat_read(&disk->part0, sectors[1]) -
44718 - atomic_read(&disk->sync_io);
44719 + atomic_read_unchecked(&disk->sync_io);
44720 /* sync IO will cause sync_io to increase before the disk_stats
44721 * as sync_io is counted when a request starts, and
44722 * disk_stats is counted when it completes.
44723 diff --git a/drivers/md/md.h b/drivers/md/md.h
44724 index 03cec5b..0a658c1 100644
44725 --- a/drivers/md/md.h
44726 +++ b/drivers/md/md.h
44727 @@ -94,13 +94,13 @@ struct md_rdev {
44728 * only maintained for arrays that
44729 * support hot removal
44730 */
44731 - atomic_t read_errors; /* number of consecutive read errors that
44732 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
44733 * we have tried to ignore.
44734 */
44735 struct timespec last_read_error; /* monotonic time since our
44736 * last read error
44737 */
44738 - atomic_t corrected_errors; /* number of corrected read errors,
44739 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44740 * for reporting to userspace and storing
44741 * in superblock.
44742 */
44743 @@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44744
44745 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44746 {
44747 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44748 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44749 }
44750
44751 struct md_personality
44752 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44753 index f4e22bc..8f83114 100644
44754 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
44755 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44756 @@ -681,7 +681,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44757 * Flick into a mode where all blocks get allocated in the new area.
44758 */
44759 smm->begin = old_len;
44760 - memcpy(sm, &bootstrap_ops, sizeof(*sm));
44761 + memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44762
44763 /*
44764 * Extend.
44765 @@ -712,7 +712,7 @@ out:
44766 /*
44767 * Switch back to normal behaviour.
44768 */
44769 - memcpy(sm, &ops, sizeof(*sm));
44770 + memcpy((void *)sm, &ops, sizeof(*sm));
44771 return r;
44772 }
44773
44774 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44775 index 3e6d115..ffecdeb 100644
44776 --- a/drivers/md/persistent-data/dm-space-map.h
44777 +++ b/drivers/md/persistent-data/dm-space-map.h
44778 @@ -71,6 +71,7 @@ struct dm_space_map {
44779 dm_sm_threshold_fn fn,
44780 void *context);
44781 };
44782 +typedef struct dm_space_map __no_const dm_space_map_no_const;
44783
44784 /*----------------------------------------------------------------*/
44785
44786 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44787 index 40b35be..a327e11 100644
44788 --- a/drivers/md/raid1.c
44789 +++ b/drivers/md/raid1.c
44790 @@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44791 if (r1_sync_page_io(rdev, sect, s,
44792 bio->bi_io_vec[idx].bv_page,
44793 READ) != 0)
44794 - atomic_add(s, &rdev->corrected_errors);
44795 + atomic_add_unchecked(s, &rdev->corrected_errors);
44796 }
44797 sectors -= s;
44798 sect += s;
44799 @@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44800 !test_bit(Faulty, &rdev->flags)) {
44801 if (r1_sync_page_io(rdev, sect, s,
44802 conf->tmppage, READ)) {
44803 - atomic_add(s, &rdev->corrected_errors);
44804 + atomic_add_unchecked(s, &rdev->corrected_errors);
44805 printk(KERN_INFO
44806 "md/raid1:%s: read error corrected "
44807 "(%d sectors at %llu on %s)\n",
44808 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44809 index 32e282f..5cec803 100644
44810 --- a/drivers/md/raid10.c
44811 +++ b/drivers/md/raid10.c
44812 @@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44813 /* The write handler will notice the lack of
44814 * R10BIO_Uptodate and record any errors etc
44815 */
44816 - atomic_add(r10_bio->sectors,
44817 + atomic_add_unchecked(r10_bio->sectors,
44818 &conf->mirrors[d].rdev->corrected_errors);
44819
44820 /* for reconstruct, we always reschedule after a read.
44821 @@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44822 {
44823 struct timespec cur_time_mon;
44824 unsigned long hours_since_last;
44825 - unsigned int read_errors = atomic_read(&rdev->read_errors);
44826 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44827
44828 ktime_get_ts(&cur_time_mon);
44829
44830 @@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44831 * overflowing the shift of read_errors by hours_since_last.
44832 */
44833 if (hours_since_last >= 8 * sizeof(read_errors))
44834 - atomic_set(&rdev->read_errors, 0);
44835 + atomic_set_unchecked(&rdev->read_errors, 0);
44836 else
44837 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44838 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44839 }
44840
44841 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44842 @@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44843 return;
44844
44845 check_decay_read_errors(mddev, rdev);
44846 - atomic_inc(&rdev->read_errors);
44847 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
44848 + atomic_inc_unchecked(&rdev->read_errors);
44849 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44850 char b[BDEVNAME_SIZE];
44851 bdevname(rdev->bdev, b);
44852
44853 @@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44854 "md/raid10:%s: %s: Raid device exceeded "
44855 "read_error threshold [cur %d:max %d]\n",
44856 mdname(mddev), b,
44857 - atomic_read(&rdev->read_errors), max_read_errors);
44858 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44859 printk(KERN_NOTICE
44860 "md/raid10:%s: %s: Failing raid device\n",
44861 mdname(mddev), b);
44862 @@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44863 sect +
44864 choose_data_offset(r10_bio, rdev)),
44865 bdevname(rdev->bdev, b));
44866 - atomic_add(s, &rdev->corrected_errors);
44867 + atomic_add_unchecked(s, &rdev->corrected_errors);
44868 }
44869
44870 rdev_dec_pending(rdev, mddev);
44871 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44872 index c1b0d52..07a0a5d 100644
44873 --- a/drivers/md/raid5.c
44874 +++ b/drivers/md/raid5.c
44875 @@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44876 return 1;
44877 }
44878
44879 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44880 +static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44881 +#endif
44882 +
44883 static int grow_stripes(struct r5conf *conf, int num)
44884 {
44885 struct kmem_cache *sc;
44886 @@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44887 "raid%d-%s", conf->level, mdname(conf->mddev));
44888 else
44889 sprintf(conf->cache_name[0],
44890 +#ifdef CONFIG_GRKERNSEC_HIDESYM
44891 + "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44892 +#else
44893 "raid%d-%p", conf->level, conf->mddev);
44894 +#endif
44895 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44896
44897 conf->active_name = 0;
44898 @@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44899 mdname(conf->mddev), STRIPE_SECTORS,
44900 (unsigned long long)s,
44901 bdevname(rdev->bdev, b));
44902 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44903 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44904 clear_bit(R5_ReadError, &sh->dev[i].flags);
44905 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44906 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44907 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44908
44909 - if (atomic_read(&rdev->read_errors))
44910 - atomic_set(&rdev->read_errors, 0);
44911 + if (atomic_read_unchecked(&rdev->read_errors))
44912 + atomic_set_unchecked(&rdev->read_errors, 0);
44913 } else {
44914 const char *bdn = bdevname(rdev->bdev, b);
44915 int retry = 0;
44916 int set_bad = 0;
44917
44918 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44919 - atomic_inc(&rdev->read_errors);
44920 + atomic_inc_unchecked(&rdev->read_errors);
44921 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44922 printk_ratelimited(
44923 KERN_WARNING
44924 @@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44925 mdname(conf->mddev),
44926 (unsigned long long)s,
44927 bdn);
44928 - } else if (atomic_read(&rdev->read_errors)
44929 + } else if (atomic_read_unchecked(&rdev->read_errors)
44930 > conf->max_nr_stripes)
44931 printk(KERN_WARNING
44932 "md/raid:%s: Too many read errors, failing device %s.\n",
44933 diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44934 index 983db75..ef9248c 100644
44935 --- a/drivers/media/dvb-core/dvbdev.c
44936 +++ b/drivers/media/dvb-core/dvbdev.c
44937 @@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44938 const struct dvb_device *template, void *priv, int type)
44939 {
44940 struct dvb_device *dvbdev;
44941 - struct file_operations *dvbdevfops;
44942 + file_operations_no_const *dvbdevfops;
44943 struct device *clsdev;
44944 int minor;
44945 int id;
44946 diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44947 index 6ad22b6..6e90e2a 100644
44948 --- a/drivers/media/dvb-frontends/af9033.h
44949 +++ b/drivers/media/dvb-frontends/af9033.h
44950 @@ -96,6 +96,6 @@ struct af9033_ops {
44951 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44952 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44953 int onoff);
44954 -};
44955 +} __no_const;
44956
44957 #endif /* AF9033_H */
44958 diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44959 index 9b6c3bb..baeb5c7 100644
44960 --- a/drivers/media/dvb-frontends/dib3000.h
44961 +++ b/drivers/media/dvb-frontends/dib3000.h
44962 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44963 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44964 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44965 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44966 -};
44967 +} __no_const;
44968
44969 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44970 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44971 diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44972 index 1fea0e9..321ce8f 100644
44973 --- a/drivers/media/dvb-frontends/dib7000p.h
44974 +++ b/drivers/media/dvb-frontends/dib7000p.h
44975 @@ -64,7 +64,7 @@ struct dib7000p_ops {
44976 int (*get_adc_power)(struct dvb_frontend *fe);
44977 int (*slave_reset)(struct dvb_frontend *fe);
44978 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44979 -};
44980 +} __no_const;
44981
44982 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44983 void *dib7000p_attach(struct dib7000p_ops *ops);
44984 diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44985 index 84cc103..5780c54 100644
44986 --- a/drivers/media/dvb-frontends/dib8000.h
44987 +++ b/drivers/media/dvb-frontends/dib8000.h
44988 @@ -61,7 +61,7 @@ struct dib8000_ops {
44989 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44990 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44991 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44992 -};
44993 +} __no_const;
44994
44995 #if IS_ENABLED(CONFIG_DVB_DIB8000)
44996 void *dib8000_attach(struct dib8000_ops *ops);
44997 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44998 index ce27e6d..b70435a 100644
44999 --- a/drivers/media/pci/cx88/cx88-video.c
45000 +++ b/drivers/media/pci/cx88/cx88-video.c
45001 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45002
45003 /* ------------------------------------------------------------------ */
45004
45005 -static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45006 -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45007 -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45008 +static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45009 +static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45010 +static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45011
45012 module_param_array(video_nr, int, NULL, 0444);
45013 module_param_array(vbi_nr, int, NULL, 0444);
45014 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45015 index 802642d..5534900 100644
45016 --- a/drivers/media/pci/ivtv/ivtv-driver.c
45017 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
45018 @@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45019 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45020
45021 /* ivtv instance counter */
45022 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
45023 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45024
45025 /* Parameter declarations */
45026 static int cardtype[IVTV_MAX_CARDS];
45027 diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45028 index 8cbe6b4..ea3601c 100644
45029 --- a/drivers/media/pci/solo6x10/solo6x10-core.c
45030 +++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45031 @@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45032
45033 static int solo_sysfs_init(struct solo_dev *solo_dev)
45034 {
45035 - struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45036 + bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45037 struct device *dev = &solo_dev->dev;
45038 const char *driver;
45039 int i;
45040 diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45041 index c7141f2..5301fec 100644
45042 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45043 +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45044 @@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45045
45046 int solo_g723_init(struct solo_dev *solo_dev)
45047 {
45048 - static struct snd_device_ops ops = { NULL };
45049 + static struct snd_device_ops ops = { };
45050 struct snd_card *card;
45051 struct snd_kcontrol_new kctl;
45052 char name[32];
45053 diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45054 index 8c84846..27b4f83 100644
45055 --- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45056 +++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45057 @@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45058
45059 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45060 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45061 - p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45062 + p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45063 if (p2m_id < 0)
45064 p2m_id = -p2m_id;
45065 }
45066 diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45067 index 72017b7..dd37ae6 100644
45068 --- a/drivers/media/pci/solo6x10/solo6x10.h
45069 +++ b/drivers/media/pci/solo6x10/solo6x10.h
45070 @@ -219,7 +219,7 @@ struct solo_dev {
45071
45072 /* P2M DMA Engine */
45073 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45074 - atomic_t p2m_count;
45075 + atomic_unchecked_t p2m_count;
45076 int p2m_jiffies;
45077 unsigned int p2m_timeouts;
45078
45079 diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45080 index 63f0b64..a017c1c 100644
45081 --- a/drivers/media/pci/tw68/tw68-core.c
45082 +++ b/drivers/media/pci/tw68/tw68-core.c
45083 @@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45084 module_param_array(card, int, NULL, 0444);
45085 MODULE_PARM_DESC(card, "card type");
45086
45087 -static atomic_t tw68_instance = ATOMIC_INIT(0);
45088 +static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45089
45090 /* ------------------------------------------------------------------ */
45091
45092 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45093 index 64ab6fb..ef4a8b9 100644
45094 --- a/drivers/media/platform/omap/omap_vout.c
45095 +++ b/drivers/media/platform/omap/omap_vout.c
45096 @@ -63,7 +63,6 @@ enum omap_vout_channels {
45097 OMAP_VIDEO2,
45098 };
45099
45100 -static struct videobuf_queue_ops video_vbq_ops;
45101 /* Variables configurable through module params*/
45102 static u32 video1_numbuffers = 3;
45103 static u32 video2_numbuffers = 3;
45104 @@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45105 {
45106 struct videobuf_queue *q;
45107 struct omap_vout_device *vout = NULL;
45108 + static struct videobuf_queue_ops video_vbq_ops = {
45109 + .buf_setup = omap_vout_buffer_setup,
45110 + .buf_prepare = omap_vout_buffer_prepare,
45111 + .buf_release = omap_vout_buffer_release,
45112 + .buf_queue = omap_vout_buffer_queue,
45113 + };
45114
45115 vout = video_drvdata(file);
45116 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45117 @@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45118 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45119
45120 q = &vout->vbq;
45121 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45122 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45123 - video_vbq_ops.buf_release = omap_vout_buffer_release;
45124 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45125 spin_lock_init(&vout->vbq_lock);
45126
45127 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45128 diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45129 index fb2acc5..a2fcbdc4 100644
45130 --- a/drivers/media/platform/s5p-tv/mixer.h
45131 +++ b/drivers/media/platform/s5p-tv/mixer.h
45132 @@ -156,7 +156,7 @@ struct mxr_layer {
45133 /** layer index (unique identifier) */
45134 int idx;
45135 /** callbacks for layer methods */
45136 - struct mxr_layer_ops ops;
45137 + struct mxr_layer_ops *ops;
45138 /** format array */
45139 const struct mxr_format **fmt_array;
45140 /** size of format array */
45141 diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45142 index 74344c7..a39e70e 100644
45143 --- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45144 +++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45145 @@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45146 {
45147 struct mxr_layer *layer;
45148 int ret;
45149 - struct mxr_layer_ops ops = {
45150 + static struct mxr_layer_ops ops = {
45151 .release = mxr_graph_layer_release,
45152 .buffer_set = mxr_graph_buffer_set,
45153 .stream_set = mxr_graph_stream_set,
45154 diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45155 index b713403..53cb5ad 100644
45156 --- a/drivers/media/platform/s5p-tv/mixer_reg.c
45157 +++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45158 @@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45159 layer->update_buf = next;
45160 }
45161
45162 - layer->ops.buffer_set(layer, layer->update_buf);
45163 + layer->ops->buffer_set(layer, layer->update_buf);
45164
45165 if (done && done != layer->shadow_buf)
45166 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45167 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45168 index b4d2696..91df48e 100644
45169 --- a/drivers/media/platform/s5p-tv/mixer_video.c
45170 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
45171 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45172 layer->geo.src.height = layer->geo.src.full_height;
45173
45174 mxr_geometry_dump(mdev, &layer->geo);
45175 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45176 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45177 mxr_geometry_dump(mdev, &layer->geo);
45178 }
45179
45180 @@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45181 layer->geo.dst.full_width = mbus_fmt.width;
45182 layer->geo.dst.full_height = mbus_fmt.height;
45183 layer->geo.dst.field = mbus_fmt.field;
45184 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45185 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45186
45187 mxr_geometry_dump(mdev, &layer->geo);
45188 }
45189 @@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45190 /* set source size to highest accepted value */
45191 geo->src.full_width = max(geo->dst.full_width, pix->width);
45192 geo->src.full_height = max(geo->dst.full_height, pix->height);
45193 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45194 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45195 mxr_geometry_dump(mdev, &layer->geo);
45196 /* set cropping to total visible screen */
45197 geo->src.width = pix->width;
45198 @@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45199 geo->src.x_offset = 0;
45200 geo->src.y_offset = 0;
45201 /* assure consistency of geometry */
45202 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45203 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45204 mxr_geometry_dump(mdev, &layer->geo);
45205 /* set full size to lowest possible value */
45206 geo->src.full_width = 0;
45207 geo->src.full_height = 0;
45208 - layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45209 + layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45210 mxr_geometry_dump(mdev, &layer->geo);
45211
45212 /* returning results */
45213 @@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45214 target->width = s->r.width;
45215 target->height = s->r.height;
45216
45217 - layer->ops.fix_geometry(layer, stage, s->flags);
45218 + layer->ops->fix_geometry(layer, stage, s->flags);
45219
45220 /* retrieve update selection rectangle */
45221 res.left = target->x_offset;
45222 @@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45223 mxr_output_get(mdev);
45224
45225 mxr_layer_update_output(layer);
45226 - layer->ops.format_set(layer);
45227 + layer->ops->format_set(layer);
45228 /* enabling layer in hardware */
45229 spin_lock_irqsave(&layer->enq_slock, flags);
45230 layer->state = MXR_LAYER_STREAMING;
45231 spin_unlock_irqrestore(&layer->enq_slock, flags);
45232
45233 - layer->ops.stream_set(layer, MXR_ENABLE);
45234 + layer->ops->stream_set(layer, MXR_ENABLE);
45235 mxr_streamer_get(mdev);
45236
45237 return 0;
45238 @@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45239 spin_unlock_irqrestore(&layer->enq_slock, flags);
45240
45241 /* disabling layer in hardware */
45242 - layer->ops.stream_set(layer, MXR_DISABLE);
45243 + layer->ops->stream_set(layer, MXR_DISABLE);
45244 /* remove one streamer */
45245 mxr_streamer_put(mdev);
45246 /* allow changes in output configuration */
45247 @@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45248
45249 void mxr_layer_release(struct mxr_layer *layer)
45250 {
45251 - if (layer->ops.release)
45252 - layer->ops.release(layer);
45253 + if (layer->ops->release)
45254 + layer->ops->release(layer);
45255 }
45256
45257 void mxr_base_layer_release(struct mxr_layer *layer)
45258 @@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45259
45260 layer->mdev = mdev;
45261 layer->idx = idx;
45262 - layer->ops = *ops;
45263 + layer->ops = ops;
45264
45265 spin_lock_init(&layer->enq_slock);
45266 INIT_LIST_HEAD(&layer->enq_list);
45267 diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45268 index c9388c4..ce71ece 100644
45269 --- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45270 +++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45271 @@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45272 {
45273 struct mxr_layer *layer;
45274 int ret;
45275 - struct mxr_layer_ops ops = {
45276 + static struct mxr_layer_ops ops = {
45277 .release = mxr_vp_layer_release,
45278 .buffer_set = mxr_vp_buffer_set,
45279 .stream_set = mxr_vp_stream_set,
45280 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45281 index 82affae..42833ec 100644
45282 --- a/drivers/media/radio/radio-cadet.c
45283 +++ b/drivers/media/radio/radio-cadet.c
45284 @@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45285 unsigned char readbuf[RDS_BUFFER];
45286 int i = 0;
45287
45288 + if (count > RDS_BUFFER)
45289 + return -EFAULT;
45290 mutex_lock(&dev->lock);
45291 if (dev->rdsstat == 0)
45292 cadet_start_rds(dev);
45293 @@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45294 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45295 mutex_unlock(&dev->lock);
45296
45297 - if (i && copy_to_user(data, readbuf, i))
45298 - return -EFAULT;
45299 + if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45300 + i = -EFAULT;
45301 +
45302 return i;
45303 }
45304
45305 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45306 index 5236035..c622c74 100644
45307 --- a/drivers/media/radio/radio-maxiradio.c
45308 +++ b/drivers/media/radio/radio-maxiradio.c
45309 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45310 /* TEA5757 pin mappings */
45311 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45312
45313 -static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45314 +static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45315
45316 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45317 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45318 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45319 index 050b3bb..79f62b9 100644
45320 --- a/drivers/media/radio/radio-shark.c
45321 +++ b/drivers/media/radio/radio-shark.c
45322 @@ -79,7 +79,7 @@ struct shark_device {
45323 u32 last_val;
45324 };
45325
45326 -static atomic_t shark_instance = ATOMIC_INIT(0);
45327 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45328
45329 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45330 {
45331 diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45332 index 8654e0d..0608a64 100644
45333 --- a/drivers/media/radio/radio-shark2.c
45334 +++ b/drivers/media/radio/radio-shark2.c
45335 @@ -74,7 +74,7 @@ struct shark_device {
45336 u8 *transfer_buffer;
45337 };
45338
45339 -static atomic_t shark_instance = ATOMIC_INIT(0);
45340 +static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45341
45342 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45343 {
45344 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45345 index 633022b..7f10754 100644
45346 --- a/drivers/media/radio/radio-si476x.c
45347 +++ b/drivers/media/radio/radio-si476x.c
45348 @@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45349 struct si476x_radio *radio;
45350 struct v4l2_ctrl *ctrl;
45351
45352 - static atomic_t instance = ATOMIC_INIT(0);
45353 + static atomic_unchecked_t instance = ATOMIC_INIT(0);
45354
45355 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45356 if (!radio)
45357 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45358 index 9fd1527..8927230 100644
45359 --- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45360 +++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45361 @@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45362
45363 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45364 {
45365 - char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45366 - char result[64];
45367 - return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45368 - sizeof(result), 0);
45369 + char *buf;
45370 + char *result;
45371 + int retval;
45372 +
45373 + buf = kmalloc(2, GFP_KERNEL);
45374 + if (buf == NULL)
45375 + return -ENOMEM;
45376 + result = kmalloc(64, GFP_KERNEL);
45377 + if (result == NULL) {
45378 + kfree(buf);
45379 + return -ENOMEM;
45380 + }
45381 +
45382 + buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45383 + buf[1] = enable ? 1 : 0;
45384 +
45385 + retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45386 +
45387 + kfree(buf);
45388 + kfree(result);
45389 + return retval;
45390 }
45391
45392 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45393 {
45394 - char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45395 - char state[3];
45396 - return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45397 + char *buf;
45398 + char *state;
45399 + int retval;
45400 +
45401 + buf = kmalloc(2, GFP_KERNEL);
45402 + if (buf == NULL)
45403 + return -ENOMEM;
45404 + state = kmalloc(3, GFP_KERNEL);
45405 + if (state == NULL) {
45406 + kfree(buf);
45407 + return -ENOMEM;
45408 + }
45409 +
45410 + buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45411 + buf[1] = enable ? 1 : 0;
45412 +
45413 + retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45414 +
45415 + kfree(buf);
45416 + kfree(state);
45417 + return retval;
45418 }
45419
45420 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45421 {
45422 - char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45423 - char state[3];
45424 + char *query;
45425 + char *state;
45426 int ret;
45427 + query = kmalloc(1, GFP_KERNEL);
45428 + if (query == NULL)
45429 + return -ENOMEM;
45430 + state = kmalloc(3, GFP_KERNEL);
45431 + if (state == NULL) {
45432 + kfree(query);
45433 + return -ENOMEM;
45434 + }
45435 +
45436 + query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45437
45438 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45439
45440 - ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45441 - sizeof(state), 0);
45442 + ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45443 if (ret < 0) {
45444 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45445 "state info\n");
45446 @@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45447
45448 /* Copy this pointer as we are gonna need it in the release phase */
45449 cinergyt2_usb_device = adap->dev;
45450 -
45451 + kfree(query);
45452 + kfree(state);
45453 return 0;
45454 }
45455
45456 @@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45457 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45458 {
45459 struct cinergyt2_state *st = d->priv;
45460 - u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45461 + u8 *key, *cmd;
45462 int i;
45463
45464 + cmd = kmalloc(1, GFP_KERNEL);
45465 + if (cmd == NULL)
45466 + return -EINVAL;
45467 + key = kzalloc(5, GFP_KERNEL);
45468 + if (key == NULL) {
45469 + kfree(cmd);
45470 + return -EINVAL;
45471 + }
45472 +
45473 + cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45474 +
45475 *state = REMOTE_NO_KEY_PRESSED;
45476
45477 - dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45478 + dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45479 if (key[4] == 0xff) {
45480 /* key repeat */
45481 st->rc_counter++;
45482 @@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45483 *event = d->last_event;
45484 deb_rc("repeat key, event %x\n",
45485 *event);
45486 - return 0;
45487 + goto out;
45488 }
45489 }
45490 deb_rc("repeated key (non repeatable)\n");
45491 }
45492 - return 0;
45493 + goto out;
45494 }
45495
45496 /* hack to pass checksum on the custom field */
45497 @@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45498
45499 deb_rc("key: %*ph\n", 5, key);
45500 }
45501 +out:
45502 + kfree(cmd);
45503 + kfree(key);
45504 return 0;
45505 }
45506
45507 diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45508 index c890fe4..f9b2ae6 100644
45509 --- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45510 +++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45511 @@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45512 fe_status_t *status)
45513 {
45514 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45515 - struct dvbt_get_status_msg result;
45516 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45517 + struct dvbt_get_status_msg *result;
45518 + u8 *cmd;
45519 int ret;
45520
45521 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45522 - sizeof(result), 0);
45523 + cmd = kmalloc(1, GFP_KERNEL);
45524 + if (cmd == NULL)
45525 + return -ENOMEM;
45526 + result = kmalloc(sizeof(*result), GFP_KERNEL);
45527 + if (result == NULL) {
45528 + kfree(cmd);
45529 + return -ENOMEM;
45530 + }
45531 +
45532 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45533 +
45534 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45535 + sizeof(*result), 0);
45536 if (ret < 0)
45537 - return ret;
45538 + goto out;
45539
45540 *status = 0;
45541
45542 - if (0xffff - le16_to_cpu(result.gain) > 30)
45543 + if (0xffff - le16_to_cpu(result->gain) > 30)
45544 *status |= FE_HAS_SIGNAL;
45545 - if (result.lock_bits & (1 << 6))
45546 + if (result->lock_bits & (1 << 6))
45547 *status |= FE_HAS_LOCK;
45548 - if (result.lock_bits & (1 << 5))
45549 + if (result->lock_bits & (1 << 5))
45550 *status |= FE_HAS_SYNC;
45551 - if (result.lock_bits & (1 << 4))
45552 + if (result->lock_bits & (1 << 4))
45553 *status |= FE_HAS_CARRIER;
45554 - if (result.lock_bits & (1 << 1))
45555 + if (result->lock_bits & (1 << 1))
45556 *status |= FE_HAS_VITERBI;
45557
45558 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45559 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45560 *status &= ~FE_HAS_LOCK;
45561
45562 - return 0;
45563 +out:
45564 + kfree(cmd);
45565 + kfree(result);
45566 + return ret;
45567 }
45568
45569 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45570 {
45571 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45572 - struct dvbt_get_status_msg status;
45573 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45574 + struct dvbt_get_status_msg *status;
45575 + char *cmd;
45576 int ret;
45577
45578 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45579 - sizeof(status), 0);
45580 + cmd = kmalloc(1, GFP_KERNEL);
45581 + if (cmd == NULL)
45582 + return -ENOMEM;
45583 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45584 + if (status == NULL) {
45585 + kfree(cmd);
45586 + return -ENOMEM;
45587 + }
45588 +
45589 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45590 +
45591 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45592 + sizeof(*status), 0);
45593 if (ret < 0)
45594 - return ret;
45595 + goto out;
45596
45597 - *ber = le32_to_cpu(status.viterbi_error_rate);
45598 + *ber = le32_to_cpu(status->viterbi_error_rate);
45599 +out:
45600 + kfree(cmd);
45601 + kfree(status);
45602 return 0;
45603 }
45604
45605 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45606 {
45607 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45608 - struct dvbt_get_status_msg status;
45609 - u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45610 + struct dvbt_get_status_msg *status;
45611 + u8 *cmd;
45612 int ret;
45613
45614 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45615 - sizeof(status), 0);
45616 + cmd = kmalloc(1, GFP_KERNEL);
45617 + if (cmd == NULL)
45618 + return -ENOMEM;
45619 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45620 + if (status == NULL) {
45621 + kfree(cmd);
45622 + return -ENOMEM;
45623 + }
45624 +
45625 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45626 +
45627 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45628 + sizeof(*status), 0);
45629 if (ret < 0) {
45630 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45631 ret);
45632 - return ret;
45633 + goto out;
45634 }
45635 - *unc = le32_to_cpu(status.uncorrected_block_count);
45636 - return 0;
45637 + *unc = le32_to_cpu(status->uncorrected_block_count);
45638 +
45639 +out:
45640 + kfree(cmd);
45641 + kfree(status);
45642 + return ret;
45643 }
45644
45645 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45646 u16 *strength)
45647 {
45648 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45649 - struct dvbt_get_status_msg status;
45650 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45651 + struct dvbt_get_status_msg *status;
45652 + char *cmd;
45653 int ret;
45654
45655 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45656 - sizeof(status), 0);
45657 + cmd = kmalloc(1, GFP_KERNEL);
45658 + if (cmd == NULL)
45659 + return -ENOMEM;
45660 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45661 + if (status == NULL) {
45662 + kfree(cmd);
45663 + return -ENOMEM;
45664 + }
45665 +
45666 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45667 +
45668 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45669 + sizeof(*status), 0);
45670 if (ret < 0) {
45671 err("cinergyt2_fe_read_signal_strength() Failed!"
45672 " (Error=%d)\n", ret);
45673 - return ret;
45674 + goto out;
45675 }
45676 - *strength = (0xffff - le16_to_cpu(status.gain));
45677 + *strength = (0xffff - le16_to_cpu(status->gain));
45678 +
45679 +out:
45680 + kfree(cmd);
45681 + kfree(status);
45682 return 0;
45683 }
45684
45685 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45686 {
45687 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45688 - struct dvbt_get_status_msg status;
45689 - char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45690 + struct dvbt_get_status_msg *status;
45691 + char *cmd;
45692 int ret;
45693
45694 - ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45695 - sizeof(status), 0);
45696 + cmd = kmalloc(1, GFP_KERNEL);
45697 + if (cmd == NULL)
45698 + return -ENOMEM;
45699 + status = kmalloc(sizeof(*status), GFP_KERNEL);
45700 + if (status == NULL) {
45701 + kfree(cmd);
45702 + return -ENOMEM;
45703 + }
45704 +
45705 + cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45706 +
45707 + ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45708 + sizeof(*status), 0);
45709 if (ret < 0) {
45710 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45711 - return ret;
45712 + goto out;
45713 }
45714 - *snr = (status.snr << 8) | status.snr;
45715 - return 0;
45716 + *snr = (status->snr << 8) | status->snr;
45717 +
45718 +out:
45719 + kfree(cmd);
45720 + kfree(status);
45721 + return ret;
45722 }
45723
45724 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45725 @@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45726 {
45727 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45728 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45729 - struct dvbt_set_parameters_msg param;
45730 - char result[2];
45731 + struct dvbt_set_parameters_msg *param;
45732 + char *result;
45733 int err;
45734
45735 - param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45736 - param.tps = cpu_to_le16(compute_tps(fep));
45737 - param.freq = cpu_to_le32(fep->frequency / 1000);
45738 - param.flags = 0;
45739 + result = kmalloc(2, GFP_KERNEL);
45740 + if (result == NULL)
45741 + return -ENOMEM;
45742 + param = kmalloc(sizeof(*param), GFP_KERNEL);
45743 + if (param == NULL) {
45744 + kfree(result);
45745 + return -ENOMEM;
45746 + }
45747 +
45748 + param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45749 + param->tps = cpu_to_le16(compute_tps(fep));
45750 + param->freq = cpu_to_le32(fep->frequency / 1000);
45751 + param->flags = 0;
45752
45753 switch (fep->bandwidth_hz) {
45754 default:
45755 case 8000000:
45756 - param.bandwidth = 8;
45757 + param->bandwidth = 8;
45758 break;
45759 case 7000000:
45760 - param.bandwidth = 7;
45761 + param->bandwidth = 7;
45762 break;
45763 case 6000000:
45764 - param.bandwidth = 6;
45765 + param->bandwidth = 6;
45766 break;
45767 }
45768
45769 err = dvb_usb_generic_rw(state->d,
45770 - (char *)&param, sizeof(param),
45771 - result, sizeof(result), 0);
45772 + (char *)param, sizeof(*param),
45773 + result, 2, 0);
45774 if (err < 0)
45775 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45776
45777 - return (err < 0) ? err : 0;
45778 + kfree(result);
45779 + kfree(param);
45780 + return err;
45781 }
45782
45783 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45784 diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45785 index 733a7ff..f8b52e3 100644
45786 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45787 +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45788 @@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45789
45790 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45791 {
45792 - struct hexline hx;
45793 - u8 reset;
45794 + struct hexline *hx;
45795 + u8 *reset;
45796 int ret,pos=0;
45797
45798 + reset = kmalloc(1, GFP_KERNEL);
45799 + if (reset == NULL)
45800 + return -ENOMEM;
45801 +
45802 + hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45803 + if (hx == NULL) {
45804 + kfree(reset);
45805 + return -ENOMEM;
45806 + }
45807 +
45808 /* stop the CPU */
45809 - reset = 1;
45810 - if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45811 + reset[0] = 1;
45812 + if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45813 err("could not stop the USB controller CPU.");
45814
45815 - while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45816 - deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45817 - ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45818 + while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45819 + deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45820 + ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45821
45822 - if (ret != hx.len) {
45823 + if (ret != hx->len) {
45824 err("error while transferring firmware "
45825 "(transferred size: %d, block size: %d)",
45826 - ret,hx.len);
45827 + ret,hx->len);
45828 ret = -EINVAL;
45829 break;
45830 }
45831 }
45832 if (ret < 0) {
45833 err("firmware download failed at %d with %d",pos,ret);
45834 + kfree(reset);
45835 + kfree(hx);
45836 return ret;
45837 }
45838
45839 if (ret == 0) {
45840 /* restart the CPU */
45841 - reset = 0;
45842 - if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45843 + reset[0] = 0;
45844 + if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45845 err("could not restart the USB controller CPU.");
45846 ret = -EINVAL;
45847 }
45848 } else
45849 ret = -EIO;
45850
45851 + kfree(reset);
45852 + kfree(hx);
45853 +
45854 return ret;
45855 }
45856 EXPORT_SYMBOL(usb_cypress_load_firmware);
45857 diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45858 index 1a3df10..57997a5 100644
45859 --- a/drivers/media/usb/dvb-usb/dw2102.c
45860 +++ b/drivers/media/usb/dvb-usb/dw2102.c
45861 @@ -118,7 +118,7 @@ struct su3000_state {
45862
45863 struct s6x0_state {
45864 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45865 -};
45866 +} __no_const;
45867
45868 /* debug */
45869 static int dvb_usb_dw2102_debug;
45870 diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45871 index 6b0b8b6b..4038398 100644
45872 --- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45873 +++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45874 @@ -87,8 +87,11 @@ struct technisat_usb2_state {
45875 static int technisat_usb2_i2c_access(struct usb_device *udev,
45876 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45877 {
45878 - u8 b[64];
45879 - int ret, actual_length;
45880 + u8 *b = kmalloc(64, GFP_KERNEL);
45881 + int ret, actual_length, error = 0;
45882 +
45883 + if (b == NULL)
45884 + return -ENOMEM;
45885
45886 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45887 debug_dump(tx, txlen, deb_i2c);
45888 @@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45889
45890 if (ret < 0) {
45891 err("i2c-error: out failed %02x = %d", device_addr, ret);
45892 - return -ENODEV;
45893 + error = -ENODEV;
45894 + goto out;
45895 }
45896
45897 ret = usb_bulk_msg(udev,
45898 @@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45899 b, 64, &actual_length, 1000);
45900 if (ret < 0) {
45901 err("i2c-error: in failed %02x = %d", device_addr, ret);
45902 - return -ENODEV;
45903 + error = -ENODEV;
45904 + goto out;
45905 }
45906
45907 if (b[0] != I2C_STATUS_OK) {
45908 @@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45909 /* handle tuner-i2c-nak */
45910 if (!(b[0] == I2C_STATUS_NAK &&
45911 device_addr == 0x60
45912 - /* && device_is_technisat_usb2 */))
45913 - return -ENODEV;
45914 + /* && device_is_technisat_usb2 */)) {
45915 + error = -ENODEV;
45916 + goto out;
45917 + }
45918 }
45919
45920 deb_i2c("status: %d, ", b[0]);
45921 @@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45922
45923 deb_i2c("\n");
45924
45925 - return 0;
45926 +out:
45927 + kfree(b);
45928 + return error;
45929 }
45930
45931 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45932 @@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45933 {
45934 int ret;
45935
45936 - u8 led[8] = {
45937 - red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45938 - 0
45939 - };
45940 + u8 *led = kzalloc(8, GFP_KERNEL);
45941 +
45942 + if (led == NULL)
45943 + return -ENOMEM;
45944
45945 if (disable_led_control && state != TECH_LED_OFF)
45946 return 0;
45947
45948 + led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45949 +
45950 switch (state) {
45951 case TECH_LED_ON:
45952 led[1] = 0x82;
45953 @@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45954 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45955 USB_TYPE_VENDOR | USB_DIR_OUT,
45956 0, 0,
45957 - led, sizeof(led), 500);
45958 + led, 8, 500);
45959
45960 mutex_unlock(&d->i2c_mutex);
45961 +
45962 + kfree(led);
45963 +
45964 return ret;
45965 }
45966
45967 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45968 {
45969 int ret;
45970 - u8 b = 0;
45971 + u8 *b = kzalloc(1, GFP_KERNEL);
45972 +
45973 + if (b == NULL)
45974 + return -ENOMEM;
45975
45976 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45977 return -EAGAIN;
45978 @@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45979 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45980 USB_TYPE_VENDOR | USB_DIR_OUT,
45981 (red << 8) | green, 0,
45982 - &b, 1, 500);
45983 + b, 1, 500);
45984
45985 mutex_unlock(&d->i2c_mutex);
45986
45987 + kfree(b);
45988 +
45989 return ret;
45990 }
45991
45992 @@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45993 struct dvb_usb_device_description **desc, int *cold)
45994 {
45995 int ret;
45996 - u8 version[3];
45997 + u8 *version = kmalloc(3, GFP_KERNEL);
45998
45999 /* first select the interface */
46000 if (usb_set_interface(udev, 0, 1) != 0)
46001 @@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46002
46003 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46004
46005 + if (version == NULL)
46006 + return 0;
46007 +
46008 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46009 GET_VERSION_INFO_VENDOR_REQUEST,
46010 USB_TYPE_VENDOR | USB_DIR_IN,
46011 0, 0,
46012 - version, sizeof(version), 500);
46013 + version, 3, 500);
46014
46015 if (ret < 0)
46016 *cold = 1;
46017 @@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46018 *cold = 0;
46019 }
46020
46021 + kfree(version);
46022 +
46023 return 0;
46024 }
46025
46026 @@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46027
46028 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46029 {
46030 - u8 buf[62], *b;
46031 + u8 *buf, *b;
46032 int ret;
46033 struct ir_raw_event ev;
46034
46035 + buf = kmalloc(62, GFP_KERNEL);
46036 +
46037 + if (buf == NULL)
46038 + return -ENOMEM;
46039 +
46040 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46041 buf[1] = 0x08;
46042 buf[2] = 0x8f;
46043 @@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46044 GET_IR_DATA_VENDOR_REQUEST,
46045 USB_TYPE_VENDOR | USB_DIR_IN,
46046 0x8080, 0,
46047 - buf, sizeof(buf), 500);
46048 + buf, 62, 500);
46049
46050 unlock:
46051 mutex_unlock(&d->i2c_mutex);
46052
46053 - if (ret < 0)
46054 + if (ret < 0) {
46055 + kfree(buf);
46056 return ret;
46057 + }
46058
46059 - if (ret == 1)
46060 + if (ret == 1) {
46061 + kfree(buf);
46062 return 0; /* no key pressed */
46063 + }
46064
46065 /* decoding */
46066 b = buf+1;
46067 @@ -653,6 +686,8 @@ unlock:
46068
46069 ir_raw_event_handle(d->rc_dev);
46070
46071 + kfree(buf);
46072 +
46073 return 1;
46074 }
46075
46076 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46077 index e502a5f..2a27f40 100644
46078 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46079 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46080 @@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46081 * by passing a very big num_planes value */
46082 uplane = compat_alloc_user_space(num_planes *
46083 sizeof(struct v4l2_plane));
46084 - kp->m.planes = (__force struct v4l2_plane *)uplane;
46085 + kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46086
46087 while (--num_planes >= 0) {
46088 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46089 @@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46090 if (num_planes == 0)
46091 return 0;
46092
46093 - uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46094 + uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46095 if (get_user(p, &up->m.planes))
46096 return -EFAULT;
46097 uplane32 = compat_ptr(p);
46098 @@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46099 get_user(kp->flags, &up->flags) ||
46100 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46101 return -EFAULT;
46102 - kp->base = (__force void *)compat_ptr(tmp);
46103 + kp->base = (__force_kernel void *)compat_ptr(tmp);
46104 return 0;
46105 }
46106
46107 @@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46108 n * sizeof(struct v4l2_ext_control32)))
46109 return -EFAULT;
46110 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46111 - kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46112 + kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46113 while (--n >= 0) {
46114 u32 id;
46115
46116 @@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46117 {
46118 struct v4l2_ext_control32 __user *ucontrols;
46119 struct v4l2_ext_control __user *kcontrols =
46120 - (__force struct v4l2_ext_control __user *)kp->controls;
46121 + (struct v4l2_ext_control __force_user *)kp->controls;
46122 int n = kp->count;
46123 compat_caddr_t p;
46124
46125 @@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46126 get_user(tmp, &up->edid) ||
46127 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46128 return -EFAULT;
46129 - kp->edid = (__force u8 *)compat_ptr(tmp);
46130 + kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46131 return 0;
46132 }
46133
46134 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46135 index 015f92a..59e311e 100644
46136 --- a/drivers/media/v4l2-core/v4l2-device.c
46137 +++ b/drivers/media/v4l2-core/v4l2-device.c
46138 @@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46139 EXPORT_SYMBOL_GPL(v4l2_device_put);
46140
46141 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46142 - atomic_t *instance)
46143 + atomic_unchecked_t *instance)
46144 {
46145 - int num = atomic_inc_return(instance) - 1;
46146 + int num = atomic_inc_return_unchecked(instance) - 1;
46147 int len = strlen(basename);
46148
46149 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46150 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46151 index 9ccb19a..d131468 100644
46152 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
46153 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46154 @@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46155 struct file *file, void *fh, void *p);
46156 } u;
46157 void (*debug)(const void *arg, bool write_only);
46158 -};
46159 +} __do_const;
46160 +typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46161
46162 /* This control needs a priority check */
46163 #define INFO_FL_PRIO (1 << 0)
46164 @@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46165 struct video_device *vfd = video_devdata(file);
46166 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46167 bool write_only = false;
46168 - struct v4l2_ioctl_info default_info;
46169 + v4l2_ioctl_info_no_const default_info;
46170 const struct v4l2_ioctl_info *info;
46171 void *fh = file->private_data;
46172 struct v4l2_fh *vfh = NULL;
46173 @@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46174 ret = -EINVAL;
46175 break;
46176 }
46177 - *user_ptr = (void __user *)buf->m.planes;
46178 + *user_ptr = (void __force_user *)buf->m.planes;
46179 *kernel_ptr = (void **)&buf->m.planes;
46180 *array_size = sizeof(struct v4l2_plane) * buf->length;
46181 ret = 1;
46182 @@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46183 ret = -EINVAL;
46184 break;
46185 }
46186 - *user_ptr = (void __user *)edid->edid;
46187 + *user_ptr = (void __force_user *)edid->edid;
46188 *kernel_ptr = (void **)&edid->edid;
46189 *array_size = edid->blocks * 128;
46190 ret = 1;
46191 @@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46192 ret = -EINVAL;
46193 break;
46194 }
46195 - *user_ptr = (void __user *)ctrls->controls;
46196 + *user_ptr = (void __force_user *)ctrls->controls;
46197 *kernel_ptr = (void **)&ctrls->controls;
46198 *array_size = sizeof(struct v4l2_ext_control)
46199 * ctrls->count;
46200 @@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46201 }
46202
46203 if (has_array_args) {
46204 - *kernel_ptr = (void __force *)user_ptr;
46205 + *kernel_ptr = (void __force_kernel *)user_ptr;
46206 if (copy_to_user(user_ptr, mbuf, array_size))
46207 err = -EFAULT;
46208 goto out_array_args;
46209 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46210 index 187f836..679544b 100644
46211 --- a/drivers/message/fusion/mptbase.c
46212 +++ b/drivers/message/fusion/mptbase.c
46213 @@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46214 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46215 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46216
46217 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46218 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46219 +#else
46220 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46221 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46222 +#endif
46223 +
46224 /*
46225 * Rounding UP to nearest 4-kB boundary here...
46226 */
46227 @@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46228 ioc->facts.GlobalCredits);
46229
46230 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46231 +#ifdef CONFIG_GRKERNSEC_HIDESYM
46232 + NULL, NULL);
46233 +#else
46234 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46235 +#endif
46236 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46237 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46238 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46239 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46240 index 0707fa2..70ca794 100644
46241 --- a/drivers/message/fusion/mptsas.c
46242 +++ b/drivers/message/fusion/mptsas.c
46243 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46244 return 0;
46245 }
46246
46247 +static inline void
46248 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46249 +{
46250 + if (phy_info->port_details) {
46251 + phy_info->port_details->rphy = rphy;
46252 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46253 + ioc->name, rphy));
46254 + }
46255 +
46256 + if (rphy) {
46257 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46258 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46259 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46260 + ioc->name, rphy, rphy->dev.release));
46261 + }
46262 +}
46263 +
46264 /* no mutex */
46265 static void
46266 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46267 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46268 return NULL;
46269 }
46270
46271 -static inline void
46272 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46273 -{
46274 - if (phy_info->port_details) {
46275 - phy_info->port_details->rphy = rphy;
46276 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46277 - ioc->name, rphy));
46278 - }
46279 -
46280 - if (rphy) {
46281 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46282 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46283 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46284 - ioc->name, rphy, rphy->dev.release));
46285 - }
46286 -}
46287 -
46288 static inline struct sas_port *
46289 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46290 {
46291 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46292 index b7d87cd..3fb36da 100644
46293 --- a/drivers/message/i2o/i2o_proc.c
46294 +++ b/drivers/message/i2o/i2o_proc.c
46295 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46296 "Array Controller Device"
46297 };
46298
46299 -static char *chtostr(char *tmp, u8 *chars, int n)
46300 -{
46301 - tmp[0] = 0;
46302 - return strncat(tmp, (char *)chars, n);
46303 -}
46304 -
46305 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46306 char *group)
46307 {
46308 @@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46309 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46310 {
46311 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46312 - static u32 work32[5];
46313 - static u8 *work8 = (u8 *) work32;
46314 - static u16 *work16 = (u16 *) work32;
46315 + u32 work32[5];
46316 + u8 *work8 = (u8 *) work32;
46317 + u16 *work16 = (u16 *) work32;
46318 int token;
46319 u32 hwcap;
46320
46321 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46322 } *result;
46323
46324 i2o_exec_execute_ddm_table ddm_table;
46325 - char tmp[28 + 1];
46326
46327 result = kmalloc(sizeof(*result), GFP_KERNEL);
46328 if (!result)
46329 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46330
46331 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46332 seq_printf(seq, "%-#8x", ddm_table.module_id);
46333 - seq_printf(seq, "%-29s",
46334 - chtostr(tmp, ddm_table.module_name_version, 28));
46335 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46336 seq_printf(seq, "%9d ", ddm_table.data_size);
46337 seq_printf(seq, "%8d", ddm_table.code_size);
46338
46339 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46340
46341 i2o_driver_result_table *result;
46342 i2o_driver_store_table *dst;
46343 - char tmp[28 + 1];
46344
46345 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46346 if (result == NULL)
46347 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46348
46349 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46350 seq_printf(seq, "%-#8x", dst->module_id);
46351 - seq_printf(seq, "%-29s",
46352 - chtostr(tmp, dst->module_name_version, 28));
46353 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46354 + seq_printf(seq, "%-.28s", dst->module_name_version);
46355 + seq_printf(seq, "%-.8s", dst->date);
46356 seq_printf(seq, "%8d ", dst->module_size);
46357 seq_printf(seq, "%8d ", dst->mpb_size);
46358 seq_printf(seq, "0x%04x", dst->module_flags);
46359 @@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46360 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46361 {
46362 struct i2o_device *d = (struct i2o_device *)seq->private;
46363 - static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46364 + u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46365 // == (allow) 512d bytes (max)
46366 - static u16 *work16 = (u16 *) work32;
46367 + u16 *work16 = (u16 *) work32;
46368 int token;
46369 - char tmp[16 + 1];
46370
46371 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46372
46373 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46374 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46375 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46376 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46377 - seq_printf(seq, "Vendor info : %s\n",
46378 - chtostr(tmp, (u8 *) (work32 + 2), 16));
46379 - seq_printf(seq, "Product info : %s\n",
46380 - chtostr(tmp, (u8 *) (work32 + 6), 16));
46381 - seq_printf(seq, "Description : %s\n",
46382 - chtostr(tmp, (u8 *) (work32 + 10), 16));
46383 - seq_printf(seq, "Product rev. : %s\n",
46384 - chtostr(tmp, (u8 *) (work32 + 14), 8));
46385 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46386 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46387 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46388 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46389
46390 seq_printf(seq, "Serial number : ");
46391 print_serial_number(seq, (u8 *) (work32 + 16),
46392 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46393 u8 pad[256]; // allow up to 256 byte (max) serial number
46394 } result;
46395
46396 - char tmp[24 + 1];
46397 -
46398 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46399
46400 if (token < 0) {
46401 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46402 }
46403
46404 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46405 - seq_printf(seq, "Module name : %s\n",
46406 - chtostr(tmp, result.module_name, 24));
46407 - seq_printf(seq, "Module revision : %s\n",
46408 - chtostr(tmp, result.module_rev, 8));
46409 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
46410 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46411
46412 seq_printf(seq, "Serial number : ");
46413 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46414 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46415 u8 instance_number[4];
46416 } result;
46417
46418 - char tmp[64 + 1];
46419 -
46420 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46421
46422 if (token < 0) {
46423 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46424 return 0;
46425 }
46426
46427 - seq_printf(seq, "Device name : %s\n",
46428 - chtostr(tmp, result.device_name, 64));
46429 - seq_printf(seq, "Service name : %s\n",
46430 - chtostr(tmp, result.service_name, 64));
46431 - seq_printf(seq, "Physical name : %s\n",
46432 - chtostr(tmp, result.physical_location, 64));
46433 - seq_printf(seq, "Instance number : %s\n",
46434 - chtostr(tmp, result.instance_number, 4));
46435 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
46436 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
46437 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46438 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46439
46440 return 0;
46441 }
46442 @@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46443 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46444 {
46445 struct i2o_device *d = (struct i2o_device *)seq->private;
46446 - static u32 work32[12];
46447 - static u16 *work16 = (u16 *) work32;
46448 - static u8 *work8 = (u8 *) work32;
46449 + u32 work32[12];
46450 + u16 *work16 = (u16 *) work32;
46451 + u8 *work8 = (u8 *) work32;
46452 int token;
46453
46454 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46455 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46456 index 92752fb..a7494f6 100644
46457 --- a/drivers/message/i2o/iop.c
46458 +++ b/drivers/message/i2o/iop.c
46459 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46460
46461 spin_lock_irqsave(&c->context_list_lock, flags);
46462
46463 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46464 - atomic_inc(&c->context_list_counter);
46465 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46466 + atomic_inc_unchecked(&c->context_list_counter);
46467
46468 - entry->context = atomic_read(&c->context_list_counter);
46469 + entry->context = atomic_read_unchecked(&c->context_list_counter);
46470
46471 list_add(&entry->list, &c->context_list);
46472
46473 @@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46474
46475 #if BITS_PER_LONG == 64
46476 spin_lock_init(&c->context_list_lock);
46477 - atomic_set(&c->context_list_counter, 0);
46478 + atomic_set_unchecked(&c->context_list_counter, 0);
46479 INIT_LIST_HEAD(&c->context_list);
46480 #endif
46481
46482 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46483 index b2c7e3b..85aa4764 100644
46484 --- a/drivers/mfd/ab8500-debugfs.c
46485 +++ b/drivers/mfd/ab8500-debugfs.c
46486 @@ -100,7 +100,7 @@ static int irq_last;
46487 static u32 *irq_count;
46488 static int num_irqs;
46489
46490 -static struct device_attribute **dev_attr;
46491 +static device_attribute_no_const **dev_attr;
46492 static char **event_name;
46493
46494 static u8 avg_sample = SAMPLE_16;
46495 diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46496 index c880c89..45a7c68 100644
46497 --- a/drivers/mfd/max8925-i2c.c
46498 +++ b/drivers/mfd/max8925-i2c.c
46499 @@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46500 const struct i2c_device_id *id)
46501 {
46502 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46503 - static struct max8925_chip *chip;
46504 + struct max8925_chip *chip;
46505 struct device_node *node = client->dev.of_node;
46506
46507 if (node && !pdata) {
46508 diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46509 index 7612d89..70549c2 100644
46510 --- a/drivers/mfd/tps65910.c
46511 +++ b/drivers/mfd/tps65910.c
46512 @@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46513 struct tps65910_platform_data *pdata)
46514 {
46515 int ret = 0;
46516 - static struct regmap_irq_chip *tps6591x_irqs_chip;
46517 + struct regmap_irq_chip *tps6591x_irqs_chip;
46518
46519 if (!irq) {
46520 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46521 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46522 index 1b772ef..01e77d33 100644
46523 --- a/drivers/mfd/twl4030-irq.c
46524 +++ b/drivers/mfd/twl4030-irq.c
46525 @@ -34,6 +34,7 @@
46526 #include <linux/of.h>
46527 #include <linux/irqdomain.h>
46528 #include <linux/i2c/twl.h>
46529 +#include <asm/pgtable.h>
46530
46531 #include "twl-core.h"
46532
46533 @@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46534 * Install an irq handler for each of the SIH modules;
46535 * clone dummy irq_chip since PIH can't *do* anything
46536 */
46537 - twl4030_irq_chip = dummy_irq_chip;
46538 - twl4030_irq_chip.name = "twl4030";
46539 + pax_open_kernel();
46540 + memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46541 + *(const char **)&twl4030_irq_chip.name = "twl4030";
46542
46543 - twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46544 + *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46545 + pax_close_kernel();
46546
46547 for (i = irq_base; i < irq_end; i++) {
46548 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46549 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46550 index 464419b..64bae8d 100644
46551 --- a/drivers/misc/c2port/core.c
46552 +++ b/drivers/misc/c2port/core.c
46553 @@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46554 goto error_idr_alloc;
46555 c2dev->id = ret;
46556
46557 - bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46558 + pax_open_kernel();
46559 + *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46560 + pax_close_kernel();
46561
46562 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46563 "c2port%d", c2dev->id);
46564 diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46565 index 3f2b625..945e179 100644
46566 --- a/drivers/misc/eeprom/sunxi_sid.c
46567 +++ b/drivers/misc/eeprom/sunxi_sid.c
46568 @@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46569
46570 platform_set_drvdata(pdev, sid_data);
46571
46572 - sid_bin_attr.size = sid_data->keysize;
46573 + pax_open_kernel();
46574 + *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46575 + pax_close_kernel();
46576 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46577 return -ENODEV;
46578
46579 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46580 index 36f5d52..32311c3 100644
46581 --- a/drivers/misc/kgdbts.c
46582 +++ b/drivers/misc/kgdbts.c
46583 @@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46584 char before[BREAK_INSTR_SIZE];
46585 char after[BREAK_INSTR_SIZE];
46586
46587 - probe_kernel_read(before, (char *)kgdbts_break_test,
46588 + probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46589 BREAK_INSTR_SIZE);
46590 init_simple_test();
46591 ts.tst = plant_and_detach_test;
46592 @@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46593 /* Activate test with initial breakpoint */
46594 if (!is_early)
46595 kgdb_breakpoint();
46596 - probe_kernel_read(after, (char *)kgdbts_break_test,
46597 + probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46598 BREAK_INSTR_SIZE);
46599 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46600 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46601 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46602 index 3ef4627..8d00486 100644
46603 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
46604 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46605 @@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46606 * the lid is closed. This leads to interrupts as soon as a little move
46607 * is done.
46608 */
46609 - atomic_inc(&lis3->count);
46610 + atomic_inc_unchecked(&lis3->count);
46611
46612 wake_up_interruptible(&lis3->misc_wait);
46613 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46614 @@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46615 if (lis3->pm_dev)
46616 pm_runtime_get_sync(lis3->pm_dev);
46617
46618 - atomic_set(&lis3->count, 0);
46619 + atomic_set_unchecked(&lis3->count, 0);
46620 return 0;
46621 }
46622
46623 @@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46624 add_wait_queue(&lis3->misc_wait, &wait);
46625 while (true) {
46626 set_current_state(TASK_INTERRUPTIBLE);
46627 - data = atomic_xchg(&lis3->count, 0);
46628 + data = atomic_xchg_unchecked(&lis3->count, 0);
46629 if (data)
46630 break;
46631
46632 @@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46633 struct lis3lv02d, miscdev);
46634
46635 poll_wait(file, &lis3->misc_wait, wait);
46636 - if (atomic_read(&lis3->count))
46637 + if (atomic_read_unchecked(&lis3->count))
46638 return POLLIN | POLLRDNORM;
46639 return 0;
46640 }
46641 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46642 index c439c82..1f20f57 100644
46643 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
46644 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46645 @@ -297,7 +297,7 @@ struct lis3lv02d {
46646 struct input_polled_dev *idev; /* input device */
46647 struct platform_device *pdev; /* platform device */
46648 struct regulator_bulk_data regulators[2];
46649 - atomic_t count; /* interrupt count after last read */
46650 + atomic_unchecked_t count; /* interrupt count after last read */
46651 union axis_conversion ac; /* hw -> logical axis */
46652 int mapped_btns[3];
46653
46654 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46655 index 2f30bad..c4c13d0 100644
46656 --- a/drivers/misc/sgi-gru/gruhandles.c
46657 +++ b/drivers/misc/sgi-gru/gruhandles.c
46658 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46659 unsigned long nsec;
46660
46661 nsec = CLKS2NSEC(clks);
46662 - atomic_long_inc(&mcs_op_statistics[op].count);
46663 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
46664 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46665 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46666 if (mcs_op_statistics[op].max < nsec)
46667 mcs_op_statistics[op].max = nsec;
46668 }
46669 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46670 index 4f76359..cdfcb2e 100644
46671 --- a/drivers/misc/sgi-gru/gruprocfs.c
46672 +++ b/drivers/misc/sgi-gru/gruprocfs.c
46673 @@ -32,9 +32,9 @@
46674
46675 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46676
46677 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46678 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46679 {
46680 - unsigned long val = atomic_long_read(v);
46681 + unsigned long val = atomic_long_read_unchecked(v);
46682
46683 seq_printf(s, "%16lu %s\n", val, id);
46684 }
46685 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46686
46687 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46688 for (op = 0; op < mcsop_last; op++) {
46689 - count = atomic_long_read(&mcs_op_statistics[op].count);
46690 - total = atomic_long_read(&mcs_op_statistics[op].total);
46691 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46692 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46693 max = mcs_op_statistics[op].max;
46694 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46695 count ? total / count : 0, max);
46696 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46697 index 5c3ce24..4915ccb 100644
46698 --- a/drivers/misc/sgi-gru/grutables.h
46699 +++ b/drivers/misc/sgi-gru/grutables.h
46700 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46701 * GRU statistics.
46702 */
46703 struct gru_stats_s {
46704 - atomic_long_t vdata_alloc;
46705 - atomic_long_t vdata_free;
46706 - atomic_long_t gts_alloc;
46707 - atomic_long_t gts_free;
46708 - atomic_long_t gms_alloc;
46709 - atomic_long_t gms_free;
46710 - atomic_long_t gts_double_allocate;
46711 - atomic_long_t assign_context;
46712 - atomic_long_t assign_context_failed;
46713 - atomic_long_t free_context;
46714 - atomic_long_t load_user_context;
46715 - atomic_long_t load_kernel_context;
46716 - atomic_long_t lock_kernel_context;
46717 - atomic_long_t unlock_kernel_context;
46718 - atomic_long_t steal_user_context;
46719 - atomic_long_t steal_kernel_context;
46720 - atomic_long_t steal_context_failed;
46721 - atomic_long_t nopfn;
46722 - atomic_long_t asid_new;
46723 - atomic_long_t asid_next;
46724 - atomic_long_t asid_wrap;
46725 - atomic_long_t asid_reuse;
46726 - atomic_long_t intr;
46727 - atomic_long_t intr_cbr;
46728 - atomic_long_t intr_tfh;
46729 - atomic_long_t intr_spurious;
46730 - atomic_long_t intr_mm_lock_failed;
46731 - atomic_long_t call_os;
46732 - atomic_long_t call_os_wait_queue;
46733 - atomic_long_t user_flush_tlb;
46734 - atomic_long_t user_unload_context;
46735 - atomic_long_t user_exception;
46736 - atomic_long_t set_context_option;
46737 - atomic_long_t check_context_retarget_intr;
46738 - atomic_long_t check_context_unload;
46739 - atomic_long_t tlb_dropin;
46740 - atomic_long_t tlb_preload_page;
46741 - atomic_long_t tlb_dropin_fail_no_asid;
46742 - atomic_long_t tlb_dropin_fail_upm;
46743 - atomic_long_t tlb_dropin_fail_invalid;
46744 - atomic_long_t tlb_dropin_fail_range_active;
46745 - atomic_long_t tlb_dropin_fail_idle;
46746 - atomic_long_t tlb_dropin_fail_fmm;
46747 - atomic_long_t tlb_dropin_fail_no_exception;
46748 - atomic_long_t tfh_stale_on_fault;
46749 - atomic_long_t mmu_invalidate_range;
46750 - atomic_long_t mmu_invalidate_page;
46751 - atomic_long_t flush_tlb;
46752 - atomic_long_t flush_tlb_gru;
46753 - atomic_long_t flush_tlb_gru_tgh;
46754 - atomic_long_t flush_tlb_gru_zero_asid;
46755 + atomic_long_unchecked_t vdata_alloc;
46756 + atomic_long_unchecked_t vdata_free;
46757 + atomic_long_unchecked_t gts_alloc;
46758 + atomic_long_unchecked_t gts_free;
46759 + atomic_long_unchecked_t gms_alloc;
46760 + atomic_long_unchecked_t gms_free;
46761 + atomic_long_unchecked_t gts_double_allocate;
46762 + atomic_long_unchecked_t assign_context;
46763 + atomic_long_unchecked_t assign_context_failed;
46764 + atomic_long_unchecked_t free_context;
46765 + atomic_long_unchecked_t load_user_context;
46766 + atomic_long_unchecked_t load_kernel_context;
46767 + atomic_long_unchecked_t lock_kernel_context;
46768 + atomic_long_unchecked_t unlock_kernel_context;
46769 + atomic_long_unchecked_t steal_user_context;
46770 + atomic_long_unchecked_t steal_kernel_context;
46771 + atomic_long_unchecked_t steal_context_failed;
46772 + atomic_long_unchecked_t nopfn;
46773 + atomic_long_unchecked_t asid_new;
46774 + atomic_long_unchecked_t asid_next;
46775 + atomic_long_unchecked_t asid_wrap;
46776 + atomic_long_unchecked_t asid_reuse;
46777 + atomic_long_unchecked_t intr;
46778 + atomic_long_unchecked_t intr_cbr;
46779 + atomic_long_unchecked_t intr_tfh;
46780 + atomic_long_unchecked_t intr_spurious;
46781 + atomic_long_unchecked_t intr_mm_lock_failed;
46782 + atomic_long_unchecked_t call_os;
46783 + atomic_long_unchecked_t call_os_wait_queue;
46784 + atomic_long_unchecked_t user_flush_tlb;
46785 + atomic_long_unchecked_t user_unload_context;
46786 + atomic_long_unchecked_t user_exception;
46787 + atomic_long_unchecked_t set_context_option;
46788 + atomic_long_unchecked_t check_context_retarget_intr;
46789 + atomic_long_unchecked_t check_context_unload;
46790 + atomic_long_unchecked_t tlb_dropin;
46791 + atomic_long_unchecked_t tlb_preload_page;
46792 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46793 + atomic_long_unchecked_t tlb_dropin_fail_upm;
46794 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
46795 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
46796 + atomic_long_unchecked_t tlb_dropin_fail_idle;
46797 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
46798 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46799 + atomic_long_unchecked_t tfh_stale_on_fault;
46800 + atomic_long_unchecked_t mmu_invalidate_range;
46801 + atomic_long_unchecked_t mmu_invalidate_page;
46802 + atomic_long_unchecked_t flush_tlb;
46803 + atomic_long_unchecked_t flush_tlb_gru;
46804 + atomic_long_unchecked_t flush_tlb_gru_tgh;
46805 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46806
46807 - atomic_long_t copy_gpa;
46808 - atomic_long_t read_gpa;
46809 + atomic_long_unchecked_t copy_gpa;
46810 + atomic_long_unchecked_t read_gpa;
46811
46812 - atomic_long_t mesq_receive;
46813 - atomic_long_t mesq_receive_none;
46814 - atomic_long_t mesq_send;
46815 - atomic_long_t mesq_send_failed;
46816 - atomic_long_t mesq_noop;
46817 - atomic_long_t mesq_send_unexpected_error;
46818 - atomic_long_t mesq_send_lb_overflow;
46819 - atomic_long_t mesq_send_qlimit_reached;
46820 - atomic_long_t mesq_send_amo_nacked;
46821 - atomic_long_t mesq_send_put_nacked;
46822 - atomic_long_t mesq_page_overflow;
46823 - atomic_long_t mesq_qf_locked;
46824 - atomic_long_t mesq_qf_noop_not_full;
46825 - atomic_long_t mesq_qf_switch_head_failed;
46826 - atomic_long_t mesq_qf_unexpected_error;
46827 - atomic_long_t mesq_noop_unexpected_error;
46828 - atomic_long_t mesq_noop_lb_overflow;
46829 - atomic_long_t mesq_noop_qlimit_reached;
46830 - atomic_long_t mesq_noop_amo_nacked;
46831 - atomic_long_t mesq_noop_put_nacked;
46832 - atomic_long_t mesq_noop_page_overflow;
46833 + atomic_long_unchecked_t mesq_receive;
46834 + atomic_long_unchecked_t mesq_receive_none;
46835 + atomic_long_unchecked_t mesq_send;
46836 + atomic_long_unchecked_t mesq_send_failed;
46837 + atomic_long_unchecked_t mesq_noop;
46838 + atomic_long_unchecked_t mesq_send_unexpected_error;
46839 + atomic_long_unchecked_t mesq_send_lb_overflow;
46840 + atomic_long_unchecked_t mesq_send_qlimit_reached;
46841 + atomic_long_unchecked_t mesq_send_amo_nacked;
46842 + atomic_long_unchecked_t mesq_send_put_nacked;
46843 + atomic_long_unchecked_t mesq_page_overflow;
46844 + atomic_long_unchecked_t mesq_qf_locked;
46845 + atomic_long_unchecked_t mesq_qf_noop_not_full;
46846 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
46847 + atomic_long_unchecked_t mesq_qf_unexpected_error;
46848 + atomic_long_unchecked_t mesq_noop_unexpected_error;
46849 + atomic_long_unchecked_t mesq_noop_lb_overflow;
46850 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
46851 + atomic_long_unchecked_t mesq_noop_amo_nacked;
46852 + atomic_long_unchecked_t mesq_noop_put_nacked;
46853 + atomic_long_unchecked_t mesq_noop_page_overflow;
46854
46855 };
46856
46857 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46858 tghop_invalidate, mcsop_last};
46859
46860 struct mcs_op_statistic {
46861 - atomic_long_t count;
46862 - atomic_long_t total;
46863 + atomic_long_unchecked_t count;
46864 + atomic_long_unchecked_t total;
46865 unsigned long max;
46866 };
46867
46868 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46869
46870 #define STAT(id) do { \
46871 if (gru_options & OPT_STATS) \
46872 - atomic_long_inc(&gru_stats.id); \
46873 + atomic_long_inc_unchecked(&gru_stats.id); \
46874 } while (0)
46875
46876 #ifdef CONFIG_SGI_GRU_DEBUG
46877 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46878 index c862cd4..0d176fe 100644
46879 --- a/drivers/misc/sgi-xp/xp.h
46880 +++ b/drivers/misc/sgi-xp/xp.h
46881 @@ -288,7 +288,7 @@ struct xpc_interface {
46882 xpc_notify_func, void *);
46883 void (*received) (short, int, void *);
46884 enum xp_retval (*partid_to_nasids) (short, void *);
46885 -};
46886 +} __no_const;
46887
46888 extern struct xpc_interface xpc_interface;
46889
46890 diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46891 index 01be66d..e3a0c7e 100644
46892 --- a/drivers/misc/sgi-xp/xp_main.c
46893 +++ b/drivers/misc/sgi-xp/xp_main.c
46894 @@ -78,13 +78,13 @@ xpc_notloaded(void)
46895 }
46896
46897 struct xpc_interface xpc_interface = {
46898 - (void (*)(int))xpc_notloaded,
46899 - (void (*)(int))xpc_notloaded,
46900 - (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46901 - (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46902 + .connect = (void (*)(int))xpc_notloaded,
46903 + .disconnect = (void (*)(int))xpc_notloaded,
46904 + .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46905 + .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46906 void *))xpc_notloaded,
46907 - (void (*)(short, int, void *))xpc_notloaded,
46908 - (enum xp_retval(*)(short, void *))xpc_notloaded
46909 + .received = (void (*)(short, int, void *))xpc_notloaded,
46910 + .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46911 };
46912 EXPORT_SYMBOL_GPL(xpc_interface);
46913
46914 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46915 index b94d5f7..7f494c5 100644
46916 --- a/drivers/misc/sgi-xp/xpc.h
46917 +++ b/drivers/misc/sgi-xp/xpc.h
46918 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
46919 void (*received_payload) (struct xpc_channel *, void *);
46920 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46921 };
46922 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46923
46924 /* struct xpc_partition act_state values (for XPC HB) */
46925
46926 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46927 /* found in xpc_main.c */
46928 extern struct device *xpc_part;
46929 extern struct device *xpc_chan;
46930 -extern struct xpc_arch_operations xpc_arch_ops;
46931 +extern xpc_arch_operations_no_const xpc_arch_ops;
46932 extern int xpc_disengage_timelimit;
46933 extern int xpc_disengage_timedout;
46934 extern int xpc_activate_IRQ_rcvd;
46935 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46936 index 82dc574..8539ab2 100644
46937 --- a/drivers/misc/sgi-xp/xpc_main.c
46938 +++ b/drivers/misc/sgi-xp/xpc_main.c
46939 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46940 .notifier_call = xpc_system_die,
46941 };
46942
46943 -struct xpc_arch_operations xpc_arch_ops;
46944 +xpc_arch_operations_no_const xpc_arch_ops;
46945
46946 /*
46947 * Timer function to enforce the timelimit on the partition disengage.
46948 @@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46949
46950 if (((die_args->trapnr == X86_TRAP_MF) ||
46951 (die_args->trapnr == X86_TRAP_XF)) &&
46952 - !user_mode_vm(die_args->regs))
46953 + !user_mode(die_args->regs))
46954 xpc_die_deactivate();
46955
46956 break;
46957 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46958 index a11451f..9e1bbad 100644
46959 --- a/drivers/mmc/card/block.c
46960 +++ b/drivers/mmc/card/block.c
46961 @@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46962 if (idata->ic.postsleep_min_us)
46963 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46964
46965 - if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46966 + if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46967 err = -EFAULT;
46968 goto cmd_rel_host;
46969 }
46970 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46971 index 7911e05..d0f9dda 100644
46972 --- a/drivers/mmc/core/mmc_ops.c
46973 +++ b/drivers/mmc/core/mmc_ops.c
46974 @@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46975 void *data_buf;
46976 int is_on_stack;
46977
46978 - is_on_stack = object_is_on_stack(buf);
46979 + is_on_stack = object_starts_on_stack(buf);
46980 if (is_on_stack) {
46981 /*
46982 * dma onto stack is unsafe/nonportable, but callers to this
46983 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46984 index 01b99e8..5c325e3 100644
46985 --- a/drivers/mmc/host/dw_mmc.h
46986 +++ b/drivers/mmc/host/dw_mmc.h
46987 @@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46988 int (*parse_dt)(struct dw_mci *host);
46989 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46990 struct dw_mci_tuning_data *tuning_data);
46991 -};
46992 +} __do_const;
46993 #endif /* _DW_MMC_H_ */
46994 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46995 index 43af791..86f4c48 100644
46996 --- a/drivers/mmc/host/mmci.c
46997 +++ b/drivers/mmc/host/mmci.c
46998 @@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
46999 mmc->caps |= MMC_CAP_CMD23;
47000
47001 if (variant->busy_detect) {
47002 - mmci_ops.card_busy = mmci_card_busy;
47003 + pax_open_kernel();
47004 + *(void **)&mmci_ops.card_busy = mmci_card_busy;
47005 + pax_close_kernel();
47006 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47007 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47008 mmc->max_busy_timeout = 0;
47009 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47010 index 9c2b9cb..cebb09a 100644
47011 --- a/drivers/mmc/host/omap_hsmmc.c
47012 +++ b/drivers/mmc/host/omap_hsmmc.c
47013 @@ -2113,7 +2113,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47014
47015 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47016 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47017 - omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47018 + pax_open_kernel();
47019 + *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47020 + pax_close_kernel();
47021 }
47022
47023 pm_runtime_enable(host->dev);
47024 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47025 index 587ee0e..b3bbcab 100644
47026 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
47027 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47028 @@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47029 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47030 }
47031
47032 - if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47033 - sdhci_esdhc_ops.platform_execute_tuning =
47034 + if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47035 + pax_open_kernel();
47036 + *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47037 esdhc_executing_tuning;
47038 + pax_close_kernel();
47039 + }
47040
47041 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47042 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47043 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47044 index 0ce6eb1..8dcce1b 100644
47045 --- a/drivers/mmc/host/sdhci-s3c.c
47046 +++ b/drivers/mmc/host/sdhci-s3c.c
47047 @@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47048 * we can use overriding functions instead of default.
47049 */
47050 if (sc->no_divider) {
47051 - sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47052 - sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47053 - sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47054 + pax_open_kernel();
47055 + *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47056 + *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47057 + *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47058 + pax_close_kernel();
47059 }
47060
47061 /* It supports additional host capabilities if needed */
47062 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47063 index 423666b..81ff5eb 100644
47064 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
47065 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47066 @@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47067 size_t totlen = 0, thislen;
47068 int ret = 0;
47069 size_t buflen = 0;
47070 - static char *buffer;
47071 + char *buffer;
47072
47073 if (!ECCBUF_SIZE) {
47074 /* We should fall back to a general writev implementation.
47075 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47076 index b3b7ca1..5dd4634 100644
47077 --- a/drivers/mtd/nand/denali.c
47078 +++ b/drivers/mtd/nand/denali.c
47079 @@ -24,6 +24,7 @@
47080 #include <linux/slab.h>
47081 #include <linux/mtd/mtd.h>
47082 #include <linux/module.h>
47083 +#include <linux/slab.h>
47084
47085 #include "denali.h"
47086
47087 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47088 index 959cb9b..8520fe5 100644
47089 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47090 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47091 @@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47092
47093 /* first try to map the upper buffer directly */
47094 if (virt_addr_valid(this->upper_buf) &&
47095 - !object_is_on_stack(this->upper_buf)) {
47096 + !object_starts_on_stack(this->upper_buf)) {
47097 sg_init_one(sgl, this->upper_buf, this->upper_len);
47098 ret = dma_map_sg(this->dev, sgl, 1, dr);
47099 if (ret == 0)
47100 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47101 index 51b9d6a..52af9a7 100644
47102 --- a/drivers/mtd/nftlmount.c
47103 +++ b/drivers/mtd/nftlmount.c
47104 @@ -24,6 +24,7 @@
47105 #include <asm/errno.h>
47106 #include <linux/delay.h>
47107 #include <linux/slab.h>
47108 +#include <linux/sched.h>
47109 #include <linux/mtd/mtd.h>
47110 #include <linux/mtd/nand.h>
47111 #include <linux/mtd/nftl.h>
47112 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47113 index c23184a..4115c41 100644
47114 --- a/drivers/mtd/sm_ftl.c
47115 +++ b/drivers/mtd/sm_ftl.c
47116 @@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47117 #define SM_CIS_VENDOR_OFFSET 0x59
47118 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47119 {
47120 - struct attribute_group *attr_group;
47121 + attribute_group_no_const *attr_group;
47122 struct attribute **attributes;
47123 struct sm_sysfs_attribute *vendor_attribute;
47124 char *vendor;
47125 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47126 index a5115fb..81b03f6 100644
47127 --- a/drivers/net/bonding/bond_main.c
47128 +++ b/drivers/net/bonding/bond_main.c
47129 @@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47130 bond_dev_queue_xmit(bond, skb, slave->dev);
47131 } else {
47132 dev_kfree_skb_any(skb);
47133 - atomic_long_inc(&dev->tx_dropped);
47134 + atomic_long_inc_unchecked(&dev->tx_dropped);
47135 }
47136
47137 return NETDEV_TX_OK;
47138 diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47139 index 45f09a6..f154f8d 100644
47140 --- a/drivers/net/bonding/bond_netlink.c
47141 +++ b/drivers/net/bonding/bond_netlink.c
47142 @@ -585,7 +585,7 @@ nla_put_failure:
47143 return -EMSGSIZE;
47144 }
47145
47146 -struct rtnl_link_ops bond_link_ops __read_mostly = {
47147 +struct rtnl_link_ops bond_link_ops = {
47148 .kind = "bond",
47149 .priv_size = sizeof(struct bonding),
47150 .setup = bond_setup,
47151 diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47152 index 5e40a8b..126bfda 100644
47153 --- a/drivers/net/caif/caif_hsi.c
47154 +++ b/drivers/net/caif/caif_hsi.c
47155 @@ -1445,7 +1445,7 @@ err:
47156 return -ENODEV;
47157 }
47158
47159 -static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47160 +static struct rtnl_link_ops caif_hsi_link_ops = {
47161 .kind = "cfhsi",
47162 .priv_size = sizeof(struct cfhsi),
47163 .setup = cfhsi_setup,
47164 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47165 index 98d73aa..63ef9da 100644
47166 --- a/drivers/net/can/Kconfig
47167 +++ b/drivers/net/can/Kconfig
47168 @@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47169
47170 config CAN_FLEXCAN
47171 tristate "Support for Freescale FLEXCAN based chips"
47172 - depends on ARM || PPC
47173 + depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47174 ---help---
47175 Say Y here if you want to support for Freescale FlexCAN.
47176
47177 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47178 index 2cfe501..477d4b5 100644
47179 --- a/drivers/net/can/dev.c
47180 +++ b/drivers/net/can/dev.c
47181 @@ -868,7 +868,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47182 return -EOPNOTSUPP;
47183 }
47184
47185 -static struct rtnl_link_ops can_link_ops __read_mostly = {
47186 +static struct rtnl_link_ops can_link_ops = {
47187 .kind = "can",
47188 .maxtype = IFLA_CAN_MAX,
47189 .policy = can_policy,
47190 diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47191 index 4e94057..32032ff 100644
47192 --- a/drivers/net/can/vcan.c
47193 +++ b/drivers/net/can/vcan.c
47194 @@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47195 dev->destructor = free_netdev;
47196 }
47197
47198 -static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47199 +static struct rtnl_link_ops vcan_link_ops = {
47200 .kind = "vcan",
47201 .setup = vcan_setup,
47202 };
47203 diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47204 index ff435fb..d408b1f 100644
47205 --- a/drivers/net/dummy.c
47206 +++ b/drivers/net/dummy.c
47207 @@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47208 return 0;
47209 }
47210
47211 -static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47212 +static struct rtnl_link_ops dummy_link_ops = {
47213 .kind = "dummy",
47214 .setup = dummy_setup,
47215 .validate = dummy_validate,
47216 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47217 index 1d162cc..b546a75 100644
47218 --- a/drivers/net/ethernet/8390/ax88796.c
47219 +++ b/drivers/net/ethernet/8390/ax88796.c
47220 @@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47221 if (ax->plat->reg_offsets)
47222 ei_local->reg_offset = ax->plat->reg_offsets;
47223 else {
47224 + resource_size_t _mem_size = mem_size;
47225 + do_div(_mem_size, 0x18);
47226 ei_local->reg_offset = ax->reg_offsets;
47227 for (ret = 0; ret < 0x18; ret++)
47228 - ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47229 + ax->reg_offsets[ret] = _mem_size * ret;
47230 }
47231
47232 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47233 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47234 index 4efc435..4ab9e14 100644
47235 --- a/drivers/net/ethernet/altera/altera_tse_main.c
47236 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
47237 @@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47238 return 0;
47239 }
47240
47241 -static struct net_device_ops altera_tse_netdev_ops = {
47242 +static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47243 .ndo_open = tse_open,
47244 .ndo_stop = tse_shutdown,
47245 .ndo_start_xmit = tse_start_xmit,
47246 @@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47247 ndev->netdev_ops = &altera_tse_netdev_ops;
47248 altera_tse_set_ethtool_ops(ndev);
47249
47250 + pax_open_kernel();
47251 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47252
47253 if (priv->hash_filter)
47254 altera_tse_netdev_ops.ndo_set_rx_mode =
47255 tse_set_rx_mode_hashfilter;
47256 + pax_close_kernel();
47257
47258 /* Scatter/gather IO is not supported,
47259 * so it is turned off
47260 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47261 index caade30..3e257d9 100644
47262 --- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47263 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47264 @@ -1072,14 +1072,14 @@ do { \
47265 * operations, everything works on mask values.
47266 */
47267 #define XMDIO_READ(_pdata, _mmd, _reg) \
47268 - ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47269 + ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47270 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47271
47272 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47273 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47274
47275 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47276 - ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47277 + ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47278 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47279
47280 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47281 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47282 index 8a50b01..39c1ad0 100644
47283 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47284 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47285 @@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47286
47287 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47288
47289 - pdata->hw_if.config_dcb_tc(pdata);
47290 + pdata->hw_if->config_dcb_tc(pdata);
47291
47292 return 0;
47293 }
47294 @@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47295
47296 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47297
47298 - pdata->hw_if.config_dcb_pfc(pdata);
47299 + pdata->hw_if->config_dcb_pfc(pdata);
47300
47301 return 0;
47302 }
47303 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47304 index 6fc5da0..61ac2cb 100644
47305 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47306 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47307 @@ -235,7 +235,7 @@ err_ring:
47308
47309 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47310 {
47311 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47312 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47313 struct xgbe_channel *channel;
47314 struct xgbe_ring *ring;
47315 struct xgbe_ring_data *rdata;
47316 @@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47317
47318 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47319 {
47320 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47321 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47322 struct xgbe_channel *channel;
47323 struct xgbe_ring *ring;
47324 struct xgbe_ring_desc *rdesc;
47325 @@ -505,7 +505,7 @@ err_out:
47326 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47327 {
47328 struct xgbe_prv_data *pdata = channel->pdata;
47329 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47330 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47331 struct xgbe_ring *ring = channel->rx_ring;
47332 struct xgbe_ring_data *rdata;
47333 struct sk_buff *skb = NULL;
47334 @@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47335 DBGPR("<--xgbe_realloc_skb\n");
47336 }
47337
47338 -void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47339 -{
47340 - DBGPR("-->xgbe_init_function_ptrs_desc\n");
47341 -
47342 - desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47343 - desc_if->free_ring_resources = xgbe_free_ring_resources;
47344 - desc_if->map_tx_skb = xgbe_map_tx_skb;
47345 - desc_if->realloc_skb = xgbe_realloc_skb;
47346 - desc_if->unmap_skb = xgbe_unmap_skb;
47347 - desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47348 - desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47349 -
47350 - DBGPR("<--xgbe_init_function_ptrs_desc\n");
47351 -}
47352 +const struct xgbe_desc_if default_xgbe_desc_if = {
47353 + .alloc_ring_resources = xgbe_alloc_ring_resources,
47354 + .free_ring_resources = xgbe_free_ring_resources,
47355 + .map_tx_skb = xgbe_map_tx_skb,
47356 + .realloc_skb = xgbe_realloc_skb,
47357 + .unmap_skb = xgbe_unmap_skb,
47358 + .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47359 + .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47360 +};
47361 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47362 index 9da3a03..022f15c 100644
47363 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47364 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47365 @@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47366
47367 static int xgbe_init(struct xgbe_prv_data *pdata)
47368 {
47369 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47370 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47371 int ret;
47372
47373 DBGPR("-->xgbe_init\n");
47374 @@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47375 return 0;
47376 }
47377
47378 -void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47379 -{
47380 - DBGPR("-->xgbe_init_function_ptrs\n");
47381 -
47382 - hw_if->tx_complete = xgbe_tx_complete;
47383 -
47384 - hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47385 - hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47386 - hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47387 - hw_if->set_mac_address = xgbe_set_mac_address;
47388 -
47389 - hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47390 - hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47391 -
47392 - hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47393 - hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47394 - hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47395 - hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47396 - hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47397 -
47398 - hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47399 - hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47400 -
47401 - hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47402 - hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47403 - hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47404 -
47405 - hw_if->enable_tx = xgbe_enable_tx;
47406 - hw_if->disable_tx = xgbe_disable_tx;
47407 - hw_if->enable_rx = xgbe_enable_rx;
47408 - hw_if->disable_rx = xgbe_disable_rx;
47409 -
47410 - hw_if->powerup_tx = xgbe_powerup_tx;
47411 - hw_if->powerdown_tx = xgbe_powerdown_tx;
47412 - hw_if->powerup_rx = xgbe_powerup_rx;
47413 - hw_if->powerdown_rx = xgbe_powerdown_rx;
47414 -
47415 - hw_if->pre_xmit = xgbe_pre_xmit;
47416 - hw_if->dev_read = xgbe_dev_read;
47417 - hw_if->enable_int = xgbe_enable_int;
47418 - hw_if->disable_int = xgbe_disable_int;
47419 - hw_if->init = xgbe_init;
47420 - hw_if->exit = xgbe_exit;
47421 +const struct xgbe_hw_if default_xgbe_hw_if = {
47422 + .tx_complete = xgbe_tx_complete,
47423 +
47424 + .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47425 + .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47426 + .add_mac_addresses = xgbe_add_mac_addresses,
47427 + .set_mac_address = xgbe_set_mac_address,
47428 +
47429 + .enable_rx_csum = xgbe_enable_rx_csum,
47430 + .disable_rx_csum = xgbe_disable_rx_csum,
47431 +
47432 + .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47433 + .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47434 + .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47435 + .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47436 + .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47437 +
47438 + .read_mmd_regs = xgbe_read_mmd_regs,
47439 + .write_mmd_regs = xgbe_write_mmd_regs,
47440 +
47441 + .set_gmii_speed = xgbe_set_gmii_speed,
47442 + .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47443 + .set_xgmii_speed = xgbe_set_xgmii_speed,
47444 +
47445 + .enable_tx = xgbe_enable_tx,
47446 + .disable_tx = xgbe_disable_tx,
47447 + .enable_rx = xgbe_enable_rx,
47448 + .disable_rx = xgbe_disable_rx,
47449 +
47450 + .powerup_tx = xgbe_powerup_tx,
47451 + .powerdown_tx = xgbe_powerdown_tx,
47452 + .powerup_rx = xgbe_powerup_rx,
47453 + .powerdown_rx = xgbe_powerdown_rx,
47454 +
47455 + .pre_xmit = xgbe_pre_xmit,
47456 + .dev_read = xgbe_dev_read,
47457 + .enable_int = xgbe_enable_int,
47458 + .disable_int = xgbe_disable_int,
47459 + .init = xgbe_init,
47460 + .exit = xgbe_exit,
47461
47462 /* Descriptor related Sequences have to be initialized here */
47463 - hw_if->tx_desc_init = xgbe_tx_desc_init;
47464 - hw_if->rx_desc_init = xgbe_rx_desc_init;
47465 - hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47466 - hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47467 - hw_if->is_last_desc = xgbe_is_last_desc;
47468 - hw_if->is_context_desc = xgbe_is_context_desc;
47469 + .tx_desc_init = xgbe_tx_desc_init,
47470 + .rx_desc_init = xgbe_rx_desc_init,
47471 + .tx_desc_reset = xgbe_tx_desc_reset,
47472 + .rx_desc_reset = xgbe_rx_desc_reset,
47473 + .is_last_desc = xgbe_is_last_desc,
47474 + .is_context_desc = xgbe_is_context_desc,
47475
47476 /* For FLOW ctrl */
47477 - hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47478 - hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47479 + .config_tx_flow_control = xgbe_config_tx_flow_control,
47480 + .config_rx_flow_control = xgbe_config_rx_flow_control,
47481
47482 /* For RX coalescing */
47483 - hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47484 - hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47485 - hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47486 - hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47487 + .config_rx_coalesce = xgbe_config_rx_coalesce,
47488 + .config_tx_coalesce = xgbe_config_tx_coalesce,
47489 + .usec_to_riwt = xgbe_usec_to_riwt,
47490 + .riwt_to_usec = xgbe_riwt_to_usec,
47491
47492 /* For RX and TX threshold config */
47493 - hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47494 - hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47495 + .config_rx_threshold = xgbe_config_rx_threshold,
47496 + .config_tx_threshold = xgbe_config_tx_threshold,
47497
47498 /* For RX and TX Store and Forward Mode config */
47499 - hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47500 - hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47501 + .config_rsf_mode = xgbe_config_rsf_mode,
47502 + .config_tsf_mode = xgbe_config_tsf_mode,
47503
47504 /* For TX DMA Operating on Second Frame config */
47505 - hw_if->config_osp_mode = xgbe_config_osp_mode;
47506 + .config_osp_mode = xgbe_config_osp_mode,
47507
47508 /* For RX and TX PBL config */
47509 - hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47510 - hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47511 - hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47512 - hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47513 - hw_if->config_pblx8 = xgbe_config_pblx8;
47514 + .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47515 + .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47516 + .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47517 + .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47518 + .config_pblx8 = xgbe_config_pblx8,
47519
47520 /* For MMC statistics support */
47521 - hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47522 - hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47523 - hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47524 + .tx_mmc_int = xgbe_tx_mmc_int,
47525 + .rx_mmc_int = xgbe_rx_mmc_int,
47526 + .read_mmc_stats = xgbe_read_mmc_stats,
47527
47528 /* For PTP config */
47529 - hw_if->config_tstamp = xgbe_config_tstamp;
47530 - hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47531 - hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47532 - hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47533 - hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47534 + .config_tstamp = xgbe_config_tstamp,
47535 + .update_tstamp_addend = xgbe_update_tstamp_addend,
47536 + .set_tstamp_time = xgbe_set_tstamp_time,
47537 + .get_tstamp_time = xgbe_get_tstamp_time,
47538 + .get_tx_tstamp = xgbe_get_tx_tstamp,
47539
47540 /* For Data Center Bridging config */
47541 - hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47542 - hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47543 -
47544 - DBGPR("<--xgbe_init_function_ptrs\n");
47545 -}
47546 + .config_dcb_tc = xgbe_config_dcb_tc,
47547 + .config_dcb_pfc = xgbe_config_dcb_pfc,
47548 +};
47549 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47550 index 2349ea9..a83a677 100644
47551 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47552 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47553 @@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47554
47555 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47556 {
47557 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47558 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47559 struct xgbe_channel *channel;
47560 enum xgbe_int int_id;
47561 unsigned int i;
47562 @@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47563
47564 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47565 {
47566 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47567 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47568 struct xgbe_channel *channel;
47569 enum xgbe_int int_id;
47570 unsigned int i;
47571 @@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47572 static irqreturn_t xgbe_isr(int irq, void *data)
47573 {
47574 struct xgbe_prv_data *pdata = data;
47575 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47576 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47577 struct xgbe_channel *channel;
47578 unsigned int dma_isr, dma_ch_isr;
47579 unsigned int mac_isr, mac_tssr;
47580 @@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47581
47582 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47583 {
47584 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47585 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47586
47587 DBGPR("-->xgbe_init_tx_coalesce\n");
47588
47589 @@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47590
47591 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47592 {
47593 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47594 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47595
47596 DBGPR("-->xgbe_init_rx_coalesce\n");
47597
47598 @@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47599
47600 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47601 {
47602 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47603 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47604 struct xgbe_channel *channel;
47605 struct xgbe_ring *ring;
47606 struct xgbe_ring_data *rdata;
47607 @@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47608
47609 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47610 {
47611 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47612 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47613 struct xgbe_channel *channel;
47614 struct xgbe_ring *ring;
47615 struct xgbe_ring_data *rdata;
47616 @@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47617 static void xgbe_adjust_link(struct net_device *netdev)
47618 {
47619 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47620 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47621 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47622 struct phy_device *phydev = pdata->phydev;
47623 int new_state = 0;
47624
47625 @@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47626 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47627 {
47628 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47629 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47630 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47631 unsigned long flags;
47632
47633 DBGPR("-->xgbe_powerdown\n");
47634 @@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47635 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47636 {
47637 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47638 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47639 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47640 unsigned long flags;
47641
47642 DBGPR("-->xgbe_powerup\n");
47643 @@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47644
47645 static int xgbe_start(struct xgbe_prv_data *pdata)
47646 {
47647 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47648 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47649 struct net_device *netdev = pdata->netdev;
47650
47651 DBGPR("-->xgbe_start\n");
47652 @@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47653
47654 static void xgbe_stop(struct xgbe_prv_data *pdata)
47655 {
47656 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47657 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47658 struct net_device *netdev = pdata->netdev;
47659
47660 DBGPR("-->xgbe_stop\n");
47661 @@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47662
47663 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47664 {
47665 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47666 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47667
47668 DBGPR("-->xgbe_restart_dev\n");
47669
47670 @@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47671 return -ERANGE;
47672 }
47673
47674 - pdata->hw_if.config_tstamp(pdata, mac_tscr);
47675 + pdata->hw_if->config_tstamp(pdata, mac_tscr);
47676
47677 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47678
47679 @@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47680 static int xgbe_open(struct net_device *netdev)
47681 {
47682 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47683 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47684 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47685 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47686 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47687 int ret;
47688
47689 DBGPR("-->xgbe_open\n");
47690 @@ -1170,8 +1170,8 @@ err_phy_init:
47691 static int xgbe_close(struct net_device *netdev)
47692 {
47693 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47694 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47695 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47696 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47697 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47698
47699 DBGPR("-->xgbe_close\n");
47700
47701 @@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47702 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47703 {
47704 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47705 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47706 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47707 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47708 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47709 struct xgbe_channel *channel;
47710 struct xgbe_ring *ring;
47711 struct xgbe_packet_data *packet;
47712 @@ -1275,7 +1275,7 @@ tx_netdev_return:
47713 static void xgbe_set_rx_mode(struct net_device *netdev)
47714 {
47715 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47716 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47717 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47718 unsigned int pr_mode, am_mode;
47719
47720 DBGPR("-->xgbe_set_rx_mode\n");
47721 @@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47722 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47723 {
47724 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47725 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47726 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47727 struct sockaddr *saddr = addr;
47728
47729 DBGPR("-->xgbe_set_mac_address\n");
47730 @@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47731
47732 DBGPR("-->%s\n", __func__);
47733
47734 - pdata->hw_if.read_mmc_stats(pdata);
47735 + pdata->hw_if->read_mmc_stats(pdata);
47736
47737 s->rx_packets = pstats->rxframecount_gb;
47738 s->rx_bytes = pstats->rxoctetcount_gb;
47739 @@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47740 u16 vid)
47741 {
47742 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47743 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47744 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47745
47746 DBGPR("-->%s\n", __func__);
47747
47748 @@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47749 u16 vid)
47750 {
47751 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47752 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47753 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47754
47755 DBGPR("-->%s\n", __func__);
47756
47757 @@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47758 netdev_features_t features)
47759 {
47760 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47761 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47762 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47763 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47764
47765 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47766 @@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47767 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47768 {
47769 struct xgbe_prv_data *pdata = channel->pdata;
47770 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47771 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47772 struct xgbe_ring *ring = channel->rx_ring;
47773 struct xgbe_ring_data *rdata;
47774
47775 @@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47776 static int xgbe_tx_poll(struct xgbe_channel *channel)
47777 {
47778 struct xgbe_prv_data *pdata = channel->pdata;
47779 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47780 - struct xgbe_desc_if *desc_if = &pdata->desc_if;
47781 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47782 + struct xgbe_desc_if *desc_if = pdata->desc_if;
47783 struct xgbe_ring *ring = channel->tx_ring;
47784 struct xgbe_ring_data *rdata;
47785 struct xgbe_ring_desc *rdesc;
47786 @@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47787 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47788 {
47789 struct xgbe_prv_data *pdata = channel->pdata;
47790 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47791 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47792 struct xgbe_ring *ring = channel->rx_ring;
47793 struct xgbe_ring_data *rdata;
47794 struct xgbe_packet_data *packet;
47795 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47796 index 49508ec..2617cca 100644
47797 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47798 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47799 @@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47800
47801 DBGPR("-->%s\n", __func__);
47802
47803 - pdata->hw_if.read_mmc_stats(pdata);
47804 + pdata->hw_if->read_mmc_stats(pdata);
47805 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47806 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47807 *data++ = *(u64 *)stat;
47808 @@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47809 struct ethtool_coalesce *ec)
47810 {
47811 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47812 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47813 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47814 unsigned int riwt;
47815
47816 DBGPR("-->xgbe_get_coalesce\n");
47817 @@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47818 struct ethtool_coalesce *ec)
47819 {
47820 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47821 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47822 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47823 unsigned int rx_frames, rx_riwt, rx_usecs;
47824 unsigned int tx_frames, tx_usecs;
47825
47826 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47827 index f5a8fa0..0bb58ff 100644
47828 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47829 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47830 @@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47831 DBGPR("<--xgbe_default_config\n");
47832 }
47833
47834 -static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47835 -{
47836 - xgbe_init_function_ptrs_dev(&pdata->hw_if);
47837 - xgbe_init_function_ptrs_desc(&pdata->desc_if);
47838 -}
47839 -
47840 static int xgbe_probe(struct platform_device *pdev)
47841 {
47842 struct xgbe_prv_data *pdata;
47843 @@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47844 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47845
47846 /* Set all the function pointers */
47847 - xgbe_init_all_fptrs(pdata);
47848 - hw_if = &pdata->hw_if;
47849 - desc_if = &pdata->desc_if;
47850 + hw_if = pdata->hw_if = &default_xgbe_hw_if;
47851 + desc_if = pdata->desc_if = &default_xgbe_desc_if;
47852
47853 /* Issue software reset to device */
47854 hw_if->exit(pdata);
47855 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47856 index 363b210..b241389 100644
47857 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47858 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47859 @@ -126,7 +126,7 @@
47860 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47861 {
47862 struct xgbe_prv_data *pdata = mii->priv;
47863 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47864 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47865 int mmd_data;
47866
47867 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47868 @@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47869 u16 mmd_val)
47870 {
47871 struct xgbe_prv_data *pdata = mii->priv;
47872 - struct xgbe_hw_if *hw_if = &pdata->hw_if;
47873 + struct xgbe_hw_if *hw_if = pdata->hw_if;
47874 int mmd_data = mmd_val;
47875
47876 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47877 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47878 index a1bf9d1c..84adcab 100644
47879 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47880 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47881 @@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47882 tstamp_cc);
47883 u64 nsec;
47884
47885 - nsec = pdata->hw_if.get_tstamp_time(pdata);
47886 + nsec = pdata->hw_if->get_tstamp_time(pdata);
47887
47888 return nsec;
47889 }
47890 @@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47891
47892 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47893
47894 - pdata->hw_if.update_tstamp_addend(pdata, addend);
47895 + pdata->hw_if->update_tstamp_addend(pdata, addend);
47896
47897 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47898
47899 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47900 index 789957d..d7d0245 100644
47901 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47902 +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47903 @@ -583,8 +583,8 @@ struct xgbe_prv_data {
47904
47905 int irq_number;
47906
47907 - struct xgbe_hw_if hw_if;
47908 - struct xgbe_desc_if desc_if;
47909 + const struct xgbe_hw_if *hw_if;
47910 + const struct xgbe_desc_if *desc_if;
47911
47912 /* AXI DMA settings */
47913 unsigned int axdomain;
47914 @@ -697,6 +697,9 @@ struct xgbe_prv_data {
47915 #endif
47916 };
47917
47918 +extern const struct xgbe_hw_if default_xgbe_hw_if;
47919 +extern const struct xgbe_desc_if default_xgbe_desc_if;
47920 +
47921 /* Function prototypes*/
47922
47923 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47924 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47925 index adcacda..fa6e0ae 100644
47926 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47927 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47928 @@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47929 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47930 {
47931 /* RX_MODE controlling object */
47932 - bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47933 + bnx2x_init_rx_mode_obj(bp);
47934
47935 /* multicast configuration controlling object */
47936 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47937 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47938 index 7bc2924..2112002 100644
47939 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47940 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47941 @@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47942 return rc;
47943 }
47944
47945 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47946 - struct bnx2x_rx_mode_obj *o)
47947 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47948 {
47949 if (CHIP_IS_E1x(bp)) {
47950 - o->wait_comp = bnx2x_empty_rx_mode_wait;
47951 - o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47952 + bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47953 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47954 } else {
47955 - o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47956 - o->config_rx_mode = bnx2x_set_rx_mode_e2;
47957 + bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47958 + bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47959 }
47960 }
47961
47962 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47963 index e97275f..52e28bc 100644
47964 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47965 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47966 @@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47967
47968 /********************* RX MODE ****************/
47969
47970 -void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47971 - struct bnx2x_rx_mode_obj *o);
47972 +void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47973
47974 /**
47975 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47976 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47977 index 31c9f82..e65e986 100644
47978 --- a/drivers/net/ethernet/broadcom/tg3.h
47979 +++ b/drivers/net/ethernet/broadcom/tg3.h
47980 @@ -150,6 +150,7 @@
47981 #define CHIPREV_ID_5750_A0 0x4000
47982 #define CHIPREV_ID_5750_A1 0x4001
47983 #define CHIPREV_ID_5750_A3 0x4003
47984 +#define CHIPREV_ID_5750_C1 0x4201
47985 #define CHIPREV_ID_5750_C2 0x4202
47986 #define CHIPREV_ID_5752_A0_HW 0x5000
47987 #define CHIPREV_ID_5752_A0 0x6000
47988 diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47989 index 903466e..b285864 100644
47990 --- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47991 +++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47992 @@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47993 }
47994
47995 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
47996 - bna_cb_ioceth_enable,
47997 - bna_cb_ioceth_disable,
47998 - bna_cb_ioceth_hbfail,
47999 - bna_cb_ioceth_reset
48000 + .enable_cbfn = bna_cb_ioceth_enable,
48001 + .disable_cbfn = bna_cb_ioceth_disable,
48002 + .hbfail_cbfn = bna_cb_ioceth_hbfail,
48003 + .reset_cbfn = bna_cb_ioceth_reset
48004 };
48005
48006 static void bna_attr_init(struct bna_ioceth *ioceth)
48007 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48008 index 8cffcdf..aadf043 100644
48009 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48010 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48011 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48012 */
48013 struct l2t_skb_cb {
48014 arp_failure_handler_func arp_failure_handler;
48015 -};
48016 +} __no_const;
48017
48018 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48019
48020 diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48021 index 279873c..11e1921 100644
48022 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48023 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48024 @@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48025
48026 int i;
48027 struct adapter *ap = netdev2adap(dev);
48028 - static const unsigned int *reg_ranges;
48029 + const unsigned int *reg_ranges;
48030 int arr_size = 0, buf_size = 0;
48031
48032 if (is_t4(ap->params.chip)) {
48033 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48034 index cf8b6ff..274271e 100644
48035 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
48036 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48037 @@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48038 for (i=0; i<ETH_ALEN; i++) {
48039 tmp.addr[i] = dev->dev_addr[i];
48040 }
48041 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48042 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48043 break;
48044
48045 case DE4X5_SET_HWADDR: /* Set the hardware address */
48046 @@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48047 spin_lock_irqsave(&lp->lock, flags);
48048 memcpy(&statbuf, &lp->pktStats, ioc->len);
48049 spin_unlock_irqrestore(&lp->lock, flags);
48050 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
48051 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48052 return -EFAULT;
48053 break;
48054 }
48055 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48056 index 597c463..5cc1a7f 100644
48057 --- a/drivers/net/ethernet/emulex/benet/be_main.c
48058 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
48059 @@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48060
48061 if (wrapped)
48062 newacc += 65536;
48063 - ACCESS_ONCE(*acc) = newacc;
48064 + ACCESS_ONCE_RW(*acc) = newacc;
48065 }
48066
48067 static void populate_erx_stats(struct be_adapter *adapter,
48068 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48069 index c77fa4a..7fd42fc 100644
48070 --- a/drivers/net/ethernet/faraday/ftgmac100.c
48071 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
48072 @@ -30,6 +30,8 @@
48073 #include <linux/netdevice.h>
48074 #include <linux/phy.h>
48075 #include <linux/platform_device.h>
48076 +#include <linux/interrupt.h>
48077 +#include <linux/irqreturn.h>
48078 #include <net/ip.h>
48079
48080 #include "ftgmac100.h"
48081 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48082 index 4ff1adc..0ea6bf4 100644
48083 --- a/drivers/net/ethernet/faraday/ftmac100.c
48084 +++ b/drivers/net/ethernet/faraday/ftmac100.c
48085 @@ -31,6 +31,8 @@
48086 #include <linux/module.h>
48087 #include <linux/netdevice.h>
48088 #include <linux/platform_device.h>
48089 +#include <linux/interrupt.h>
48090 +#include <linux/irqreturn.h>
48091
48092 #include "ftmac100.h"
48093
48094 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48095 index 537b621..07f87ce 100644
48096 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48097 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48098 @@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48099 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48100
48101 /* Update the base adjustement value. */
48102 - ACCESS_ONCE(pf->ptp_base_adj) = incval;
48103 + ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48104 smp_mb(); /* Force the above update. */
48105 }
48106
48107 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48108 index 5fd4b52..87aa34b 100644
48109 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48110 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48111 @@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48112 }
48113
48114 /* update the base incval used to calculate frequency adjustment */
48115 - ACCESS_ONCE(adapter->base_incval) = incval;
48116 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
48117 smp_mb();
48118
48119 /* need lock to prevent incorrect read while modifying cyclecounter */
48120 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48121 index 454d9fe..59f0f0b 100644
48122 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48123 +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48124 @@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48125 wmb();
48126
48127 /* we want to dirty this cache line once */
48128 - ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48129 - ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48130 + ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48131 + ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48132
48133 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48134
48135 diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
48136 index f5e4b82..db0c7a9 100644
48137 --- a/drivers/net/ethernet/neterion/s2io.c
48138 +++ b/drivers/net/ethernet/neterion/s2io.c
48139 @@ -6987,7 +6987,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
48140 if (sp->s2io_entries[i].in_use == MSIX_FLG) {
48141 if (sp->s2io_entries[i].type ==
48142 MSIX_RING_TYPE) {
48143 - sprintf(sp->desc[i], "%s:MSI-X-%d-RX",
48144 + snprintf(sp->desc[i],
48145 + sizeof(sp->desc[i]),
48146 + "%s:MSI-X-%d-RX",
48147 dev->name, i);
48148 err = request_irq(sp->entries[i].vector,
48149 s2io_msix_ring_handle,
48150 @@ -6996,7 +6998,9 @@ static int s2io_add_isr(struct s2io_nic *sp)
48151 sp->s2io_entries[i].arg);
48152 } else if (sp->s2io_entries[i].type ==
48153 MSIX_ALARM_TYPE) {
48154 - sprintf(sp->desc[i], "%s:MSI-X-%d-TX",
48155 + snprintf(sp->desc[i],
48156 + sizeof(sp->desc[i]),
48157 + "%s:MSI-X-%d-TX",
48158 dev->name, i);
48159 err = request_irq(sp->entries[i].vector,
48160 s2io_msix_fifo_handle,
48161 @@ -8154,7 +8158,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
48162 "%s: UDP Fragmentation Offload(UFO) enabled\n",
48163 dev->name);
48164 /* Initialize device name */
48165 - sprintf(sp->name, "%s Neterion %s", dev->name, sp->product_name);
48166 + snprintf(sp->name, sizeof(sp->name), "%s Neterion %s", dev->name,
48167 + sp->product_name);
48168
48169 if (vlan_tag_strip)
48170 sp->vlan_strip_flag = 1;
48171 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48172 index 2bbd01f..e8baa64 100644
48173 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48174 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48175 @@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48176 struct __vxge_hw_fifo *fifo;
48177 struct vxge_hw_fifo_config *config;
48178 u32 txdl_size, txdl_per_memblock;
48179 - struct vxge_hw_mempool_cbs fifo_mp_callback;
48180 + static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48181 + .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48182 + };
48183 +
48184 struct __vxge_hw_virtualpath *vpath;
48185
48186 if ((vp == NULL) || (attr == NULL)) {
48187 @@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48188 goto exit;
48189 }
48190
48191 - fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48192 -
48193 fifo->mempool =
48194 __vxge_hw_mempool_create(vpath->hldev,
48195 fifo->config->memblock_size,
48196 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48197 index 2bb48d5..d1a865d 100644
48198 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48199 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48200 @@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48201 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48202 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48203 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48204 - adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48205 + pax_open_kernel();
48206 + *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48207 + pax_close_kernel();
48208 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48209 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48210 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48211 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48212 index be7d7a6..a8983f8 100644
48213 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48214 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48215 @@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48216 case QLCNIC_NON_PRIV_FUNC:
48217 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48218 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48219 - nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48220 + pax_open_kernel();
48221 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48222 + pax_close_kernel();
48223 break;
48224 case QLCNIC_PRIV_FUNC:
48225 ahw->op_mode = QLCNIC_PRIV_FUNC;
48226 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48227 - nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48228 + pax_open_kernel();
48229 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48230 + pax_close_kernel();
48231 break;
48232 case QLCNIC_MGMT_FUNC:
48233 ahw->op_mode = QLCNIC_MGMT_FUNC;
48234 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48235 - nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48236 + pax_open_kernel();
48237 + *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48238 + pax_close_kernel();
48239 break;
48240 default:
48241 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48242 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48243 index c9f57fb..208bdc1 100644
48244 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48245 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48246 @@ -1285,7 +1285,7 @@ flash_temp:
48247 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48248 {
48249 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48250 - static const struct qlcnic_dump_operations *fw_dump_ops;
48251 + const struct qlcnic_dump_operations *fw_dump_ops;
48252 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48253 u32 entry_offset, dump, no_entries, buf_offset = 0;
48254 int i, k, ops_cnt, ops_index, dump_size = 0;
48255 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48256 index cf154f7..c948d1b 100644
48257 --- a/drivers/net/ethernet/realtek/r8169.c
48258 +++ b/drivers/net/ethernet/realtek/r8169.c
48259 @@ -788,22 +788,22 @@ struct rtl8169_private {
48260 struct mdio_ops {
48261 void (*write)(struct rtl8169_private *, int, int);
48262 int (*read)(struct rtl8169_private *, int);
48263 - } mdio_ops;
48264 + } __no_const mdio_ops;
48265
48266 struct pll_power_ops {
48267 void (*down)(struct rtl8169_private *);
48268 void (*up)(struct rtl8169_private *);
48269 - } pll_power_ops;
48270 + } __no_const pll_power_ops;
48271
48272 struct jumbo_ops {
48273 void (*enable)(struct rtl8169_private *);
48274 void (*disable)(struct rtl8169_private *);
48275 - } jumbo_ops;
48276 + } __no_const jumbo_ops;
48277
48278 struct csi_ops {
48279 void (*write)(struct rtl8169_private *, int, int);
48280 u32 (*read)(struct rtl8169_private *, int);
48281 - } csi_ops;
48282 + } __no_const csi_ops;
48283
48284 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48285 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48286 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48287 index 6b861e3..204ac86 100644
48288 --- a/drivers/net/ethernet/sfc/ptp.c
48289 +++ b/drivers/net/ethernet/sfc/ptp.c
48290 @@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48291 ptp->start.dma_addr);
48292
48293 /* Clear flag that signals MC ready */
48294 - ACCESS_ONCE(*start) = 0;
48295 + ACCESS_ONCE_RW(*start) = 0;
48296 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48297 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48298 EFX_BUG_ON_PARANOID(rc);
48299 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48300 index 08c483b..2c4a553 100644
48301 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48302 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48303 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48304
48305 writel(value, ioaddr + MMC_CNTRL);
48306
48307 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48308 - MMC_CNTRL, value);
48309 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48310 +// MMC_CNTRL, value);
48311 }
48312
48313 /* To mask all all interrupts.*/
48314 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48315 index 2f48f79..8ae1a1a 100644
48316 --- a/drivers/net/hyperv/hyperv_net.h
48317 +++ b/drivers/net/hyperv/hyperv_net.h
48318 @@ -171,7 +171,7 @@ struct rndis_device {
48319 enum rndis_device_state state;
48320 bool link_state;
48321 bool link_change;
48322 - atomic_t new_req_id;
48323 + atomic_unchecked_t new_req_id;
48324
48325 spinlock_t request_lock;
48326 struct list_head req_list;
48327 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48328 index 2b86f0b..ecc996f 100644
48329 --- a/drivers/net/hyperv/rndis_filter.c
48330 +++ b/drivers/net/hyperv/rndis_filter.c
48331 @@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48332 * template
48333 */
48334 set = &rndis_msg->msg.set_req;
48335 - set->req_id = atomic_inc_return(&dev->new_req_id);
48336 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48337
48338 /* Add to the request list */
48339 spin_lock_irqsave(&dev->request_lock, flags);
48340 @@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48341
48342 /* Setup the rndis set */
48343 halt = &request->request_msg.msg.halt_req;
48344 - halt->req_id = atomic_inc_return(&dev->new_req_id);
48345 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48346
48347 /* Ignore return since this msg is optional. */
48348 rndis_filter_send_request(dev, request);
48349 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48350 index 6cbc56a..5f7e6c8 100644
48351 --- a/drivers/net/ieee802154/fakehard.c
48352 +++ b/drivers/net/ieee802154/fakehard.c
48353 @@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48354 phy->transmit_power = 0xbf;
48355
48356 dev->netdev_ops = &fake_ops;
48357 - dev->ml_priv = &fake_mlme;
48358 + dev->ml_priv = (void *)&fake_mlme;
48359
48360 priv = netdev_priv(dev);
48361 priv->phy = phy;
48362 diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48363 index 34f846b..4a0d5b1 100644
48364 --- a/drivers/net/ifb.c
48365 +++ b/drivers/net/ifb.c
48366 @@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48367 return 0;
48368 }
48369
48370 -static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48371 +static struct rtnl_link_ops ifb_link_ops = {
48372 .kind = "ifb",
48373 .priv_size = sizeof(struct ifb_private),
48374 .setup = ifb_setup,
48375 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48376 index bfb0b6e..5c396ce 100644
48377 --- a/drivers/net/macvlan.c
48378 +++ b/drivers/net/macvlan.c
48379 @@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48380 free_nskb:
48381 kfree_skb(nskb);
48382 err:
48383 - atomic_long_inc(&skb->dev->rx_dropped);
48384 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48385 }
48386
48387 static void macvlan_flush_sources(struct macvlan_port *port,
48388 @@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48389 int macvlan_link_register(struct rtnl_link_ops *ops)
48390 {
48391 /* common fields */
48392 - ops->priv_size = sizeof(struct macvlan_dev);
48393 - ops->validate = macvlan_validate;
48394 - ops->maxtype = IFLA_MACVLAN_MAX;
48395 - ops->policy = macvlan_policy;
48396 - ops->changelink = macvlan_changelink;
48397 - ops->get_size = macvlan_get_size;
48398 - ops->fill_info = macvlan_fill_info;
48399 + pax_open_kernel();
48400 + *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48401 + *(void **)&ops->validate = macvlan_validate;
48402 + *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48403 + *(const void **)&ops->policy = macvlan_policy;
48404 + *(void **)&ops->changelink = macvlan_changelink;
48405 + *(void **)&ops->get_size = macvlan_get_size;
48406 + *(void **)&ops->fill_info = macvlan_fill_info;
48407 + pax_close_kernel();
48408
48409 return rtnl_link_register(ops);
48410 };
48411 @@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48412 return NOTIFY_DONE;
48413 }
48414
48415 -static struct notifier_block macvlan_notifier_block __read_mostly = {
48416 +static struct notifier_block macvlan_notifier_block = {
48417 .notifier_call = macvlan_device_event,
48418 };
48419
48420 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48421 index 880cc09..6a68ba6 100644
48422 --- a/drivers/net/macvtap.c
48423 +++ b/drivers/net/macvtap.c
48424 @@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48425 dev->tx_queue_len = TUN_READQ_SIZE;
48426 }
48427
48428 -static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48429 +static struct rtnl_link_ops macvtap_link_ops = {
48430 .kind = "macvtap",
48431 .setup = macvtap_setup,
48432 .newlink = macvtap_newlink,
48433 @@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48434 }
48435
48436 ret = 0;
48437 - if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48438 + if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48439 put_user(q->flags, &ifr->ifr_flags))
48440 ret = -EFAULT;
48441 macvtap_put_vlan(vlan);
48442 @@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48443 return NOTIFY_DONE;
48444 }
48445
48446 -static struct notifier_block macvtap_notifier_block __read_mostly = {
48447 +static struct notifier_block macvtap_notifier_block = {
48448 .notifier_call = macvtap_device_event,
48449 };
48450
48451 diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48452 index 34924df..a747360 100644
48453 --- a/drivers/net/nlmon.c
48454 +++ b/drivers/net/nlmon.c
48455 @@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48456 return 0;
48457 }
48458
48459 -static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48460 +static struct rtnl_link_ops nlmon_link_ops = {
48461 .kind = "nlmon",
48462 .priv_size = sizeof(struct nlmon),
48463 .setup = nlmon_setup,
48464 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48465 index 794a473..9fd437b 100644
48466 --- a/drivers/net/ppp/ppp_generic.c
48467 +++ b/drivers/net/ppp/ppp_generic.c
48468 @@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48469 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48470 struct ppp_stats stats;
48471 struct ppp_comp_stats cstats;
48472 - char *vers;
48473
48474 switch (cmd) {
48475 case SIOCGPPPSTATS:
48476 @@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48477 break;
48478
48479 case SIOCGPPPVER:
48480 - vers = PPP_VERSION;
48481 - if (copy_to_user(addr, vers, strlen(vers) + 1))
48482 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48483 break;
48484 err = 0;
48485 break;
48486 diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48487 index 079f7ad..b2a2bfa7 100644
48488 --- a/drivers/net/slip/slhc.c
48489 +++ b/drivers/net/slip/slhc.c
48490 @@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48491 register struct tcphdr *thp;
48492 register struct iphdr *ip;
48493 register struct cstate *cs;
48494 - int len, hdrlen;
48495 + long len, hdrlen;
48496 unsigned char *cp = icp;
48497
48498 /* We've got a compressed packet; read the change byte */
48499 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48500 index 2368395..bf6fe96 100644
48501 --- a/drivers/net/team/team.c
48502 +++ b/drivers/net/team/team.c
48503 @@ -2090,7 +2090,7 @@ static unsigned int team_get_num_rx_queues(void)
48504 return TEAM_DEFAULT_NUM_RX_QUEUES;
48505 }
48506
48507 -static struct rtnl_link_ops team_link_ops __read_mostly = {
48508 +static struct rtnl_link_ops team_link_ops = {
48509 .kind = DRV_NAME,
48510 .priv_size = sizeof(struct team),
48511 .setup = team_setup,
48512 @@ -2880,7 +2880,7 @@ static int team_device_event(struct notifier_block *unused,
48513 return NOTIFY_DONE;
48514 }
48515
48516 -static struct notifier_block team_notifier_block __read_mostly = {
48517 +static struct notifier_block team_notifier_block = {
48518 .notifier_call = team_device_event,
48519 };
48520
48521 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48522 index 9dd3746..74f191e 100644
48523 --- a/drivers/net/tun.c
48524 +++ b/drivers/net/tun.c
48525 @@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48526 return -EINVAL;
48527 }
48528
48529 -static struct rtnl_link_ops tun_link_ops __read_mostly = {
48530 +static struct rtnl_link_ops tun_link_ops = {
48531 .kind = DRV_NAME,
48532 .priv_size = sizeof(struct tun_struct),
48533 .setup = tun_setup,
48534 @@ -1868,7 +1868,7 @@ unlock:
48535 }
48536
48537 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48538 - unsigned long arg, int ifreq_len)
48539 + unsigned long arg, size_t ifreq_len)
48540 {
48541 struct tun_file *tfile = file->private_data;
48542 struct tun_struct *tun;
48543 @@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48544 unsigned int ifindex;
48545 int ret;
48546
48547 + if (ifreq_len > sizeof ifr)
48548 + return -EFAULT;
48549 +
48550 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48551 if (copy_from_user(&ifr, argp, ifreq_len))
48552 return -EFAULT;
48553 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48554 index babda7d..e40c90a 100644
48555 --- a/drivers/net/usb/hso.c
48556 +++ b/drivers/net/usb/hso.c
48557 @@ -71,7 +71,7 @@
48558 #include <asm/byteorder.h>
48559 #include <linux/serial_core.h>
48560 #include <linux/serial.h>
48561 -
48562 +#include <asm/local.h>
48563
48564 #define MOD_AUTHOR "Option Wireless"
48565 #define MOD_DESCRIPTION "USB High Speed Option driver"
48566 @@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48567 struct urb *urb;
48568
48569 urb = serial->rx_urb[0];
48570 - if (serial->port.count > 0) {
48571 + if (atomic_read(&serial->port.count) > 0) {
48572 count = put_rxbuf_data(urb, serial);
48573 if (count == -1)
48574 return;
48575 @@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48576 DUMP1(urb->transfer_buffer, urb->actual_length);
48577
48578 /* Anyone listening? */
48579 - if (serial->port.count == 0)
48580 + if (atomic_read(&serial->port.count) == 0)
48581 return;
48582
48583 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48584 @@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48585 tty_port_tty_set(&serial->port, tty);
48586
48587 /* check for port already opened, if not set the termios */
48588 - serial->port.count++;
48589 - if (serial->port.count == 1) {
48590 + if (atomic_inc_return(&serial->port.count) == 1) {
48591 serial->rx_state = RX_IDLE;
48592 /* Force default termio settings */
48593 _hso_serial_set_termios(tty, NULL);
48594 @@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48595 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48596 if (result) {
48597 hso_stop_serial_device(serial->parent);
48598 - serial->port.count--;
48599 + atomic_dec(&serial->port.count);
48600 kref_put(&serial->parent->ref, hso_serial_ref_free);
48601 }
48602 } else {
48603 @@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48604
48605 /* reset the rts and dtr */
48606 /* do the actual close */
48607 - serial->port.count--;
48608 + atomic_dec(&serial->port.count);
48609
48610 - if (serial->port.count <= 0) {
48611 - serial->port.count = 0;
48612 + if (atomic_read(&serial->port.count) <= 0) {
48613 + atomic_set(&serial->port.count, 0);
48614 tty_port_tty_set(&serial->port, NULL);
48615 if (!usb_gone)
48616 hso_stop_serial_device(serial->parent);
48617 @@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48618
48619 /* the actual setup */
48620 spin_lock_irqsave(&serial->serial_lock, flags);
48621 - if (serial->port.count)
48622 + if (atomic_read(&serial->port.count))
48623 _hso_serial_set_termios(tty, old);
48624 else
48625 tty->termios = *old;
48626 @@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48627 D1("Pending read interrupt on port %d\n", i);
48628 spin_lock(&serial->serial_lock);
48629 if (serial->rx_state == RX_IDLE &&
48630 - serial->port.count > 0) {
48631 + atomic_read(&serial->port.count) > 0) {
48632 /* Setup and send a ctrl req read on
48633 * port i */
48634 if (!serial->rx_urb_filled[0]) {
48635 @@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48636 /* Start all serial ports */
48637 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48638 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48639 - if (dev2ser(serial_table[i])->port.count) {
48640 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48641 result =
48642 hso_start_serial_device(serial_table[i], GFP_NOIO);
48643 hso_kick_transmit(dev2ser(serial_table[i]));
48644 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48645 index c6554c7..7e2ebd7 100644
48646 --- a/drivers/net/usb/r8152.c
48647 +++ b/drivers/net/usb/r8152.c
48648 @@ -577,7 +577,7 @@ struct r8152 {
48649 void (*unload)(struct r8152 *);
48650 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48651 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48652 - } rtl_ops;
48653 + } __no_const rtl_ops;
48654
48655 int intr_interval;
48656 u32 saved_wolopts;
48657 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48658 index a2515887..6d13233 100644
48659 --- a/drivers/net/usb/sierra_net.c
48660 +++ b/drivers/net/usb/sierra_net.c
48661 @@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48662 /* atomic counter partially included in MAC address to make sure 2 devices
48663 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48664 */
48665 -static atomic_t iface_counter = ATOMIC_INIT(0);
48666 +static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48667
48668 /*
48669 * SYNC Timer Delay definition used to set the expiry time
48670 @@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48671 dev->net->netdev_ops = &sierra_net_device_ops;
48672
48673 /* change MAC addr to include, ifacenum, and to be unique */
48674 - dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48675 + dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48676 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48677
48678 /* we will have to manufacture ethernet headers, prepare template */
48679 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48680 index b0bc8ea..3af931b5 100644
48681 --- a/drivers/net/virtio_net.c
48682 +++ b/drivers/net/virtio_net.c
48683 @@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48684 #define RECEIVE_AVG_WEIGHT 64
48685
48686 /* Minimum alignment for mergeable packet buffers. */
48687 -#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48688 +#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48689
48690 #define VIRTNET_DRIVER_VERSION "1.0.0"
48691
48692 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48693 index 42b2d6a5..2a2cb41 100644
48694 --- a/drivers/net/vxlan.c
48695 +++ b/drivers/net/vxlan.c
48696 @@ -2695,7 +2695,7 @@ nla_put_failure:
48697 return -EMSGSIZE;
48698 }
48699
48700 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48701 +static struct rtnl_link_ops vxlan_link_ops = {
48702 .kind = "vxlan",
48703 .maxtype = IFLA_VXLAN_MAX,
48704 .policy = vxlan_policy,
48705 @@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48706 return NOTIFY_DONE;
48707 }
48708
48709 -static struct notifier_block vxlan_notifier_block __read_mostly = {
48710 +static struct notifier_block vxlan_notifier_block = {
48711 .notifier_call = vxlan_lowerdev_event,
48712 };
48713
48714 diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48715 index 5920c99..ff2e4a5 100644
48716 --- a/drivers/net/wan/lmc/lmc_media.c
48717 +++ b/drivers/net/wan/lmc/lmc_media.c
48718 @@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48719 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48720
48721 lmc_media_t lmc_ds3_media = {
48722 - lmc_ds3_init, /* special media init stuff */
48723 - lmc_ds3_default, /* reset to default state */
48724 - lmc_ds3_set_status, /* reset status to state provided */
48725 - lmc_dummy_set_1, /* set clock source */
48726 - lmc_dummy_set2_1, /* set line speed */
48727 - lmc_ds3_set_100ft, /* set cable length */
48728 - lmc_ds3_set_scram, /* set scrambler */
48729 - lmc_ds3_get_link_status, /* get link status */
48730 - lmc_dummy_set_1, /* set link status */
48731 - lmc_ds3_set_crc_length, /* set CRC length */
48732 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48733 - lmc_ds3_watchdog
48734 + .init = lmc_ds3_init, /* special media init stuff */
48735 + .defaults = lmc_ds3_default, /* reset to default state */
48736 + .set_status = lmc_ds3_set_status, /* reset status to state provided */
48737 + .set_clock_source = lmc_dummy_set_1, /* set clock source */
48738 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48739 + .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48740 + .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48741 + .get_link_status = lmc_ds3_get_link_status, /* get link status */
48742 + .set_link_status = lmc_dummy_set_1, /* set link status */
48743 + .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48744 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48745 + .watchdog = lmc_ds3_watchdog
48746 };
48747
48748 lmc_media_t lmc_hssi_media = {
48749 - lmc_hssi_init, /* special media init stuff */
48750 - lmc_hssi_default, /* reset to default state */
48751 - lmc_hssi_set_status, /* reset status to state provided */
48752 - lmc_hssi_set_clock, /* set clock source */
48753 - lmc_dummy_set2_1, /* set line speed */
48754 - lmc_dummy_set_1, /* set cable length */
48755 - lmc_dummy_set_1, /* set scrambler */
48756 - lmc_hssi_get_link_status, /* get link status */
48757 - lmc_hssi_set_link_status, /* set link status */
48758 - lmc_hssi_set_crc_length, /* set CRC length */
48759 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48760 - lmc_hssi_watchdog
48761 + .init = lmc_hssi_init, /* special media init stuff */
48762 + .defaults = lmc_hssi_default, /* reset to default state */
48763 + .set_status = lmc_hssi_set_status, /* reset status to state provided */
48764 + .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48765 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48766 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48767 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48768 + .get_link_status = lmc_hssi_get_link_status, /* get link status */
48769 + .set_link_status = lmc_hssi_set_link_status, /* set link status */
48770 + .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48771 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48772 + .watchdog = lmc_hssi_watchdog
48773 };
48774
48775 -lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48776 - lmc_ssi_default, /* reset to default state */
48777 - lmc_ssi_set_status, /* reset status to state provided */
48778 - lmc_ssi_set_clock, /* set clock source */
48779 - lmc_ssi_set_speed, /* set line speed */
48780 - lmc_dummy_set_1, /* set cable length */
48781 - lmc_dummy_set_1, /* set scrambler */
48782 - lmc_ssi_get_link_status, /* get link status */
48783 - lmc_ssi_set_link_status, /* set link status */
48784 - lmc_ssi_set_crc_length, /* set CRC length */
48785 - lmc_dummy_set_1, /* set T1 or E1 circuit type */
48786 - lmc_ssi_watchdog
48787 +lmc_media_t lmc_ssi_media = {
48788 + .init = lmc_ssi_init, /* special media init stuff */
48789 + .defaults = lmc_ssi_default, /* reset to default state */
48790 + .set_status = lmc_ssi_set_status, /* reset status to state provided */
48791 + .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48792 + .set_speed = lmc_ssi_set_speed, /* set line speed */
48793 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48794 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48795 + .get_link_status = lmc_ssi_get_link_status, /* get link status */
48796 + .set_link_status = lmc_ssi_set_link_status, /* set link status */
48797 + .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48798 + .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48799 + .watchdog = lmc_ssi_watchdog
48800 };
48801
48802 lmc_media_t lmc_t1_media = {
48803 - lmc_t1_init, /* special media init stuff */
48804 - lmc_t1_default, /* reset to default state */
48805 - lmc_t1_set_status, /* reset status to state provided */
48806 - lmc_t1_set_clock, /* set clock source */
48807 - lmc_dummy_set2_1, /* set line speed */
48808 - lmc_dummy_set_1, /* set cable length */
48809 - lmc_dummy_set_1, /* set scrambler */
48810 - lmc_t1_get_link_status, /* get link status */
48811 - lmc_dummy_set_1, /* set link status */
48812 - lmc_t1_set_crc_length, /* set CRC length */
48813 - lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48814 - lmc_t1_watchdog
48815 + .init = lmc_t1_init, /* special media init stuff */
48816 + .defaults = lmc_t1_default, /* reset to default state */
48817 + .set_status = lmc_t1_set_status, /* reset status to state provided */
48818 + .set_clock_source = lmc_t1_set_clock, /* set clock source */
48819 + .set_speed = lmc_dummy_set2_1, /* set line speed */
48820 + .set_cable_length = lmc_dummy_set_1, /* set cable length */
48821 + .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48822 + .get_link_status = lmc_t1_get_link_status, /* get link status */
48823 + .set_link_status = lmc_dummy_set_1, /* set link status */
48824 + .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48825 + .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48826 + .watchdog = lmc_t1_watchdog
48827 };
48828
48829 static void
48830 diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48831 index feacc3b..5bac0de 100644
48832 --- a/drivers/net/wan/z85230.c
48833 +++ b/drivers/net/wan/z85230.c
48834 @@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48835
48836 struct z8530_irqhandler z8530_sync =
48837 {
48838 - z8530_rx,
48839 - z8530_tx,
48840 - z8530_status
48841 + .rx = z8530_rx,
48842 + .tx = z8530_tx,
48843 + .status = z8530_status
48844 };
48845
48846 EXPORT_SYMBOL(z8530_sync);
48847 @@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48848 }
48849
48850 static struct z8530_irqhandler z8530_dma_sync = {
48851 - z8530_dma_rx,
48852 - z8530_dma_tx,
48853 - z8530_dma_status
48854 + .rx = z8530_dma_rx,
48855 + .tx = z8530_dma_tx,
48856 + .status = z8530_dma_status
48857 };
48858
48859 static struct z8530_irqhandler z8530_txdma_sync = {
48860 - z8530_rx,
48861 - z8530_dma_tx,
48862 - z8530_dma_status
48863 + .rx = z8530_rx,
48864 + .tx = z8530_dma_tx,
48865 + .status = z8530_dma_status
48866 };
48867
48868 /**
48869 @@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48870
48871 struct z8530_irqhandler z8530_nop=
48872 {
48873 - z8530_rx_clear,
48874 - z8530_tx_clear,
48875 - z8530_status_clear
48876 + .rx = z8530_rx_clear,
48877 + .tx = z8530_tx_clear,
48878 + .status = z8530_status_clear
48879 };
48880
48881
48882 diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48883 index 0b60295..b8bfa5b 100644
48884 --- a/drivers/net/wimax/i2400m/rx.c
48885 +++ b/drivers/net/wimax/i2400m/rx.c
48886 @@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48887 if (i2400m->rx_roq == NULL)
48888 goto error_roq_alloc;
48889
48890 - rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48891 + rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48892 GFP_KERNEL);
48893 if (rd == NULL) {
48894 result = -ENOMEM;
48895 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48896 index e71a2ce..2268d61 100644
48897 --- a/drivers/net/wireless/airo.c
48898 +++ b/drivers/net/wireless/airo.c
48899 @@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48900 struct airo_info *ai = dev->ml_priv;
48901 int ridcode;
48902 int enabled;
48903 - static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48904 + int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48905 unsigned char *iobuf;
48906
48907 /* Only super-user can write RIDs */
48908 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48909 index da92bfa..5a9001a 100644
48910 --- a/drivers/net/wireless/at76c50x-usb.c
48911 +++ b/drivers/net/wireless/at76c50x-usb.c
48912 @@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48913 }
48914
48915 /* Convert timeout from the DFU status to jiffies */
48916 -static inline unsigned long at76_get_timeout(struct dfu_status *s)
48917 +static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48918 {
48919 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48920 | (s->poll_timeout[1] << 8)
48921 diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48922 index 676bd4e..0b807a3 100644
48923 --- a/drivers/net/wireless/ath/ath10k/htc.c
48924 +++ b/drivers/net/wireless/ath/ath10k/htc.c
48925 @@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48926 /* registered target arrival callback from the HIF layer */
48927 int ath10k_htc_init(struct ath10k *ar)
48928 {
48929 - struct ath10k_hif_cb htc_callbacks;
48930 + static struct ath10k_hif_cb htc_callbacks = {
48931 + .rx_completion = ath10k_htc_rx_completion_handler,
48932 + .tx_completion = ath10k_htc_tx_completion_handler,
48933 + };
48934 struct ath10k_htc_ep *ep = NULL;
48935 struct ath10k_htc *htc = &ar->htc;
48936
48937 @@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48938 ath10k_htc_reset_endpoint_states(htc);
48939
48940 /* setup HIF layer callbacks */
48941 - htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48942 - htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48943 htc->ar = ar;
48944
48945 /* Get HIF default pipe for HTC message exchange */
48946 diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
48947 index 527179c..a890150 100644
48948 --- a/drivers/net/wireless/ath/ath10k/htc.h
48949 +++ b/drivers/net/wireless/ath/ath10k/htc.h
48950 @@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
48951
48952 struct ath10k_htc_ops {
48953 void (*target_send_suspend_complete)(struct ath10k *ar);
48954 -};
48955 +} __no_const;
48956
48957 struct ath10k_htc_ep_ops {
48958 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
48959 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
48960 void (*ep_tx_credits)(struct ath10k *);
48961 -};
48962 +} __no_const;
48963
48964 /* service connection information */
48965 struct ath10k_htc_svc_conn_req {
48966 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48967 index 2a93519..7052786 100644
48968 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48969 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48970 @@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48971 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
48972 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
48973
48974 - ACCESS_ONCE(ads->ds_link) = i->link;
48975 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
48976 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
48977 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
48978
48979 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
48980 ctl6 = SM(i->keytype, AR_EncrType);
48981 @@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48982
48983 if ((i->is_first || i->is_last) &&
48984 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
48985 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
48986 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
48987 | set11nTries(i->rates, 1)
48988 | set11nTries(i->rates, 2)
48989 | set11nTries(i->rates, 3)
48990 | (i->dur_update ? AR_DurUpdateEna : 0)
48991 | SM(0, AR_BurstDur);
48992
48993 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
48994 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
48995 | set11nRate(i->rates, 1)
48996 | set11nRate(i->rates, 2)
48997 | set11nRate(i->rates, 3);
48998 } else {
48999 - ACCESS_ONCE(ads->ds_ctl2) = 0;
49000 - ACCESS_ONCE(ads->ds_ctl3) = 0;
49001 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49002 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49003 }
49004
49005 if (!i->is_first) {
49006 - ACCESS_ONCE(ads->ds_ctl0) = 0;
49007 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49008 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49009 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49010 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49011 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49012 return;
49013 }
49014
49015 @@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49016 break;
49017 }
49018
49019 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49020 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49021 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49022 | SM(i->txpower, AR_XmitPower0)
49023 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49024 @@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49025 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49026 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49027
49028 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49029 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49030 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49031 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49032
49033 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49034 return;
49035
49036 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49037 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49038 | set11nPktDurRTSCTS(i->rates, 1);
49039
49040 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49041 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49042 | set11nPktDurRTSCTS(i->rates, 3);
49043
49044 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49045 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49046 | set11nRateFlags(i->rates, 1)
49047 | set11nRateFlags(i->rates, 2)
49048 | set11nRateFlags(i->rates, 3)
49049 | SM(i->rtscts_rate, AR_RTSCTSRate);
49050
49051 - ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49052 - ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49053 - ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49054 + ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
49055 + ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
49056 + ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
49057 }
49058
49059 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49060 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49061 index 057b165..98ae88f 100644
49062 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49063 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49064 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49065 (i->qcu << AR_TxQcuNum_S) | desc_len;
49066
49067 checksum += val;
49068 - ACCESS_ONCE(ads->info) = val;
49069 + ACCESS_ONCE_RW(ads->info) = val;
49070
49071 checksum += i->link;
49072 - ACCESS_ONCE(ads->link) = i->link;
49073 + ACCESS_ONCE_RW(ads->link) = i->link;
49074
49075 checksum += i->buf_addr[0];
49076 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49077 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49078 checksum += i->buf_addr[1];
49079 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49080 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49081 checksum += i->buf_addr[2];
49082 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49083 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49084 checksum += i->buf_addr[3];
49085 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49086 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49087
49088 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49089 - ACCESS_ONCE(ads->ctl3) = val;
49090 + ACCESS_ONCE_RW(ads->ctl3) = val;
49091 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49092 - ACCESS_ONCE(ads->ctl5) = val;
49093 + ACCESS_ONCE_RW(ads->ctl5) = val;
49094 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49095 - ACCESS_ONCE(ads->ctl7) = val;
49096 + ACCESS_ONCE_RW(ads->ctl7) = val;
49097 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49098 - ACCESS_ONCE(ads->ctl9) = val;
49099 + ACCESS_ONCE_RW(ads->ctl9) = val;
49100
49101 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49102 - ACCESS_ONCE(ads->ctl10) = checksum;
49103 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
49104
49105 if (i->is_first || i->is_last) {
49106 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49107 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49108 | set11nTries(i->rates, 1)
49109 | set11nTries(i->rates, 2)
49110 | set11nTries(i->rates, 3)
49111 | (i->dur_update ? AR_DurUpdateEna : 0)
49112 | SM(0, AR_BurstDur);
49113
49114 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49115 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49116 | set11nRate(i->rates, 1)
49117 | set11nRate(i->rates, 2)
49118 | set11nRate(i->rates, 3);
49119 } else {
49120 - ACCESS_ONCE(ads->ctl13) = 0;
49121 - ACCESS_ONCE(ads->ctl14) = 0;
49122 + ACCESS_ONCE_RW(ads->ctl13) = 0;
49123 + ACCESS_ONCE_RW(ads->ctl14) = 0;
49124 }
49125
49126 ads->ctl20 = 0;
49127 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49128
49129 ctl17 = SM(i->keytype, AR_EncrType);
49130 if (!i->is_first) {
49131 - ACCESS_ONCE(ads->ctl11) = 0;
49132 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49133 - ACCESS_ONCE(ads->ctl15) = 0;
49134 - ACCESS_ONCE(ads->ctl16) = 0;
49135 - ACCESS_ONCE(ads->ctl17) = ctl17;
49136 - ACCESS_ONCE(ads->ctl18) = 0;
49137 - ACCESS_ONCE(ads->ctl19) = 0;
49138 + ACCESS_ONCE_RW(ads->ctl11) = 0;
49139 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49140 + ACCESS_ONCE_RW(ads->ctl15) = 0;
49141 + ACCESS_ONCE_RW(ads->ctl16) = 0;
49142 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49143 + ACCESS_ONCE_RW(ads->ctl18) = 0;
49144 + ACCESS_ONCE_RW(ads->ctl19) = 0;
49145 return;
49146 }
49147
49148 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49149 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49150 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49151 | SM(i->txpower, AR_XmitPower0)
49152 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49153 @@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49154 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49155 ctl12 |= SM(val, AR_PAPRDChainMask);
49156
49157 - ACCESS_ONCE(ads->ctl12) = ctl12;
49158 - ACCESS_ONCE(ads->ctl17) = ctl17;
49159 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49160 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49161
49162 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49163 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49164 | set11nPktDurRTSCTS(i->rates, 1);
49165
49166 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49167 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49168 | set11nPktDurRTSCTS(i->rates, 3);
49169
49170 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49171 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49172 | set11nRateFlags(i->rates, 1)
49173 | set11nRateFlags(i->rates, 2)
49174 | set11nRateFlags(i->rates, 3)
49175 | SM(i->rtscts_rate, AR_RTSCTSRate);
49176
49177 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49178 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49179
49180 - ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49181 - ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49182 - ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49183 + ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49184 + ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49185 + ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49186 }
49187
49188 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49189 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49190 index e8e8dd2..030f80e 100644
49191 --- a/drivers/net/wireless/ath/ath9k/hw.h
49192 +++ b/drivers/net/wireless/ath/ath9k/hw.h
49193 @@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49194
49195 /* ANI */
49196 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49197 -};
49198 +} __no_const;
49199
49200 /**
49201 * struct ath_spec_scan - parameters for Atheros spectral scan
49202 @@ -708,7 +708,7 @@ struct ath_hw_ops {
49203 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49204 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49205 #endif
49206 -};
49207 +} __no_const;
49208
49209 struct ath_nf_limits {
49210 s16 max;
49211 diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49212 index 4f18a6b..b07d92f 100644
49213 --- a/drivers/net/wireless/ath/ath9k/main.c
49214 +++ b/drivers/net/wireless/ath/ath9k/main.c
49215 @@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49216 if (!ath9k_is_chanctx_enabled())
49217 return;
49218
49219 - ath9k_ops.hw_scan = ath9k_hw_scan;
49220 - ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49221 - ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49222 - ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49223 - ath9k_ops.add_chanctx = ath9k_add_chanctx;
49224 - ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49225 - ath9k_ops.change_chanctx = ath9k_change_chanctx;
49226 - ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49227 - ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49228 - ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49229 + pax_open_kernel();
49230 + *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49231 + *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49232 + *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49233 + *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49234 + *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49235 + *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49236 + *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49237 + *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49238 + *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49239 + *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49240 + pax_close_kernel();
49241 }
49242
49243 #endif
49244 diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49245 index 058a9f2..d5cb1ba 100644
49246 --- a/drivers/net/wireless/b43/phy_lp.c
49247 +++ b/drivers/net/wireless/b43/phy_lp.c
49248 @@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49249 {
49250 struct ssb_bus *bus = dev->dev->sdev->bus;
49251
49252 - static const struct b206x_channel *chandata = NULL;
49253 + const struct b206x_channel *chandata = NULL;
49254 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49255 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49256 u16 old_comm15, scale;
49257 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49258 index dc1d20c..f7a4f06 100644
49259 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
49260 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49261 @@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49262 */
49263 if (il3945_mod_params.disable_hw_scan) {
49264 D_INFO("Disabling hw_scan\n");
49265 - il3945_mac_ops.hw_scan = NULL;
49266 + pax_open_kernel();
49267 + *(void **)&il3945_mac_ops.hw_scan = NULL;
49268 + pax_close_kernel();
49269 }
49270
49271 D_INFO("*** LOAD DRIVER ***\n");
49272 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49273 index 0ffb6ff..c0b7f0e 100644
49274 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49275 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49276 @@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49277 {
49278 struct iwl_priv *priv = file->private_data;
49279 char buf[64];
49280 - int buf_size;
49281 + size_t buf_size;
49282 u32 offset, len;
49283
49284 memset(buf, 0, sizeof(buf));
49285 @@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49286 struct iwl_priv *priv = file->private_data;
49287
49288 char buf[8];
49289 - int buf_size;
49290 + size_t buf_size;
49291 u32 reset_flag;
49292
49293 memset(buf, 0, sizeof(buf));
49294 @@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49295 {
49296 struct iwl_priv *priv = file->private_data;
49297 char buf[8];
49298 - int buf_size;
49299 + size_t buf_size;
49300 int ht40;
49301
49302 memset(buf, 0, sizeof(buf));
49303 @@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49304 {
49305 struct iwl_priv *priv = file->private_data;
49306 char buf[8];
49307 - int buf_size;
49308 + size_t buf_size;
49309 int value;
49310
49311 memset(buf, 0, sizeof(buf));
49312 @@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49313 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49314 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49315
49316 -static const char *fmt_value = " %-30s %10u\n";
49317 -static const char *fmt_hex = " %-30s 0x%02X\n";
49318 -static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49319 -static const char *fmt_header =
49320 +static const char fmt_value[] = " %-30s %10u\n";
49321 +static const char fmt_hex[] = " %-30s 0x%02X\n";
49322 +static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49323 +static const char fmt_header[] =
49324 "%-32s current cumulative delta max\n";
49325
49326 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49327 @@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49328 {
49329 struct iwl_priv *priv = file->private_data;
49330 char buf[8];
49331 - int buf_size;
49332 + size_t buf_size;
49333 int clear;
49334
49335 memset(buf, 0, sizeof(buf));
49336 @@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49337 {
49338 struct iwl_priv *priv = file->private_data;
49339 char buf[8];
49340 - int buf_size;
49341 + size_t buf_size;
49342 int trace;
49343
49344 memset(buf, 0, sizeof(buf));
49345 @@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49346 {
49347 struct iwl_priv *priv = file->private_data;
49348 char buf[8];
49349 - int buf_size;
49350 + size_t buf_size;
49351 int missed;
49352
49353 memset(buf, 0, sizeof(buf));
49354 @@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49355
49356 struct iwl_priv *priv = file->private_data;
49357 char buf[8];
49358 - int buf_size;
49359 + size_t buf_size;
49360 int plcp;
49361
49362 memset(buf, 0, sizeof(buf));
49363 @@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49364
49365 struct iwl_priv *priv = file->private_data;
49366 char buf[8];
49367 - int buf_size;
49368 + size_t buf_size;
49369 int flush;
49370
49371 memset(buf, 0, sizeof(buf));
49372 @@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49373
49374 struct iwl_priv *priv = file->private_data;
49375 char buf[8];
49376 - int buf_size;
49377 + size_t buf_size;
49378 int rts;
49379
49380 if (!priv->cfg->ht_params)
49381 @@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49382 {
49383 struct iwl_priv *priv = file->private_data;
49384 char buf[8];
49385 - int buf_size;
49386 + size_t buf_size;
49387
49388 memset(buf, 0, sizeof(buf));
49389 buf_size = min(count, sizeof(buf) - 1);
49390 @@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49391 struct iwl_priv *priv = file->private_data;
49392 u32 event_log_flag;
49393 char buf[8];
49394 - int buf_size;
49395 + size_t buf_size;
49396
49397 /* check that the interface is up */
49398 if (!iwl_is_ready(priv))
49399 @@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49400 struct iwl_priv *priv = file->private_data;
49401 char buf[8];
49402 u32 calib_disabled;
49403 - int buf_size;
49404 + size_t buf_size;
49405
49406 memset(buf, 0, sizeof(buf));
49407 buf_size = min(count, sizeof(buf) - 1);
49408 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49409 index dd2f3f8..fb1ae88 100644
49410 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49411 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49412 @@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49413 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49414
49415 char buf[8];
49416 - int buf_size;
49417 + size_t buf_size;
49418 u32 reset_flag;
49419
49420 memset(buf, 0, sizeof(buf));
49421 @@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49422 {
49423 struct iwl_trans *trans = file->private_data;
49424 char buf[8];
49425 - int buf_size;
49426 + size_t buf_size;
49427 int csr;
49428
49429 memset(buf, 0, sizeof(buf));
49430 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49431 index c9ad4cf..49a2fa0 100644
49432 --- a/drivers/net/wireless/mac80211_hwsim.c
49433 +++ b/drivers/net/wireless/mac80211_hwsim.c
49434 @@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49435 if (channels < 1)
49436 return -EINVAL;
49437
49438 - mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49439 - mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49440 - mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49441 - mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49442 - mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49443 - mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49444 - mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49445 - mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49446 - mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49447 - mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49448 - mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49449 - mac80211_hwsim_assign_vif_chanctx;
49450 - mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49451 - mac80211_hwsim_unassign_vif_chanctx;
49452 + pax_open_kernel();
49453 + memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49454 + *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49455 + *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49456 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49457 + *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49458 + *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49459 + *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49460 + *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49461 + *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49462 + *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49463 + *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49464 + *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49465 + pax_close_kernel();
49466
49467 spin_lock_init(&hwsim_radio_lock);
49468 INIT_LIST_HEAD(&hwsim_radios);
49469 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49470 index 1a4facd..a2ecbbd 100644
49471 --- a/drivers/net/wireless/rndis_wlan.c
49472 +++ b/drivers/net/wireless/rndis_wlan.c
49473 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49474
49475 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49476
49477 - if (rts_threshold < 0 || rts_threshold > 2347)
49478 + if (rts_threshold > 2347)
49479 rts_threshold = 2347;
49480
49481 tmp = cpu_to_le32(rts_threshold);
49482 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49483 index d13f25c..2573994 100644
49484 --- a/drivers/net/wireless/rt2x00/rt2x00.h
49485 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
49486 @@ -375,7 +375,7 @@ struct rt2x00_intf {
49487 * for hardware which doesn't support hardware
49488 * sequence counting.
49489 */
49490 - atomic_t seqno;
49491 + atomic_unchecked_t seqno;
49492 };
49493
49494 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49495 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49496 index 66ff364..3ce34f7 100644
49497 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49498 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49499 @@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49500 * sequence counter given by mac80211.
49501 */
49502 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49503 - seqno = atomic_add_return(0x10, &intf->seqno);
49504 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49505 else
49506 - seqno = atomic_read(&intf->seqno);
49507 + seqno = atomic_read_unchecked(&intf->seqno);
49508
49509 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49510 hdr->seq_ctrl |= cpu_to_le16(seqno);
49511 diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49512 index b661f896..ddf7d2b 100644
49513 --- a/drivers/net/wireless/ti/wl1251/sdio.c
49514 +++ b/drivers/net/wireless/ti/wl1251/sdio.c
49515 @@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49516
49517 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49518
49519 - wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49520 - wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49521 + pax_open_kernel();
49522 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49523 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49524 + pax_close_kernel();
49525
49526 wl1251_info("using dedicated interrupt line");
49527 } else {
49528 - wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49529 - wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49530 + pax_open_kernel();
49531 + *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49532 + *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49533 + pax_close_kernel();
49534
49535 wl1251_info("using SDIO interrupt");
49536 }
49537 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49538 index 0bccf12..3d95068 100644
49539 --- a/drivers/net/wireless/ti/wl12xx/main.c
49540 +++ b/drivers/net/wireless/ti/wl12xx/main.c
49541 @@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49542 sizeof(wl->conf.mem));
49543
49544 /* read data preparation is only needed by wl127x */
49545 - wl->ops->prepare_read = wl127x_prepare_read;
49546 + pax_open_kernel();
49547 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49548 + pax_close_kernel();
49549
49550 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49551 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49552 @@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49553 sizeof(wl->conf.mem));
49554
49555 /* read data preparation is only needed by wl127x */
49556 - wl->ops->prepare_read = wl127x_prepare_read;
49557 + pax_open_kernel();
49558 + *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49559 + pax_close_kernel();
49560
49561 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49562 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49563 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49564 index 7af1936..128bb35 100644
49565 --- a/drivers/net/wireless/ti/wl18xx/main.c
49566 +++ b/drivers/net/wireless/ti/wl18xx/main.c
49567 @@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49568 }
49569
49570 if (!checksum_param) {
49571 - wl18xx_ops.set_rx_csum = NULL;
49572 - wl18xx_ops.init_vif = NULL;
49573 + pax_open_kernel();
49574 + *(void **)&wl18xx_ops.set_rx_csum = NULL;
49575 + *(void **)&wl18xx_ops.init_vif = NULL;
49576 + pax_close_kernel();
49577 }
49578
49579 /* Enable 11a Band only if we have 5G antennas */
49580 diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49581 index a912dc0..a8225ba 100644
49582 --- a/drivers/net/wireless/zd1211rw/zd_usb.c
49583 +++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49584 @@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49585 {
49586 struct zd_usb *usb = urb->context;
49587 struct zd_usb_interrupt *intr = &usb->intr;
49588 - int len;
49589 + unsigned int len;
49590 u16 int_num;
49591
49592 ZD_ASSERT(in_interrupt());
49593 diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49594 index 683671a..4519fc2 100644
49595 --- a/drivers/nfc/nfcwilink.c
49596 +++ b/drivers/nfc/nfcwilink.c
49597 @@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49598
49599 static int nfcwilink_probe(struct platform_device *pdev)
49600 {
49601 - static struct nfcwilink *drv;
49602 + struct nfcwilink *drv;
49603 int rc;
49604 __u32 protocols;
49605
49606 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49607 index d93b2b6..ae50401 100644
49608 --- a/drivers/oprofile/buffer_sync.c
49609 +++ b/drivers/oprofile/buffer_sync.c
49610 @@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49611 if (cookie == NO_COOKIE)
49612 offset = pc;
49613 if (cookie == INVALID_COOKIE) {
49614 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49615 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49616 offset = pc;
49617 }
49618 if (cookie != last_cookie) {
49619 @@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49620 /* add userspace sample */
49621
49622 if (!mm) {
49623 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
49624 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49625 return 0;
49626 }
49627
49628 cookie = lookup_dcookie(mm, s->eip, &offset);
49629
49630 if (cookie == INVALID_COOKIE) {
49631 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49632 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49633 return 0;
49634 }
49635
49636 @@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49637 /* ignore backtraces if failed to add a sample */
49638 if (state == sb_bt_start) {
49639 state = sb_bt_ignore;
49640 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49641 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49642 }
49643 }
49644 release_mm(mm);
49645 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49646 index c0cc4e7..44d4e54 100644
49647 --- a/drivers/oprofile/event_buffer.c
49648 +++ b/drivers/oprofile/event_buffer.c
49649 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49650 }
49651
49652 if (buffer_pos == buffer_size) {
49653 - atomic_inc(&oprofile_stats.event_lost_overflow);
49654 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49655 return;
49656 }
49657
49658 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49659 index ed2c3ec..deda85a 100644
49660 --- a/drivers/oprofile/oprof.c
49661 +++ b/drivers/oprofile/oprof.c
49662 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49663 if (oprofile_ops.switch_events())
49664 return;
49665
49666 - atomic_inc(&oprofile_stats.multiplex_counter);
49667 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49668 start_switch_worker();
49669 }
49670
49671 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49672 index ee2cfce..7f8f699 100644
49673 --- a/drivers/oprofile/oprofile_files.c
49674 +++ b/drivers/oprofile/oprofile_files.c
49675 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49676
49677 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49678
49679 -static ssize_t timeout_read(struct file *file, char __user *buf,
49680 +static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49681 size_t count, loff_t *offset)
49682 {
49683 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49684 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49685 index 59659ce..6c860a0 100644
49686 --- a/drivers/oprofile/oprofile_stats.c
49687 +++ b/drivers/oprofile/oprofile_stats.c
49688 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49689 cpu_buf->sample_invalid_eip = 0;
49690 }
49691
49692 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49693 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49694 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
49695 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49696 - atomic_set(&oprofile_stats.multiplex_counter, 0);
49697 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49698 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49699 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49700 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49701 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49702 }
49703
49704
49705 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49706 index 1fc622b..8c48fc3 100644
49707 --- a/drivers/oprofile/oprofile_stats.h
49708 +++ b/drivers/oprofile/oprofile_stats.h
49709 @@ -13,11 +13,11 @@
49710 #include <linux/atomic.h>
49711
49712 struct oprofile_stat_struct {
49713 - atomic_t sample_lost_no_mm;
49714 - atomic_t sample_lost_no_mapping;
49715 - atomic_t bt_lost_no_mapping;
49716 - atomic_t event_lost_overflow;
49717 - atomic_t multiplex_counter;
49718 + atomic_unchecked_t sample_lost_no_mm;
49719 + atomic_unchecked_t sample_lost_no_mapping;
49720 + atomic_unchecked_t bt_lost_no_mapping;
49721 + atomic_unchecked_t event_lost_overflow;
49722 + atomic_unchecked_t multiplex_counter;
49723 };
49724
49725 extern struct oprofile_stat_struct oprofile_stats;
49726 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49727 index 3f49345..c750d0b 100644
49728 --- a/drivers/oprofile/oprofilefs.c
49729 +++ b/drivers/oprofile/oprofilefs.c
49730 @@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49731
49732 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49733 {
49734 - atomic_t *val = file->private_data;
49735 - return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49736 + atomic_unchecked_t *val = file->private_data;
49737 + return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49738 }
49739
49740
49741 @@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49742
49743
49744 int oprofilefs_create_ro_atomic(struct dentry *root,
49745 - char const *name, atomic_t *val)
49746 + char const *name, atomic_unchecked_t *val)
49747 {
49748 return __oprofilefs_create_file(root, name,
49749 &atomic_ro_fops, 0444, val);
49750 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49751 index bdef916..88c7dee 100644
49752 --- a/drivers/oprofile/timer_int.c
49753 +++ b/drivers/oprofile/timer_int.c
49754 @@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49755 return NOTIFY_OK;
49756 }
49757
49758 -static struct notifier_block __refdata oprofile_cpu_notifier = {
49759 +static struct notifier_block oprofile_cpu_notifier = {
49760 .notifier_call = oprofile_cpu_notify,
49761 };
49762
49763 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49764 index 3b47080..6cd05dd 100644
49765 --- a/drivers/parport/procfs.c
49766 +++ b/drivers/parport/procfs.c
49767 @@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49768
49769 *ppos += len;
49770
49771 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49772 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49773 }
49774
49775 #ifdef CONFIG_PARPORT_1284
49776 @@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49777
49778 *ppos += len;
49779
49780 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49781 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49782 }
49783 #endif /* IEEE1284.3 support. */
49784
49785 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49786 index 6ca2399..68d866b 100644
49787 --- a/drivers/pci/hotplug/acpiphp_ibm.c
49788 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
49789 @@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49790 goto init_cleanup;
49791 }
49792
49793 - ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49794 + pax_open_kernel();
49795 + *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49796 + pax_close_kernel();
49797 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49798
49799 return retval;
49800 diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49801 index 66b7bbe..26bee78 100644
49802 --- a/drivers/pci/hotplug/cpcihp_generic.c
49803 +++ b/drivers/pci/hotplug/cpcihp_generic.c
49804 @@ -73,7 +73,6 @@ static u16 port;
49805 static unsigned int enum_bit;
49806 static u8 enum_mask;
49807
49808 -static struct cpci_hp_controller_ops generic_hpc_ops;
49809 static struct cpci_hp_controller generic_hpc;
49810
49811 static int __init validate_parameters(void)
49812 @@ -139,6 +138,10 @@ static int query_enum(void)
49813 return ((value & enum_mask) == enum_mask);
49814 }
49815
49816 +static struct cpci_hp_controller_ops generic_hpc_ops = {
49817 + .query_enum = query_enum,
49818 +};
49819 +
49820 static int __init cpcihp_generic_init(void)
49821 {
49822 int status;
49823 @@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49824 pci_dev_put(dev);
49825
49826 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49827 - generic_hpc_ops.query_enum = query_enum;
49828 generic_hpc.ops = &generic_hpc_ops;
49829
49830 status = cpci_hp_register_controller(&generic_hpc);
49831 diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49832 index 7ecf34e..effed62 100644
49833 --- a/drivers/pci/hotplug/cpcihp_zt5550.c
49834 +++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49835 @@ -59,7 +59,6 @@
49836 /* local variables */
49837 static bool debug;
49838 static bool poll;
49839 -static struct cpci_hp_controller_ops zt5550_hpc_ops;
49840 static struct cpci_hp_controller zt5550_hpc;
49841
49842 /* Primary cPCI bus bridge device */
49843 @@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49844 return 0;
49845 }
49846
49847 +static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49848 + .query_enum = zt5550_hc_query_enum,
49849 +};
49850 +
49851 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49852 {
49853 int status;
49854 @@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49855 dbg("returned from zt5550_hc_config");
49856
49857 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49858 - zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49859 zt5550_hpc.ops = &zt5550_hpc_ops;
49860 if (!poll) {
49861 zt5550_hpc.irq = hc_dev->irq;
49862 zt5550_hpc.irq_flags = IRQF_SHARED;
49863 zt5550_hpc.dev_id = hc_dev;
49864
49865 - zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49866 - zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49867 - zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49868 + pax_open_kernel();
49869 + *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49870 + *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49871 + *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49872 + pax_open_kernel();
49873 } else {
49874 info("using ENUM# polling mode");
49875 }
49876 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49877 index 1e08ff8c..3cd145f 100644
49878 --- a/drivers/pci/hotplug/cpqphp_nvram.c
49879 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
49880 @@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49881
49882 void compaq_nvram_init (void __iomem *rom_start)
49883 {
49884 +#ifndef CONFIG_PAX_KERNEXEC
49885 if (rom_start)
49886 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49887 +#endif
49888
49889 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49890
49891 diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49892 index 56d8486..f26113f 100644
49893 --- a/drivers/pci/hotplug/pci_hotplug_core.c
49894 +++ b/drivers/pci/hotplug/pci_hotplug_core.c
49895 @@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49896 return -EINVAL;
49897 }
49898
49899 - slot->ops->owner = owner;
49900 - slot->ops->mod_name = mod_name;
49901 + pax_open_kernel();
49902 + *(struct module **)&slot->ops->owner = owner;
49903 + *(const char **)&slot->ops->mod_name = mod_name;
49904 + pax_close_kernel();
49905
49906 mutex_lock(&pci_hp_mutex);
49907 /*
49908 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49909 index 07aa722..84514b4 100644
49910 --- a/drivers/pci/hotplug/pciehp_core.c
49911 +++ b/drivers/pci/hotplug/pciehp_core.c
49912 @@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49913 struct slot *slot = ctrl->slot;
49914 struct hotplug_slot *hotplug = NULL;
49915 struct hotplug_slot_info *info = NULL;
49916 - struct hotplug_slot_ops *ops = NULL;
49917 + hotplug_slot_ops_no_const *ops = NULL;
49918 char name[SLOT_NAME_SIZE];
49919 int retval = -ENOMEM;
49920
49921 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49922 index 084587d..4a8f9df 100644
49923 --- a/drivers/pci/msi.c
49924 +++ b/drivers/pci/msi.c
49925 @@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49926 {
49927 struct attribute **msi_attrs;
49928 struct attribute *msi_attr;
49929 - struct device_attribute *msi_dev_attr;
49930 - struct attribute_group *msi_irq_group;
49931 + device_attribute_no_const *msi_dev_attr;
49932 + attribute_group_no_const *msi_irq_group;
49933 const struct attribute_group **msi_irq_groups;
49934 struct msi_desc *entry;
49935 int ret = -ENOMEM;
49936 @@ -549,7 +549,7 @@ error_attrs:
49937 count = 0;
49938 msi_attr = msi_attrs[count];
49939 while (msi_attr) {
49940 - msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49941 + msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49942 kfree(msi_attr->name);
49943 kfree(msi_dev_attr);
49944 ++count;
49945 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49946 index 2c6643f..3a6d8e0 100644
49947 --- a/drivers/pci/pci-sysfs.c
49948 +++ b/drivers/pci/pci-sysfs.c
49949 @@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
49950 {
49951 /* allocate attribute structure, piggyback attribute name */
49952 int name_len = write_combine ? 13 : 10;
49953 - struct bin_attribute *res_attr;
49954 + bin_attribute_no_const *res_attr;
49955 int retval;
49956
49957 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
49958 @@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
49959 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
49960 {
49961 int retval;
49962 - struct bin_attribute *attr;
49963 + bin_attribute_no_const *attr;
49964
49965 /* If the device has VPD, try to expose it in sysfs. */
49966 if (dev->vpd) {
49967 @@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
49968 {
49969 int retval;
49970 int rom_size = 0;
49971 - struct bin_attribute *attr;
49972 + bin_attribute_no_const *attr;
49973
49974 if (!sysfs_initialized)
49975 return -EACCES;
49976 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
49977 index 4a3902d..7f1fc42 100644
49978 --- a/drivers/pci/pci.h
49979 +++ b/drivers/pci/pci.h
49980 @@ -93,7 +93,7 @@ struct pci_vpd_ops {
49981 struct pci_vpd {
49982 unsigned int len;
49983 const struct pci_vpd_ops *ops;
49984 - struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
49985 + bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
49986 };
49987
49988 int pci_vpd_pci22_init(struct pci_dev *dev);
49989 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
49990 index e1e7026..d28dd33 100644
49991 --- a/drivers/pci/pcie/aspm.c
49992 +++ b/drivers/pci/pcie/aspm.c
49993 @@ -27,9 +27,9 @@
49994 #define MODULE_PARAM_PREFIX "pcie_aspm."
49995
49996 /* Note: those are not register definitions */
49997 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
49998 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
49999 -#define ASPM_STATE_L1 (4) /* L1 state */
50000 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50001 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50002 +#define ASPM_STATE_L1 (4U) /* L1 state */
50003 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50004 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50005
50006 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50007 index 3010ffc..5e2e133 100644
50008 --- a/drivers/pci/probe.c
50009 +++ b/drivers/pci/probe.c
50010 @@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50011 struct pci_bus_region region, inverted_region;
50012 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
50013
50014 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50015 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50016
50017 /* No printks while decoding is disabled! */
50018 if (!dev->mmio_always_on) {
50019 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50020 index 3f155e7..0f4b1f0 100644
50021 --- a/drivers/pci/proc.c
50022 +++ b/drivers/pci/proc.c
50023 @@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50024 static int __init pci_proc_init(void)
50025 {
50026 struct pci_dev *dev = NULL;
50027 +
50028 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
50029 +#ifdef CONFIG_GRKERNSEC_PROC_USER
50030 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50031 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50032 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50033 +#endif
50034 +#else
50035 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
50036 +#endif
50037 proc_create("devices", 0, proc_bus_pci_dir,
50038 &proc_bus_pci_dev_operations);
50039 proc_initialized = 1;
50040 diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
50041 index d866db8..c827d1f 100644
50042 --- a/drivers/platform/chrome/chromeos_laptop.c
50043 +++ b/drivers/platform/chrome/chromeos_laptop.c
50044 @@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50045 .callback = chromeos_laptop_dmi_matched, \
50046 .driver_data = (void *)&board_
50047
50048 -static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50049 +static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50050 {
50051 .ident = "Samsung Series 5 550",
50052 .matches = {
50053 diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50054 index c5af23b..3d62d5e 100644
50055 --- a/drivers/platform/x86/alienware-wmi.c
50056 +++ b/drivers/platform/x86/alienware-wmi.c
50057 @@ -150,7 +150,7 @@ struct wmax_led_args {
50058 } __packed;
50059
50060 static struct platform_device *platform_device;
50061 -static struct device_attribute *zone_dev_attrs;
50062 +static device_attribute_no_const *zone_dev_attrs;
50063 static struct attribute **zone_attrs;
50064 static struct platform_zone *zone_data;
50065
50066 @@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
50067 }
50068 };
50069
50070 -static struct attribute_group zone_attribute_group = {
50071 +static attribute_group_no_const zone_attribute_group = {
50072 .name = "rgb_zones",
50073 };
50074
50075 diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50076 index 21fc932..ee9394a 100644
50077 --- a/drivers/platform/x86/asus-wmi.c
50078 +++ b/drivers/platform/x86/asus-wmi.c
50079 @@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
50080 int err;
50081 u32 retval = -1;
50082
50083 +#ifdef CONFIG_GRKERNSEC_KMEM
50084 + return -EPERM;
50085 +#endif
50086 +
50087 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50088
50089 if (err < 0)
50090 @@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
50091 int err;
50092 u32 retval = -1;
50093
50094 +#ifdef CONFIG_GRKERNSEC_KMEM
50095 + return -EPERM;
50096 +#endif
50097 +
50098 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50099 &retval);
50100
50101 @@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
50102 union acpi_object *obj;
50103 acpi_status status;
50104
50105 +#ifdef CONFIG_GRKERNSEC_KMEM
50106 + return -EPERM;
50107 +#endif
50108 +
50109 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50110 1, asus->debug.method_id,
50111 &input, &output);
50112 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50113 index 62f8030..c7f2a45 100644
50114 --- a/drivers/platform/x86/msi-laptop.c
50115 +++ b/drivers/platform/x86/msi-laptop.c
50116 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50117
50118 if (!quirks->ec_read_only) {
50119 /* allow userland write sysfs file */
50120 - dev_attr_bluetooth.store = store_bluetooth;
50121 - dev_attr_wlan.store = store_wlan;
50122 - dev_attr_threeg.store = store_threeg;
50123 - dev_attr_bluetooth.attr.mode |= S_IWUSR;
50124 - dev_attr_wlan.attr.mode |= S_IWUSR;
50125 - dev_attr_threeg.attr.mode |= S_IWUSR;
50126 + pax_open_kernel();
50127 + *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50128 + *(void **)&dev_attr_wlan.store = store_wlan;
50129 + *(void **)&dev_attr_threeg.store = store_threeg;
50130 + *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50131 + *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50132 + *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50133 + pax_close_kernel();
50134 }
50135
50136 /* disable hardware control by fn key */
50137 diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50138 index 70222f2..8c8ce66 100644
50139 --- a/drivers/platform/x86/msi-wmi.c
50140 +++ b/drivers/platform/x86/msi-wmi.c
50141 @@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50142 static void msi_wmi_notify(u32 value, void *context)
50143 {
50144 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50145 - static struct key_entry *key;
50146 + struct key_entry *key;
50147 union acpi_object *obj;
50148 acpi_status status;
50149
50150 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50151 index 26ad9ff..7c52909 100644
50152 --- a/drivers/platform/x86/sony-laptop.c
50153 +++ b/drivers/platform/x86/sony-laptop.c
50154 @@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50155 }
50156
50157 /* High speed charging function */
50158 -static struct device_attribute *hsc_handle;
50159 +static device_attribute_no_const *hsc_handle;
50160
50161 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50162 struct device_attribute *attr,
50163 @@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50164 }
50165
50166 /* low battery function */
50167 -static struct device_attribute *lowbatt_handle;
50168 +static device_attribute_no_const *lowbatt_handle;
50169
50170 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50171 struct device_attribute *attr,
50172 @@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50173 }
50174
50175 /* fan speed function */
50176 -static struct device_attribute *fan_handle, *hsf_handle;
50177 +static device_attribute_no_const *fan_handle, *hsf_handle;
50178
50179 static ssize_t sony_nc_hsfan_store(struct device *dev,
50180 struct device_attribute *attr,
50181 @@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50182 }
50183
50184 /* USB charge function */
50185 -static struct device_attribute *uc_handle;
50186 +static device_attribute_no_const *uc_handle;
50187
50188 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50189 struct device_attribute *attr,
50190 @@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50191 }
50192
50193 /* Panel ID function */
50194 -static struct device_attribute *panel_handle;
50195 +static device_attribute_no_const *panel_handle;
50196
50197 static ssize_t sony_nc_panelid_show(struct device *dev,
50198 struct device_attribute *attr, char *buffer)
50199 @@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50200 }
50201
50202 /* smart connect function */
50203 -static struct device_attribute *sc_handle;
50204 +static device_attribute_no_const *sc_handle;
50205
50206 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50207 struct device_attribute *attr,
50208 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50209 index cf0f893..5955997 100644
50210 --- a/drivers/platform/x86/thinkpad_acpi.c
50211 +++ b/drivers/platform/x86/thinkpad_acpi.c
50212 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50213 return 0;
50214 }
50215
50216 -void static hotkey_mask_warn_incomplete_mask(void)
50217 +static void hotkey_mask_warn_incomplete_mask(void)
50218 {
50219 /* log only what the user can fix... */
50220 const u32 wantedmask = hotkey_driver_mask &
50221 @@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50222 && !tp_features.bright_unkfw)
50223 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50224 }
50225 +}
50226
50227 #undef TPACPI_COMPARE_KEY
50228 #undef TPACPI_MAY_SEND_KEY
50229 -}
50230
50231 /*
50232 * Polling driver
50233 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50234 index 438d4c7..ca8a2fb 100644
50235 --- a/drivers/pnp/pnpbios/bioscalls.c
50236 +++ b/drivers/pnp/pnpbios/bioscalls.c
50237 @@ -59,7 +59,7 @@ do { \
50238 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50239 } while(0)
50240
50241 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50242 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50243 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50244
50245 /*
50246 @@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50247
50248 cpu = get_cpu();
50249 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50250 +
50251 + pax_open_kernel();
50252 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50253 + pax_close_kernel();
50254
50255 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50256 spin_lock_irqsave(&pnp_bios_lock, flags);
50257 @@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50258 :"memory");
50259 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50260
50261 + pax_open_kernel();
50262 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50263 + pax_close_kernel();
50264 +
50265 put_cpu();
50266
50267 /* If we get here and this is set then the PnP BIOS faulted on us. */
50268 @@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50269 return status;
50270 }
50271
50272 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
50273 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50274 {
50275 int i;
50276
50277 @@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50278 pnp_bios_callpoint.offset = header->fields.pm16offset;
50279 pnp_bios_callpoint.segment = PNP_CS16;
50280
50281 + pax_open_kernel();
50282 +
50283 for_each_possible_cpu(i) {
50284 struct desc_struct *gdt = get_cpu_gdt_table(i);
50285 if (!gdt)
50286 @@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50287 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50288 (unsigned long)__va(header->fields.pm16dseg));
50289 }
50290 +
50291 + pax_close_kernel();
50292 }
50293 diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50294 index 0c52e2a..3421ab7 100644
50295 --- a/drivers/power/pda_power.c
50296 +++ b/drivers/power/pda_power.c
50297 @@ -37,7 +37,11 @@ static int polling;
50298
50299 #if IS_ENABLED(CONFIG_USB_PHY)
50300 static struct usb_phy *transceiver;
50301 -static struct notifier_block otg_nb;
50302 +static int otg_handle_notification(struct notifier_block *nb,
50303 + unsigned long event, void *unused);
50304 +static struct notifier_block otg_nb = {
50305 + .notifier_call = otg_handle_notification
50306 +};
50307 #endif
50308
50309 static struct regulator *ac_draw;
50310 @@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50311
50312 #if IS_ENABLED(CONFIG_USB_PHY)
50313 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50314 - otg_nb.notifier_call = otg_handle_notification;
50315 ret = usb_register_notifier(transceiver, &otg_nb);
50316 if (ret) {
50317 dev_err(dev, "failure to register otg notifier\n");
50318 diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50319 index cc439fd..8fa30df 100644
50320 --- a/drivers/power/power_supply.h
50321 +++ b/drivers/power/power_supply.h
50322 @@ -16,12 +16,12 @@ struct power_supply;
50323
50324 #ifdef CONFIG_SYSFS
50325
50326 -extern void power_supply_init_attrs(struct device_type *dev_type);
50327 +extern void power_supply_init_attrs(void);
50328 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50329
50330 #else
50331
50332 -static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50333 +static inline void power_supply_init_attrs(void) {}
50334 #define power_supply_uevent NULL
50335
50336 #endif /* CONFIG_SYSFS */
50337 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50338 index 694e8cd..9f03483 100644
50339 --- a/drivers/power/power_supply_core.c
50340 +++ b/drivers/power/power_supply_core.c
50341 @@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50342 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50343 EXPORT_SYMBOL_GPL(power_supply_notifier);
50344
50345 -static struct device_type power_supply_dev_type;
50346 +extern const struct attribute_group *power_supply_attr_groups[];
50347 +static struct device_type power_supply_dev_type = {
50348 + .groups = power_supply_attr_groups,
50349 +};
50350
50351 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50352 struct power_supply *supply)
50353 @@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50354 return PTR_ERR(power_supply_class);
50355
50356 power_supply_class->dev_uevent = power_supply_uevent;
50357 - power_supply_init_attrs(&power_supply_dev_type);
50358 + power_supply_init_attrs();
50359
50360 return 0;
50361 }
50362 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50363 index 62653f5..d0bb485 100644
50364 --- a/drivers/power/power_supply_sysfs.c
50365 +++ b/drivers/power/power_supply_sysfs.c
50366 @@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50367 .is_visible = power_supply_attr_is_visible,
50368 };
50369
50370 -static const struct attribute_group *power_supply_attr_groups[] = {
50371 +const struct attribute_group *power_supply_attr_groups[] = {
50372 &power_supply_attr_group,
50373 NULL,
50374 };
50375
50376 -void power_supply_init_attrs(struct device_type *dev_type)
50377 +void power_supply_init_attrs(void)
50378 {
50379 int i;
50380
50381 - dev_type->groups = power_supply_attr_groups;
50382 -
50383 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50384 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50385 }
50386 diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50387 index 84419af..268ede8 100644
50388 --- a/drivers/powercap/powercap_sys.c
50389 +++ b/drivers/powercap/powercap_sys.c
50390 @@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50391 struct device_attribute name_attr;
50392 };
50393
50394 +static ssize_t show_constraint_name(struct device *dev,
50395 + struct device_attribute *dev_attr,
50396 + char *buf);
50397 +
50398 static struct powercap_constraint_attr
50399 - constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50400 + constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50401 + [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50402 + .power_limit_attr = {
50403 + .attr = {
50404 + .name = NULL,
50405 + .mode = S_IWUSR | S_IRUGO
50406 + },
50407 + .show = show_constraint_power_limit_uw,
50408 + .store = store_constraint_power_limit_uw
50409 + },
50410 +
50411 + .time_window_attr = {
50412 + .attr = {
50413 + .name = NULL,
50414 + .mode = S_IWUSR | S_IRUGO
50415 + },
50416 + .show = show_constraint_time_window_us,
50417 + .store = store_constraint_time_window_us
50418 + },
50419 +
50420 + .max_power_attr = {
50421 + .attr = {
50422 + .name = NULL,
50423 + .mode = S_IRUGO
50424 + },
50425 + .show = show_constraint_max_power_uw,
50426 + .store = NULL
50427 + },
50428 +
50429 + .min_power_attr = {
50430 + .attr = {
50431 + .name = NULL,
50432 + .mode = S_IRUGO
50433 + },
50434 + .show = show_constraint_min_power_uw,
50435 + .store = NULL
50436 + },
50437 +
50438 + .max_time_window_attr = {
50439 + .attr = {
50440 + .name = NULL,
50441 + .mode = S_IRUGO
50442 + },
50443 + .show = show_constraint_max_time_window_us,
50444 + .store = NULL
50445 + },
50446 +
50447 + .min_time_window_attr = {
50448 + .attr = {
50449 + .name = NULL,
50450 + .mode = S_IRUGO
50451 + },
50452 + .show = show_constraint_min_time_window_us,
50453 + .store = NULL
50454 + },
50455 +
50456 + .name_attr = {
50457 + .attr = {
50458 + .name = NULL,
50459 + .mode = S_IRUGO
50460 + },
50461 + .show = show_constraint_name,
50462 + .store = NULL
50463 + }
50464 + }
50465 +};
50466
50467 /* A list of powercap control_types */
50468 static LIST_HEAD(powercap_cntrl_list);
50469 @@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50470 }
50471
50472 static int create_constraint_attribute(int id, const char *name,
50473 - int mode,
50474 - struct device_attribute *dev_attr,
50475 - ssize_t (*show)(struct device *,
50476 - struct device_attribute *, char *),
50477 - ssize_t (*store)(struct device *,
50478 - struct device_attribute *,
50479 - const char *, size_t)
50480 - )
50481 + struct device_attribute *dev_attr)
50482 {
50483 + name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50484
50485 - dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50486 - id, name);
50487 - if (!dev_attr->attr.name)
50488 + if (!name)
50489 return -ENOMEM;
50490 - dev_attr->attr.mode = mode;
50491 - dev_attr->show = show;
50492 - dev_attr->store = store;
50493 +
50494 + pax_open_kernel();
50495 + *(const char **)&dev_attr->attr.name = name;
50496 + pax_close_kernel();
50497
50498 return 0;
50499 }
50500 @@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50501
50502 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50503 ret = create_constraint_attribute(i, "power_limit_uw",
50504 - S_IWUSR | S_IRUGO,
50505 - &constraint_attrs[i].power_limit_attr,
50506 - show_constraint_power_limit_uw,
50507 - store_constraint_power_limit_uw);
50508 + &constraint_attrs[i].power_limit_attr);
50509 if (ret)
50510 goto err_alloc;
50511 ret = create_constraint_attribute(i, "time_window_us",
50512 - S_IWUSR | S_IRUGO,
50513 - &constraint_attrs[i].time_window_attr,
50514 - show_constraint_time_window_us,
50515 - store_constraint_time_window_us);
50516 + &constraint_attrs[i].time_window_attr);
50517 if (ret)
50518 goto err_alloc;
50519 - ret = create_constraint_attribute(i, "name", S_IRUGO,
50520 - &constraint_attrs[i].name_attr,
50521 - show_constraint_name,
50522 - NULL);
50523 + ret = create_constraint_attribute(i, "name",
50524 + &constraint_attrs[i].name_attr);
50525 if (ret)
50526 goto err_alloc;
50527 - ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50528 - &constraint_attrs[i].max_power_attr,
50529 - show_constraint_max_power_uw,
50530 - NULL);
50531 + ret = create_constraint_attribute(i, "max_power_uw",
50532 + &constraint_attrs[i].max_power_attr);
50533 if (ret)
50534 goto err_alloc;
50535 - ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50536 - &constraint_attrs[i].min_power_attr,
50537 - show_constraint_min_power_uw,
50538 - NULL);
50539 + ret = create_constraint_attribute(i, "min_power_uw",
50540 + &constraint_attrs[i].min_power_attr);
50541 if (ret)
50542 goto err_alloc;
50543 ret = create_constraint_attribute(i, "max_time_window_us",
50544 - S_IRUGO,
50545 - &constraint_attrs[i].max_time_window_attr,
50546 - show_constraint_max_time_window_us,
50547 - NULL);
50548 + &constraint_attrs[i].max_time_window_attr);
50549 if (ret)
50550 goto err_alloc;
50551 ret = create_constraint_attribute(i, "min_time_window_us",
50552 - S_IRUGO,
50553 - &constraint_attrs[i].min_time_window_attr,
50554 - show_constraint_min_time_window_us,
50555 - NULL);
50556 + &constraint_attrs[i].min_time_window_attr);
50557 if (ret)
50558 goto err_alloc;
50559
50560 @@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50561 power_zone->zone_dev_attrs[count++] =
50562 &dev_attr_max_energy_range_uj.attr;
50563 if (power_zone->ops->get_energy_uj) {
50564 + pax_open_kernel();
50565 if (power_zone->ops->reset_energy_uj)
50566 - dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50567 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50568 else
50569 - dev_attr_energy_uj.attr.mode = S_IRUGO;
50570 + *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50571 + pax_close_kernel();
50572 power_zone->zone_dev_attrs[count++] =
50573 &dev_attr_energy_uj.attr;
50574 }
50575 diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50576 index 9c5d414..c7900ce 100644
50577 --- a/drivers/ptp/ptp_private.h
50578 +++ b/drivers/ptp/ptp_private.h
50579 @@ -51,7 +51,7 @@ struct ptp_clock {
50580 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50581 wait_queue_head_t tsev_wq;
50582 int defunct; /* tells readers to go away when clock is being removed */
50583 - struct device_attribute *pin_dev_attr;
50584 + device_attribute_no_const *pin_dev_attr;
50585 struct attribute **pin_attr;
50586 struct attribute_group pin_attr_group;
50587 };
50588 diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50589 index 302e626..12579af 100644
50590 --- a/drivers/ptp/ptp_sysfs.c
50591 +++ b/drivers/ptp/ptp_sysfs.c
50592 @@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50593 goto no_pin_attr;
50594
50595 for (i = 0; i < n_pins; i++) {
50596 - struct device_attribute *da = &ptp->pin_dev_attr[i];
50597 + device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50598 sysfs_attr_init(&da->attr);
50599 da->attr.name = info->pin_config[i].name;
50600 da->attr.mode = 0644;
50601 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50602 index cd87c0c..715ecbe 100644
50603 --- a/drivers/regulator/core.c
50604 +++ b/drivers/regulator/core.c
50605 @@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50606 {
50607 const struct regulation_constraints *constraints = NULL;
50608 const struct regulator_init_data *init_data;
50609 - static atomic_t regulator_no = ATOMIC_INIT(0);
50610 + static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50611 struct regulator_dev *rdev;
50612 struct device *dev;
50613 int ret, i;
50614 @@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50615 rdev->dev.class = &regulator_class;
50616 rdev->dev.parent = dev;
50617 dev_set_name(&rdev->dev, "regulator.%d",
50618 - atomic_inc_return(&regulator_no) - 1);
50619 + atomic_inc_return_unchecked(&regulator_no) - 1);
50620 ret = device_register(&rdev->dev);
50621 if (ret != 0) {
50622 put_device(&rdev->dev);
50623 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50624 index 7eee2ca..4024513 100644
50625 --- a/drivers/regulator/max8660.c
50626 +++ b/drivers/regulator/max8660.c
50627 @@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50628 max8660->shadow_regs[MAX8660_OVER1] = 5;
50629 } else {
50630 /* Otherwise devices can be toggled via software */
50631 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
50632 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
50633 + pax_open_kernel();
50634 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50635 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50636 + pax_close_kernel();
50637 }
50638
50639 /*
50640 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50641 index dbedf17..18ff6b7 100644
50642 --- a/drivers/regulator/max8973-regulator.c
50643 +++ b/drivers/regulator/max8973-regulator.c
50644 @@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50645 if (!pdata || !pdata->enable_ext_control) {
50646 max->desc.enable_reg = MAX8973_VOUT;
50647 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50648 - max->ops.enable = regulator_enable_regmap;
50649 - max->ops.disable = regulator_disable_regmap;
50650 - max->ops.is_enabled = regulator_is_enabled_regmap;
50651 + pax_open_kernel();
50652 + *(void **)&max->ops.enable = regulator_enable_regmap;
50653 + *(void **)&max->ops.disable = regulator_disable_regmap;
50654 + *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50655 + pax_close_kernel();
50656 }
50657
50658 if (pdata) {
50659 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50660 index 793b662..85f74cd 100644
50661 --- a/drivers/regulator/mc13892-regulator.c
50662 +++ b/drivers/regulator/mc13892-regulator.c
50663 @@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50664 mc13xxx_unlock(mc13892);
50665
50666 /* update mc13892_vcam ops */
50667 + pax_open_kernel();
50668 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50669 sizeof(struct regulator_ops));
50670 - mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50671 - mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50672 + *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50673 + *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50674 + pax_close_kernel();
50675 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50676
50677 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50678 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50679 index 5b2e761..c8c8a4a 100644
50680 --- a/drivers/rtc/rtc-cmos.c
50681 +++ b/drivers/rtc/rtc-cmos.c
50682 @@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50683 hpet_rtc_timer_init();
50684
50685 /* export at least the first block of NVRAM */
50686 - nvram.size = address_space - NVRAM_OFFSET;
50687 + pax_open_kernel();
50688 + *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50689 + pax_close_kernel();
50690 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50691 if (retval < 0) {
50692 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50693 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50694 index d049393..bb20be0 100644
50695 --- a/drivers/rtc/rtc-dev.c
50696 +++ b/drivers/rtc/rtc-dev.c
50697 @@ -16,6 +16,7 @@
50698 #include <linux/module.h>
50699 #include <linux/rtc.h>
50700 #include <linux/sched.h>
50701 +#include <linux/grsecurity.h>
50702 #include "rtc-core.h"
50703
50704 static dev_t rtc_devt;
50705 @@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50706 if (copy_from_user(&tm, uarg, sizeof(tm)))
50707 return -EFAULT;
50708
50709 + gr_log_timechange();
50710 +
50711 return rtc_set_time(rtc, &tm);
50712
50713 case RTC_PIE_ON:
50714 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50715 index bb43cf7..ee4d274 100644
50716 --- a/drivers/rtc/rtc-ds1307.c
50717 +++ b/drivers/rtc/rtc-ds1307.c
50718 @@ -107,7 +107,7 @@ struct ds1307 {
50719 u8 offset; /* register's offset */
50720 u8 regs[11];
50721 u16 nvram_offset;
50722 - struct bin_attribute *nvram;
50723 + bin_attribute_no_const *nvram;
50724 enum ds_type type;
50725 unsigned long flags;
50726 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50727 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50728 index 11880c1..b823aa4 100644
50729 --- a/drivers/rtc/rtc-m48t59.c
50730 +++ b/drivers/rtc/rtc-m48t59.c
50731 @@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50732 if (IS_ERR(m48t59->rtc))
50733 return PTR_ERR(m48t59->rtc);
50734
50735 - m48t59_nvram_attr.size = pdata->offset;
50736 + pax_open_kernel();
50737 + *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50738 + pax_close_kernel();
50739
50740 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50741 if (ret)
50742 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50743 index e693af6..2e525b6 100644
50744 --- a/drivers/scsi/bfa/bfa_fcpim.h
50745 +++ b/drivers/scsi/bfa/bfa_fcpim.h
50746 @@ -36,7 +36,7 @@ struct bfa_iotag_s {
50747
50748 struct bfa_itn_s {
50749 bfa_isr_func_t isr;
50750 -};
50751 +} __no_const;
50752
50753 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50754 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50755 diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50756 index 0f19455..ef7adb5 100644
50757 --- a/drivers/scsi/bfa/bfa_fcs.c
50758 +++ b/drivers/scsi/bfa/bfa_fcs.c
50759 @@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50760 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50761
50762 static struct bfa_fcs_mod_s fcs_modules[] = {
50763 - { bfa_fcs_port_attach, NULL, NULL },
50764 - { bfa_fcs_uf_attach, NULL, NULL },
50765 - { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50766 - bfa_fcs_fabric_modexit },
50767 + {
50768 + .attach = bfa_fcs_port_attach,
50769 + .modinit = NULL,
50770 + .modexit = NULL
50771 + },
50772 + {
50773 + .attach = bfa_fcs_uf_attach,
50774 + .modinit = NULL,
50775 + .modexit = NULL
50776 + },
50777 + {
50778 + .attach = bfa_fcs_fabric_attach,
50779 + .modinit = bfa_fcs_fabric_modinit,
50780 + .modexit = bfa_fcs_fabric_modexit
50781 + },
50782 };
50783
50784 /*
50785 diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50786 index ff75ef8..2dfe00a 100644
50787 --- a/drivers/scsi/bfa/bfa_fcs_lport.c
50788 +++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50789 @@ -89,15 +89,26 @@ static struct {
50790 void (*offline) (struct bfa_fcs_lport_s *port);
50791 } __port_action[] = {
50792 {
50793 - bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50794 - bfa_fcs_lport_unknown_offline}, {
50795 - bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50796 - bfa_fcs_lport_fab_offline}, {
50797 - bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50798 - bfa_fcs_lport_n2n_offline}, {
50799 - bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50800 - bfa_fcs_lport_loop_offline},
50801 - };
50802 + .init = bfa_fcs_lport_unknown_init,
50803 + .online = bfa_fcs_lport_unknown_online,
50804 + .offline = bfa_fcs_lport_unknown_offline
50805 + },
50806 + {
50807 + .init = bfa_fcs_lport_fab_init,
50808 + .online = bfa_fcs_lport_fab_online,
50809 + .offline = bfa_fcs_lport_fab_offline
50810 + },
50811 + {
50812 + .init = bfa_fcs_lport_n2n_init,
50813 + .online = bfa_fcs_lport_n2n_online,
50814 + .offline = bfa_fcs_lport_n2n_offline
50815 + },
50816 + {
50817 + .init = bfa_fcs_lport_loop_init,
50818 + .online = bfa_fcs_lport_loop_online,
50819 + .offline = bfa_fcs_lport_loop_offline
50820 + },
50821 +};
50822
50823 /*
50824 * fcs_port_sm FCS logical port state machine
50825 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50826 index a38aafa0..fe8f03b 100644
50827 --- a/drivers/scsi/bfa/bfa_ioc.h
50828 +++ b/drivers/scsi/bfa/bfa_ioc.h
50829 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50830 bfa_ioc_disable_cbfn_t disable_cbfn;
50831 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50832 bfa_ioc_reset_cbfn_t reset_cbfn;
50833 -};
50834 +} __no_const;
50835
50836 /*
50837 * IOC event notification mechanism.
50838 @@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50839 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50840 enum bfi_ioc_state fwstate);
50841 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50842 -};
50843 +} __no_const;
50844
50845 /*
50846 * Queue element to wait for room in request queue. FIFO order is
50847 diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50848 index a14c784..6de6790 100644
50849 --- a/drivers/scsi/bfa/bfa_modules.h
50850 +++ b/drivers/scsi/bfa/bfa_modules.h
50851 @@ -78,12 +78,12 @@ enum {
50852 \
50853 extern struct bfa_module_s hal_mod_ ## __mod; \
50854 struct bfa_module_s hal_mod_ ## __mod = { \
50855 - bfa_ ## __mod ## _meminfo, \
50856 - bfa_ ## __mod ## _attach, \
50857 - bfa_ ## __mod ## _detach, \
50858 - bfa_ ## __mod ## _start, \
50859 - bfa_ ## __mod ## _stop, \
50860 - bfa_ ## __mod ## _iocdisable, \
50861 + .meminfo = bfa_ ## __mod ## _meminfo, \
50862 + .attach = bfa_ ## __mod ## _attach, \
50863 + .detach = bfa_ ## __mod ## _detach, \
50864 + .start = bfa_ ## __mod ## _start, \
50865 + .stop = bfa_ ## __mod ## _stop, \
50866 + .iocdisable = bfa_ ## __mod ## _iocdisable, \
50867 }
50868
50869 #define BFA_CACHELINE_SZ (256)
50870 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50871 index 045c4e1..13de803 100644
50872 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
50873 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50874 @@ -33,8 +33,8 @@
50875 */
50876 #include "libfcoe.h"
50877
50878 -static atomic_t ctlr_num;
50879 -static atomic_t fcf_num;
50880 +static atomic_unchecked_t ctlr_num;
50881 +static atomic_unchecked_t fcf_num;
50882
50883 /*
50884 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50885 @@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50886 if (!ctlr)
50887 goto out;
50888
50889 - ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50890 + ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50891 ctlr->f = f;
50892 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50893 INIT_LIST_HEAD(&ctlr->fcfs);
50894 @@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50895 fcf->dev.parent = &ctlr->dev;
50896 fcf->dev.bus = &fcoe_bus_type;
50897 fcf->dev.type = &fcoe_fcf_device_type;
50898 - fcf->id = atomic_inc_return(&fcf_num) - 1;
50899 + fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50900 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50901
50902 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50903 @@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50904 {
50905 int error;
50906
50907 - atomic_set(&ctlr_num, 0);
50908 - atomic_set(&fcf_num, 0);
50909 + atomic_set_unchecked(&ctlr_num, 0);
50910 + atomic_set_unchecked(&fcf_num, 0);
50911
50912 error = bus_register(&fcoe_bus_type);
50913 if (error)
50914 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50915 index 6de80e3..a11e0ac 100644
50916 --- a/drivers/scsi/hosts.c
50917 +++ b/drivers/scsi/hosts.c
50918 @@ -42,7 +42,7 @@
50919 #include "scsi_logging.h"
50920
50921
50922 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50923 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50924
50925
50926 static void scsi_host_cls_release(struct device *dev)
50927 @@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50928 * subtract one because we increment first then return, but we need to
50929 * know what the next host number was before increment
50930 */
50931 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50932 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50933 shost->dma_channel = 0xff;
50934
50935 /* These three are default values which can be overridden */
50936 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50937 index cef5d49..01e280e 100644
50938 --- a/drivers/scsi/hpsa.c
50939 +++ b/drivers/scsi/hpsa.c
50940 @@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50941 unsigned long flags;
50942
50943 if (h->transMethod & CFGTBL_Trans_io_accel1)
50944 - return h->access.command_completed(h, q);
50945 + return h->access->command_completed(h, q);
50946
50947 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
50948 - return h->access.command_completed(h, q);
50949 + return h->access->command_completed(h, q);
50950
50951 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
50952 a = rq->head[rq->current_entry];
50953 @@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50954 while (!list_empty(&h->reqQ)) {
50955 c = list_entry(h->reqQ.next, struct CommandList, list);
50956 /* can't do anything if fifo is full */
50957 - if ((h->access.fifo_full(h))) {
50958 + if ((h->access->fifo_full(h))) {
50959 h->fifo_recently_full = 1;
50960 dev_warn(&h->pdev->dev, "fifo full\n");
50961 break;
50962 @@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50963
50964 /* Tell the controller execute command */
50965 spin_unlock_irqrestore(&h->lock, *flags);
50966 - h->access.submit_command(h, c);
50967 + h->access->submit_command(h, c);
50968 spin_lock_irqsave(&h->lock, *flags);
50969 }
50970 }
50971 @@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
50972
50973 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
50974 {
50975 - return h->access.command_completed(h, q);
50976 + return h->access->command_completed(h, q);
50977 }
50978
50979 static inline bool interrupt_pending(struct ctlr_info *h)
50980 {
50981 - return h->access.intr_pending(h);
50982 + return h->access->intr_pending(h);
50983 }
50984
50985 static inline long interrupt_not_for_us(struct ctlr_info *h)
50986 {
50987 - return (h->access.intr_pending(h) == 0) ||
50988 + return (h->access->intr_pending(h) == 0) ||
50989 (h->interrupts_enabled == 0);
50990 }
50991
50992 @@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
50993 if (prod_index < 0)
50994 return -ENODEV;
50995 h->product_name = products[prod_index].product_name;
50996 - h->access = *(products[prod_index].access);
50997 + h->access = products[prod_index].access;
50998
50999 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
51000 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
51001 @@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
51002 unsigned long flags;
51003 u32 lockup_detected;
51004
51005 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51006 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51007 spin_lock_irqsave(&h->lock, flags);
51008 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
51009 if (!lockup_detected) {
51010 @@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
51011 }
51012
51013 /* make sure the board interrupts are off */
51014 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51015 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51016
51017 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
51018 goto clean2;
51019 @@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
51020 * fake ones to scoop up any residual completions.
51021 */
51022 spin_lock_irqsave(&h->lock, flags);
51023 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51024 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51025 spin_unlock_irqrestore(&h->lock, flags);
51026 free_irqs(h);
51027 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
51028 @@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
51029 dev_info(&h->pdev->dev, "Board READY.\n");
51030 dev_info(&h->pdev->dev,
51031 "Waiting for stale completions to drain.\n");
51032 - h->access.set_intr_mask(h, HPSA_INTR_ON);
51033 + h->access->set_intr_mask(h, HPSA_INTR_ON);
51034 msleep(10000);
51035 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51036 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51037
51038 rc = controller_reset_failed(h->cfgtable);
51039 if (rc)
51040 @@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
51041 h->drv_req_rescan = 0;
51042
51043 /* Turn the interrupts on so we can service requests */
51044 - h->access.set_intr_mask(h, HPSA_INTR_ON);
51045 + h->access->set_intr_mask(h, HPSA_INTR_ON);
51046
51047 hpsa_hba_inquiry(h);
51048 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51049 @@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51050 * To write all data in the battery backed cache to disks
51051 */
51052 hpsa_flush_cache(h);
51053 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
51054 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
51055 hpsa_free_irqs_and_disable_msix(h);
51056 }
51057
51058 @@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51059 CFGTBL_Trans_enable_directed_msix |
51060 (trans_support & (CFGTBL_Trans_io_accel1 |
51061 CFGTBL_Trans_io_accel2));
51062 - struct access_method access = SA5_performant_access;
51063 + struct access_method *access = &SA5_performant_access;
51064
51065 /* This is a bit complicated. There are 8 registers on
51066 * the controller which we write to to tell it 8 different
51067 @@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51068 * perform the superfluous readl() after each command submission.
51069 */
51070 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51071 - access = SA5_performant_access_no_read;
51072 + access = &SA5_performant_access_no_read;
51073
51074 /* Controller spec: zero out this buffer. */
51075 for (i = 0; i < h->nreply_queues; i++)
51076 @@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51077 * enable outbound interrupt coalescing in accelerator mode;
51078 */
51079 if (trans_support & CFGTBL_Trans_io_accel1) {
51080 - access = SA5_ioaccel_mode1_access;
51081 + access = &SA5_ioaccel_mode1_access;
51082 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51083 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51084 } else {
51085 if (trans_support & CFGTBL_Trans_io_accel2) {
51086 - access = SA5_ioaccel_mode2_access;
51087 + access = &SA5_ioaccel_mode2_access;
51088 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51089 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51090 }
51091 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51092 index 24472ce..8782caf 100644
51093 --- a/drivers/scsi/hpsa.h
51094 +++ b/drivers/scsi/hpsa.h
51095 @@ -127,7 +127,7 @@ struct ctlr_info {
51096 unsigned int msix_vector;
51097 unsigned int msi_vector;
51098 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51099 - struct access_method access;
51100 + struct access_method *access;
51101 char hba_mode_enabled;
51102
51103 /* queue and queue Info */
51104 @@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51105 }
51106
51107 static struct access_method SA5_access = {
51108 - SA5_submit_command,
51109 - SA5_intr_mask,
51110 - SA5_fifo_full,
51111 - SA5_intr_pending,
51112 - SA5_completed,
51113 + .submit_command = SA5_submit_command,
51114 + .set_intr_mask = SA5_intr_mask,
51115 + .fifo_full = SA5_fifo_full,
51116 + .intr_pending = SA5_intr_pending,
51117 + .command_completed = SA5_completed,
51118 };
51119
51120 static struct access_method SA5_ioaccel_mode1_access = {
51121 - SA5_submit_command,
51122 - SA5_performant_intr_mask,
51123 - SA5_fifo_full,
51124 - SA5_ioaccel_mode1_intr_pending,
51125 - SA5_ioaccel_mode1_completed,
51126 + .submit_command = SA5_submit_command,
51127 + .set_intr_mask = SA5_performant_intr_mask,
51128 + .fifo_full = SA5_fifo_full,
51129 + .intr_pending = SA5_ioaccel_mode1_intr_pending,
51130 + .command_completed = SA5_ioaccel_mode1_completed,
51131 };
51132
51133 static struct access_method SA5_ioaccel_mode2_access = {
51134 - SA5_submit_command_ioaccel2,
51135 - SA5_performant_intr_mask,
51136 - SA5_fifo_full,
51137 - SA5_performant_intr_pending,
51138 - SA5_performant_completed,
51139 + .submit_command = SA5_submit_command_ioaccel2,
51140 + .set_intr_mask = SA5_performant_intr_mask,
51141 + .fifo_full = SA5_fifo_full,
51142 + .intr_pending = SA5_performant_intr_pending,
51143 + .command_completed = SA5_performant_completed,
51144 };
51145
51146 static struct access_method SA5_performant_access = {
51147 - SA5_submit_command,
51148 - SA5_performant_intr_mask,
51149 - SA5_fifo_full,
51150 - SA5_performant_intr_pending,
51151 - SA5_performant_completed,
51152 + .submit_command = SA5_submit_command,
51153 + .set_intr_mask = SA5_performant_intr_mask,
51154 + .fifo_full = SA5_fifo_full,
51155 + .intr_pending = SA5_performant_intr_pending,
51156 + .command_completed = SA5_performant_completed,
51157 };
51158
51159 static struct access_method SA5_performant_access_no_read = {
51160 - SA5_submit_command_no_read,
51161 - SA5_performant_intr_mask,
51162 - SA5_fifo_full,
51163 - SA5_performant_intr_pending,
51164 - SA5_performant_completed,
51165 + .submit_command = SA5_submit_command_no_read,
51166 + .set_intr_mask = SA5_performant_intr_mask,
51167 + .fifo_full = SA5_fifo_full,
51168 + .intr_pending = SA5_performant_intr_pending,
51169 + .command_completed = SA5_performant_completed,
51170 };
51171
51172 struct board_type {
51173 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51174 index 1b3a094..068e683 100644
51175 --- a/drivers/scsi/libfc/fc_exch.c
51176 +++ b/drivers/scsi/libfc/fc_exch.c
51177 @@ -101,12 +101,12 @@ struct fc_exch_mgr {
51178 u16 pool_max_index;
51179
51180 struct {
51181 - atomic_t no_free_exch;
51182 - atomic_t no_free_exch_xid;
51183 - atomic_t xid_not_found;
51184 - atomic_t xid_busy;
51185 - atomic_t seq_not_found;
51186 - atomic_t non_bls_resp;
51187 + atomic_unchecked_t no_free_exch;
51188 + atomic_unchecked_t no_free_exch_xid;
51189 + atomic_unchecked_t xid_not_found;
51190 + atomic_unchecked_t xid_busy;
51191 + atomic_unchecked_t seq_not_found;
51192 + atomic_unchecked_t non_bls_resp;
51193 } stats;
51194 };
51195
51196 @@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51197 /* allocate memory for exchange */
51198 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51199 if (!ep) {
51200 - atomic_inc(&mp->stats.no_free_exch);
51201 + atomic_inc_unchecked(&mp->stats.no_free_exch);
51202 goto out;
51203 }
51204 memset(ep, 0, sizeof(*ep));
51205 @@ -874,7 +874,7 @@ out:
51206 return ep;
51207 err:
51208 spin_unlock_bh(&pool->lock);
51209 - atomic_inc(&mp->stats.no_free_exch_xid);
51210 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51211 mempool_free(ep, mp->ep_pool);
51212 return NULL;
51213 }
51214 @@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51215 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51216 ep = fc_exch_find(mp, xid);
51217 if (!ep) {
51218 - atomic_inc(&mp->stats.xid_not_found);
51219 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51220 reject = FC_RJT_OX_ID;
51221 goto out;
51222 }
51223 @@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51224 ep = fc_exch_find(mp, xid);
51225 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51226 if (ep) {
51227 - atomic_inc(&mp->stats.xid_busy);
51228 + atomic_inc_unchecked(&mp->stats.xid_busy);
51229 reject = FC_RJT_RX_ID;
51230 goto rel;
51231 }
51232 @@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51233 }
51234 xid = ep->xid; /* get our XID */
51235 } else if (!ep) {
51236 - atomic_inc(&mp->stats.xid_not_found);
51237 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51238 reject = FC_RJT_RX_ID; /* XID not found */
51239 goto out;
51240 }
51241 @@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51242 } else {
51243 sp = &ep->seq;
51244 if (sp->id != fh->fh_seq_id) {
51245 - atomic_inc(&mp->stats.seq_not_found);
51246 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51247 if (f_ctl & FC_FC_END_SEQ) {
51248 /*
51249 * Update sequence_id based on incoming last
51250 @@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51251
51252 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51253 if (!ep) {
51254 - atomic_inc(&mp->stats.xid_not_found);
51255 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51256 goto out;
51257 }
51258 if (ep->esb_stat & ESB_ST_COMPLETE) {
51259 - atomic_inc(&mp->stats.xid_not_found);
51260 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51261 goto rel;
51262 }
51263 if (ep->rxid == FC_XID_UNKNOWN)
51264 ep->rxid = ntohs(fh->fh_rx_id);
51265 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51266 - atomic_inc(&mp->stats.xid_not_found);
51267 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51268 goto rel;
51269 }
51270 if (ep->did != ntoh24(fh->fh_s_id) &&
51271 ep->did != FC_FID_FLOGI) {
51272 - atomic_inc(&mp->stats.xid_not_found);
51273 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51274 goto rel;
51275 }
51276 sof = fr_sof(fp);
51277 @@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51278 sp->ssb_stat |= SSB_ST_RESP;
51279 sp->id = fh->fh_seq_id;
51280 } else if (sp->id != fh->fh_seq_id) {
51281 - atomic_inc(&mp->stats.seq_not_found);
51282 + atomic_inc_unchecked(&mp->stats.seq_not_found);
51283 goto rel;
51284 }
51285
51286 @@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51287 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51288
51289 if (!sp)
51290 - atomic_inc(&mp->stats.xid_not_found);
51291 + atomic_inc_unchecked(&mp->stats.xid_not_found);
51292 else
51293 - atomic_inc(&mp->stats.non_bls_resp);
51294 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
51295
51296 fc_frame_free(fp);
51297 }
51298 @@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51299
51300 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51301 mp = ema->mp;
51302 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51303 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51304 st->fc_no_free_exch_xid +=
51305 - atomic_read(&mp->stats.no_free_exch_xid);
51306 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51307 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51308 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51309 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51310 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51311 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51312 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51313 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51314 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51315 }
51316 }
51317 EXPORT_SYMBOL(fc_exch_update_stats);
51318 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51319 index 766098a..1c6c971 100644
51320 --- a/drivers/scsi/libsas/sas_ata.c
51321 +++ b/drivers/scsi/libsas/sas_ata.c
51322 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51323 .postreset = ata_std_postreset,
51324 .error_handler = ata_std_error_handler,
51325 .post_internal_cmd = sas_ata_post_internal,
51326 - .qc_defer = ata_std_qc_defer,
51327 + .qc_defer = ata_std_qc_defer,
51328 .qc_prep = ata_noop_qc_prep,
51329 .qc_issue = sas_ata_qc_issue,
51330 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51331 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51332 index 434e903..5a4a79b 100644
51333 --- a/drivers/scsi/lpfc/lpfc.h
51334 +++ b/drivers/scsi/lpfc/lpfc.h
51335 @@ -430,7 +430,7 @@ struct lpfc_vport {
51336 struct dentry *debug_nodelist;
51337 struct dentry *vport_debugfs_root;
51338 struct lpfc_debugfs_trc *disc_trc;
51339 - atomic_t disc_trc_cnt;
51340 + atomic_unchecked_t disc_trc_cnt;
51341 #endif
51342 uint8_t stat_data_enabled;
51343 uint8_t stat_data_blocked;
51344 @@ -880,8 +880,8 @@ struct lpfc_hba {
51345 struct timer_list fabric_block_timer;
51346 unsigned long bit_flags;
51347 #define FABRIC_COMANDS_BLOCKED 0
51348 - atomic_t num_rsrc_err;
51349 - atomic_t num_cmd_success;
51350 + atomic_unchecked_t num_rsrc_err;
51351 + atomic_unchecked_t num_cmd_success;
51352 unsigned long last_rsrc_error_time;
51353 unsigned long last_ramp_down_time;
51354 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51355 @@ -916,7 +916,7 @@ struct lpfc_hba {
51356
51357 struct dentry *debug_slow_ring_trc;
51358 struct lpfc_debugfs_trc *slow_ring_trc;
51359 - atomic_t slow_ring_trc_cnt;
51360 + atomic_unchecked_t slow_ring_trc_cnt;
51361 /* iDiag debugfs sub-directory */
51362 struct dentry *idiag_root;
51363 struct dentry *idiag_pci_cfg;
51364 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51365 index 786a2af..562c6a2 100644
51366 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
51367 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51368 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51369
51370 #include <linux/debugfs.h>
51371
51372 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51373 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51374 static unsigned long lpfc_debugfs_start_time = 0L;
51375
51376 /* iDiag */
51377 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51378 lpfc_debugfs_enable = 0;
51379
51380 len = 0;
51381 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51382 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51383 (lpfc_debugfs_max_disc_trc - 1);
51384 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51385 dtp = vport->disc_trc + i;
51386 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51387 lpfc_debugfs_enable = 0;
51388
51389 len = 0;
51390 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51391 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51392 (lpfc_debugfs_max_slow_ring_trc - 1);
51393 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51394 dtp = phba->slow_ring_trc + i;
51395 @@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51396 !vport || !vport->disc_trc)
51397 return;
51398
51399 - index = atomic_inc_return(&vport->disc_trc_cnt) &
51400 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51401 (lpfc_debugfs_max_disc_trc - 1);
51402 dtp = vport->disc_trc + index;
51403 dtp->fmt = fmt;
51404 dtp->data1 = data1;
51405 dtp->data2 = data2;
51406 dtp->data3 = data3;
51407 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51408 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51409 dtp->jif = jiffies;
51410 #endif
51411 return;
51412 @@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51413 !phba || !phba->slow_ring_trc)
51414 return;
51415
51416 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51417 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51418 (lpfc_debugfs_max_slow_ring_trc - 1);
51419 dtp = phba->slow_ring_trc + index;
51420 dtp->fmt = fmt;
51421 dtp->data1 = data1;
51422 dtp->data2 = data2;
51423 dtp->data3 = data3;
51424 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51425 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51426 dtp->jif = jiffies;
51427 #endif
51428 return;
51429 @@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51430 "slow_ring buffer\n");
51431 goto debug_failed;
51432 }
51433 - atomic_set(&phba->slow_ring_trc_cnt, 0);
51434 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51435 memset(phba->slow_ring_trc, 0,
51436 (sizeof(struct lpfc_debugfs_trc) *
51437 lpfc_debugfs_max_slow_ring_trc));
51438 @@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51439 "buffer\n");
51440 goto debug_failed;
51441 }
51442 - atomic_set(&vport->disc_trc_cnt, 0);
51443 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51444
51445 snprintf(name, sizeof(name), "discovery_trace");
51446 vport->debug_disc_trc =
51447 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51448 index 0b2c53a..aec2b45 100644
51449 --- a/drivers/scsi/lpfc/lpfc_init.c
51450 +++ b/drivers/scsi/lpfc/lpfc_init.c
51451 @@ -11290,8 +11290,10 @@ lpfc_init(void)
51452 "misc_register returned with status %d", error);
51453
51454 if (lpfc_enable_npiv) {
51455 - lpfc_transport_functions.vport_create = lpfc_vport_create;
51456 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51457 + pax_open_kernel();
51458 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51459 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51460 + pax_close_kernel();
51461 }
51462 lpfc_transport_template =
51463 fc_attach_transport(&lpfc_transport_functions);
51464 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51465 index b99399f..d29dc75 100644
51466 --- a/drivers/scsi/lpfc/lpfc_scsi.c
51467 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
51468 @@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51469 unsigned long expires;
51470
51471 spin_lock_irqsave(&phba->hbalock, flags);
51472 - atomic_inc(&phba->num_rsrc_err);
51473 + atomic_inc_unchecked(&phba->num_rsrc_err);
51474 phba->last_rsrc_error_time = jiffies;
51475
51476 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51477 @@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51478 unsigned long num_rsrc_err, num_cmd_success;
51479 int i;
51480
51481 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51482 - num_cmd_success = atomic_read(&phba->num_cmd_success);
51483 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51484 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51485
51486 /*
51487 * The error and success command counters are global per
51488 @@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51489 }
51490 }
51491 lpfc_destroy_vport_work_array(phba, vports);
51492 - atomic_set(&phba->num_rsrc_err, 0);
51493 - atomic_set(&phba->num_cmd_success, 0);
51494 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
51495 + atomic_set_unchecked(&phba->num_cmd_success, 0);
51496 }
51497
51498 /**
51499 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51500 index c80ed04..e674f01 100644
51501 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51502 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51503 @@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51504 {
51505 struct scsi_device *sdev = to_scsi_device(dev);
51506 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51507 - static struct _raid_device *raid_device;
51508 + struct _raid_device *raid_device;
51509 unsigned long flags;
51510 Mpi2RaidVolPage0_t vol_pg0;
51511 Mpi2ConfigReply_t mpi_reply;
51512 @@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51513 {
51514 struct scsi_device *sdev = to_scsi_device(dev);
51515 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51516 - static struct _raid_device *raid_device;
51517 + struct _raid_device *raid_device;
51518 unsigned long flags;
51519 Mpi2RaidVolPage0_t vol_pg0;
51520 Mpi2ConfigReply_t mpi_reply;
51521 @@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51522 Mpi2EventDataIrOperationStatus_t *event_data =
51523 (Mpi2EventDataIrOperationStatus_t *)
51524 fw_event->event_data;
51525 - static struct _raid_device *raid_device;
51526 + struct _raid_device *raid_device;
51527 unsigned long flags;
51528 u16 handle;
51529
51530 @@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51531 u64 sas_address;
51532 struct _sas_device *sas_device;
51533 struct _sas_node *expander_device;
51534 - static struct _raid_device *raid_device;
51535 + struct _raid_device *raid_device;
51536 u8 retry_count;
51537 unsigned long flags;
51538
51539 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51540 index bcb64eb..f08cf71 100644
51541 --- a/drivers/scsi/pmcraid.c
51542 +++ b/drivers/scsi/pmcraid.c
51543 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51544 res->scsi_dev = scsi_dev;
51545 scsi_dev->hostdata = res;
51546 res->change_detected = 0;
51547 - atomic_set(&res->read_failures, 0);
51548 - atomic_set(&res->write_failures, 0);
51549 + atomic_set_unchecked(&res->read_failures, 0);
51550 + atomic_set_unchecked(&res->write_failures, 0);
51551 rc = 0;
51552 }
51553 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51554 @@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51555
51556 /* If this was a SCSI read/write command keep count of errors */
51557 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51558 - atomic_inc(&res->read_failures);
51559 + atomic_inc_unchecked(&res->read_failures);
51560 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51561 - atomic_inc(&res->write_failures);
51562 + atomic_inc_unchecked(&res->write_failures);
51563
51564 if (!RES_IS_GSCSI(res->cfg_entry) &&
51565 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51566 @@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51567 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51568 * hrrq_id assigned here in queuecommand
51569 */
51570 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51571 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51572 pinstance->num_hrrq;
51573 cmd->cmd_done = pmcraid_io_done;
51574
51575 @@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51576 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51577 * hrrq_id assigned here in queuecommand
51578 */
51579 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51580 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51581 pinstance->num_hrrq;
51582
51583 if (request_size) {
51584 @@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51585
51586 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51587 /* add resources only after host is added into system */
51588 - if (!atomic_read(&pinstance->expose_resources))
51589 + if (!atomic_read_unchecked(&pinstance->expose_resources))
51590 return;
51591
51592 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51593 @@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51594 init_waitqueue_head(&pinstance->reset_wait_q);
51595
51596 atomic_set(&pinstance->outstanding_cmds, 0);
51597 - atomic_set(&pinstance->last_message_id, 0);
51598 - atomic_set(&pinstance->expose_resources, 0);
51599 + atomic_set_unchecked(&pinstance->last_message_id, 0);
51600 + atomic_set_unchecked(&pinstance->expose_resources, 0);
51601
51602 INIT_LIST_HEAD(&pinstance->free_res_q);
51603 INIT_LIST_HEAD(&pinstance->used_res_q);
51604 @@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51605 /* Schedule worker thread to handle CCN and take care of adding and
51606 * removing devices to OS
51607 */
51608 - atomic_set(&pinstance->expose_resources, 1);
51609 + atomic_set_unchecked(&pinstance->expose_resources, 1);
51610 schedule_work(&pinstance->worker_q);
51611 return rc;
51612
51613 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51614 index e1d150f..6c6df44 100644
51615 --- a/drivers/scsi/pmcraid.h
51616 +++ b/drivers/scsi/pmcraid.h
51617 @@ -748,7 +748,7 @@ struct pmcraid_instance {
51618 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51619
51620 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51621 - atomic_t last_message_id;
51622 + atomic_unchecked_t last_message_id;
51623
51624 /* configuration table */
51625 struct pmcraid_config_table *cfg_table;
51626 @@ -777,7 +777,7 @@ struct pmcraid_instance {
51627 atomic_t outstanding_cmds;
51628
51629 /* should add/delete resources to mid-layer now ?*/
51630 - atomic_t expose_resources;
51631 + atomic_unchecked_t expose_resources;
51632
51633
51634
51635 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51636 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51637 };
51638 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51639 - atomic_t read_failures; /* count of failed READ commands */
51640 - atomic_t write_failures; /* count of failed WRITE commands */
51641 + atomic_unchecked_t read_failures; /* count of failed READ commands */
51642 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51643
51644 /* To indicate add/delete/modify during CCN */
51645 u8 change_detected;
51646 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51647 index 82b92c4..3178171 100644
51648 --- a/drivers/scsi/qla2xxx/qla_attr.c
51649 +++ b/drivers/scsi/qla2xxx/qla_attr.c
51650 @@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51651 return 0;
51652 }
51653
51654 -struct fc_function_template qla2xxx_transport_functions = {
51655 +fc_function_template_no_const qla2xxx_transport_functions = {
51656
51657 .show_host_node_name = 1,
51658 .show_host_port_name = 1,
51659 @@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51660 .bsg_timeout = qla24xx_bsg_timeout,
51661 };
51662
51663 -struct fc_function_template qla2xxx_transport_vport_functions = {
51664 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
51665
51666 .show_host_node_name = 1,
51667 .show_host_port_name = 1,
51668 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51669 index b1865a7..a7723d3 100644
51670 --- a/drivers/scsi/qla2xxx/qla_gbl.h
51671 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
51672 @@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51673 struct device_attribute;
51674 extern struct device_attribute *qla2x00_host_attrs[];
51675 struct fc_function_template;
51676 -extern struct fc_function_template qla2xxx_transport_functions;
51677 -extern struct fc_function_template qla2xxx_transport_vport_functions;
51678 +extern fc_function_template_no_const qla2xxx_transport_functions;
51679 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51680 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51681 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51682 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51683 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51684 index db3dbd9..2492392 100644
51685 --- a/drivers/scsi/qla2xxx/qla_os.c
51686 +++ b/drivers/scsi/qla2xxx/qla_os.c
51687 @@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51688 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51689 /* Ok, a 64bit DMA mask is applicable. */
51690 ha->flags.enable_64bit_addressing = 1;
51691 - ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51692 - ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51693 + pax_open_kernel();
51694 + *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51695 + *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51696 + pax_close_kernel();
51697 return;
51698 }
51699 }
51700 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51701 index 8f6d0fb..1b21097 100644
51702 --- a/drivers/scsi/qla4xxx/ql4_def.h
51703 +++ b/drivers/scsi/qla4xxx/ql4_def.h
51704 @@ -305,7 +305,7 @@ struct ddb_entry {
51705 * (4000 only) */
51706 atomic_t relogin_timer; /* Max Time to wait for
51707 * relogin to complete */
51708 - atomic_t relogin_retry_count; /* Num of times relogin has been
51709 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51710 * retried */
51711 uint32_t default_time2wait; /* Default Min time between
51712 * relogins (+aens) */
51713 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51714 index 199fcf7..3c3a918 100644
51715 --- a/drivers/scsi/qla4xxx/ql4_os.c
51716 +++ b/drivers/scsi/qla4xxx/ql4_os.c
51717 @@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51718 */
51719 if (!iscsi_is_session_online(cls_sess)) {
51720 /* Reset retry relogin timer */
51721 - atomic_inc(&ddb_entry->relogin_retry_count);
51722 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51723 DEBUG2(ql4_printk(KERN_INFO, ha,
51724 "%s: index[%d] relogin timed out-retrying"
51725 " relogin (%d), retry (%d)\n", __func__,
51726 ddb_entry->fw_ddb_index,
51727 - atomic_read(&ddb_entry->relogin_retry_count),
51728 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51729 ddb_entry->default_time2wait + 4));
51730 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51731 atomic_set(&ddb_entry->retry_relogin_timer,
51732 @@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51733
51734 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51735 atomic_set(&ddb_entry->relogin_timer, 0);
51736 - atomic_set(&ddb_entry->relogin_retry_count, 0);
51737 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51738 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51739 ddb_entry->default_relogin_timeout =
51740 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51741 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51742 index 79c77b4..ef6ec0b 100644
51743 --- a/drivers/scsi/scsi.c
51744 +++ b/drivers/scsi/scsi.c
51745 @@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51746 struct Scsi_Host *host = cmd->device->host;
51747 int rtn = 0;
51748
51749 - atomic_inc(&cmd->device->iorequest_cnt);
51750 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51751
51752 /* check if the device is still usable */
51753 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51754 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51755 index 50a6e1a..de5252e 100644
51756 --- a/drivers/scsi/scsi_lib.c
51757 +++ b/drivers/scsi/scsi_lib.c
51758 @@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51759 shost = sdev->host;
51760 scsi_init_cmd_errh(cmd);
51761 cmd->result = DID_NO_CONNECT << 16;
51762 - atomic_inc(&cmd->device->iorequest_cnt);
51763 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51764
51765 /*
51766 * SCSI request completion path will do scsi_device_unbusy(),
51767 @@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51768
51769 INIT_LIST_HEAD(&cmd->eh_entry);
51770
51771 - atomic_inc(&cmd->device->iodone_cnt);
51772 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
51773 if (cmd->result)
51774 - atomic_inc(&cmd->device->ioerr_cnt);
51775 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51776
51777 disposition = scsi_decide_disposition(cmd);
51778 if (disposition != SUCCESS &&
51779 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51780 index f4cb7b3..dfa79c4 100644
51781 --- a/drivers/scsi/scsi_sysfs.c
51782 +++ b/drivers/scsi/scsi_sysfs.c
51783 @@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51784 char *buf) \
51785 { \
51786 struct scsi_device *sdev = to_scsi_device(dev); \
51787 - unsigned long long count = atomic_read(&sdev->field); \
51788 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
51789 return snprintf(buf, 20, "0x%llx\n", count); \
51790 } \
51791 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51792 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51793 index 5d6f348..18778a6b 100644
51794 --- a/drivers/scsi/scsi_transport_fc.c
51795 +++ b/drivers/scsi/scsi_transport_fc.c
51796 @@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51797 * Netlink Infrastructure
51798 */
51799
51800 -static atomic_t fc_event_seq;
51801 +static atomic_unchecked_t fc_event_seq;
51802
51803 /**
51804 * fc_get_event_number - Obtain the next sequential FC event number
51805 @@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51806 u32
51807 fc_get_event_number(void)
51808 {
51809 - return atomic_add_return(1, &fc_event_seq);
51810 + return atomic_add_return_unchecked(1, &fc_event_seq);
51811 }
51812 EXPORT_SYMBOL(fc_get_event_number);
51813
51814 @@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51815 {
51816 int error;
51817
51818 - atomic_set(&fc_event_seq, 0);
51819 + atomic_set_unchecked(&fc_event_seq, 0);
51820
51821 error = transport_class_register(&fc_host_class);
51822 if (error)
51823 @@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51824 char *cp;
51825
51826 *val = simple_strtoul(buf, &cp, 0);
51827 - if ((*cp && (*cp != '\n')) || (*val < 0))
51828 + if (*cp && (*cp != '\n'))
51829 return -EINVAL;
51830 /*
51831 * Check for overflow; dev_loss_tmo is u32
51832 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51833 index 67d43e3..8cee73c 100644
51834 --- a/drivers/scsi/scsi_transport_iscsi.c
51835 +++ b/drivers/scsi/scsi_transport_iscsi.c
51836 @@ -79,7 +79,7 @@ struct iscsi_internal {
51837 struct transport_container session_cont;
51838 };
51839
51840 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51841 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51842 static struct workqueue_struct *iscsi_eh_timer_workq;
51843
51844 static DEFINE_IDA(iscsi_sess_ida);
51845 @@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51846 int err;
51847
51848 ihost = shost->shost_data;
51849 - session->sid = atomic_add_return(1, &iscsi_session_nr);
51850 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51851
51852 if (target_id == ISCSI_MAX_TARGET) {
51853 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51854 @@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51855 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51856 ISCSI_TRANSPORT_VERSION);
51857
51858 - atomic_set(&iscsi_session_nr, 0);
51859 + atomic_set_unchecked(&iscsi_session_nr, 0);
51860
51861 err = class_register(&iscsi_transport_class);
51862 if (err)
51863 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51864 index ae45bd9..c32a586 100644
51865 --- a/drivers/scsi/scsi_transport_srp.c
51866 +++ b/drivers/scsi/scsi_transport_srp.c
51867 @@ -35,7 +35,7 @@
51868 #include "scsi_priv.h"
51869
51870 struct srp_host_attrs {
51871 - atomic_t next_port_id;
51872 + atomic_unchecked_t next_port_id;
51873 };
51874 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51875
51876 @@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51877 struct Scsi_Host *shost = dev_to_shost(dev);
51878 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51879
51880 - atomic_set(&srp_host->next_port_id, 0);
51881 + atomic_set_unchecked(&srp_host->next_port_id, 0);
51882 return 0;
51883 }
51884
51885 @@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51886 rport_fast_io_fail_timedout);
51887 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51888
51889 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51890 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51891 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51892
51893 transport_setup_device(&rport->dev);
51894 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51895 index cfba74c..415f09b 100644
51896 --- a/drivers/scsi/sd.c
51897 +++ b/drivers/scsi/sd.c
51898 @@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51899 sdkp->disk = gd;
51900 sdkp->index = index;
51901 atomic_set(&sdkp->openers, 0);
51902 - atomic_set(&sdkp->device->ioerr_cnt, 0);
51903 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51904
51905 if (!sdp->request_queue->rq_timeout) {
51906 if (sdp->type != TYPE_MOD)
51907 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51908 index 6035444..c82edd4 100644
51909 --- a/drivers/scsi/sg.c
51910 +++ b/drivers/scsi/sg.c
51911 @@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51912 sdp->disk->disk_name,
51913 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51914 NULL,
51915 - (char *)arg);
51916 + (char __user *)arg);
51917 case BLKTRACESTART:
51918 return blk_trace_startstop(sdp->device->request_queue, 1);
51919 case BLKTRACESTOP:
51920 diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51921 index 11a5043..e36f04c 100644
51922 --- a/drivers/soc/tegra/fuse/fuse-tegra.c
51923 +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51924 @@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51925 return i;
51926 }
51927
51928 -static struct bin_attribute fuse_bin_attr = {
51929 +static bin_attribute_no_const fuse_bin_attr = {
51930 .attr = { .name = "fuse", .mode = S_IRUGO, },
51931 .read = fuse_read,
51932 };
51933 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51934 index 50f20f2..6bd81e0 100644
51935 --- a/drivers/spi/spi.c
51936 +++ b/drivers/spi/spi.c
51937 @@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51938 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51939
51940 /* portable code must never pass more than 32 bytes */
51941 -#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51942 +#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51943
51944 static u8 *buf;
51945
51946 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
51947 index b41429f..2de5373 100644
51948 --- a/drivers/staging/android/timed_output.c
51949 +++ b/drivers/staging/android/timed_output.c
51950 @@ -25,7 +25,7 @@
51951 #include "timed_output.h"
51952
51953 static struct class *timed_output_class;
51954 -static atomic_t device_count;
51955 +static atomic_unchecked_t device_count;
51956
51957 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
51958 char *buf)
51959 @@ -65,7 +65,7 @@ static int create_timed_output_class(void)
51960 timed_output_class = class_create(THIS_MODULE, "timed_output");
51961 if (IS_ERR(timed_output_class))
51962 return PTR_ERR(timed_output_class);
51963 - atomic_set(&device_count, 0);
51964 + atomic_set_unchecked(&device_count, 0);
51965 timed_output_class->dev_groups = timed_output_groups;
51966 }
51967
51968 @@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
51969 if (ret < 0)
51970 return ret;
51971
51972 - tdev->index = atomic_inc_return(&device_count);
51973 + tdev->index = atomic_inc_return_unchecked(&device_count);
51974 tdev->dev = device_create(timed_output_class, NULL,
51975 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
51976 if (IS_ERR(tdev->dev))
51977 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
51978 index 001348c..cfaac8a 100644
51979 --- a/drivers/staging/gdm724x/gdm_tty.c
51980 +++ b/drivers/staging/gdm724x/gdm_tty.c
51981 @@ -44,7 +44,7 @@
51982 #define gdm_tty_send_control(n, r, v, d, l) (\
51983 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
51984
51985 -#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
51986 +#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
51987
51988 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
51989 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
51990 diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
51991 index 9cb222e..8766f26 100644
51992 --- a/drivers/staging/imx-drm/imx-drm-core.c
51993 +++ b/drivers/staging/imx-drm/imx-drm-core.c
51994 @@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
51995 if (imxdrm->pipes >= MAX_CRTC)
51996 return -EINVAL;
51997
51998 - if (imxdrm->drm->open_count)
51999 + if (local_read(&imxdrm->drm->open_count))
52000 return -EBUSY;
52001
52002 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
52003 diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
52004 index 503b2d7..c904931 100644
52005 --- a/drivers/staging/line6/driver.c
52006 +++ b/drivers/staging/line6/driver.c
52007 @@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52008 {
52009 struct usb_device *usbdev = line6->usbdev;
52010 int ret;
52011 - unsigned char len;
52012 + unsigned char *plen;
52013
52014 /* query the serial number: */
52015 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52016 @@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
52017 return ret;
52018 }
52019
52020 + plen = kmalloc(1, GFP_KERNEL);
52021 + if (plen == NULL)
52022 + return -ENOMEM;
52023 +
52024 /* Wait for data length. We'll get 0xff until length arrives. */
52025 do {
52026 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52027 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52028 USB_DIR_IN,
52029 - 0x0012, 0x0000, &len, 1,
52030 + 0x0012, 0x0000, plen, 1,
52031 LINE6_TIMEOUT * HZ);
52032 if (ret < 0) {
52033 dev_err(line6->ifcdev,
52034 "receive length failed (error %d)\n", ret);
52035 + kfree(plen);
52036 return ret;
52037 }
52038 - } while (len == 0xff);
52039 + } while (*plen == 0xff);
52040
52041 - if (len != datalen) {
52042 + if (*plen != datalen) {
52043 /* should be equal or something went wrong */
52044 dev_err(line6->ifcdev,
52045 "length mismatch (expected %d, got %d)\n",
52046 - (int)datalen, (int)len);
52047 + (int)datalen, (int)*plen);
52048 + kfree(plen);
52049 return -EINVAL;
52050 }
52051 + kfree(plen);
52052
52053 /* receive the result: */
52054 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
52055 @@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52056 {
52057 struct usb_device *usbdev = line6->usbdev;
52058 int ret;
52059 - unsigned char status;
52060 + unsigned char *status;
52061
52062 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
52063 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
52064 @@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
52065 return ret;
52066 }
52067
52068 + status = kmalloc(1, GFP_KERNEL);
52069 + if (status == NULL)
52070 + return -ENOMEM;
52071 +
52072 do {
52073 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
52074 0x67,
52075 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52076 USB_DIR_IN,
52077 0x0012, 0x0000,
52078 - &status, 1, LINE6_TIMEOUT * HZ);
52079 + status, 1, LINE6_TIMEOUT * HZ);
52080
52081 if (ret < 0) {
52082 dev_err(line6->ifcdev,
52083 "receiving status failed (error %d)\n", ret);
52084 + kfree(status);
52085 return ret;
52086 }
52087 - } while (status == 0xff);
52088 + } while (*status == 0xff);
52089
52090 - if (status != 0) {
52091 + if (*status != 0) {
52092 dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
52093 + kfree(status);
52094 return -EINVAL;
52095 }
52096
52097 + kfree(status);
52098 +
52099 return 0;
52100 }
52101
52102 diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
52103 index 6943715..0a93632 100644
52104 --- a/drivers/staging/line6/toneport.c
52105 +++ b/drivers/staging/line6/toneport.c
52106 @@ -11,6 +11,7 @@
52107 */
52108
52109 #include <linux/wait.h>
52110 +#include <linux/slab.h>
52111 #include <sound/control.h>
52112
52113 #include "audio.h"
52114 @@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
52115 */
52116 static void toneport_setup(struct usb_line6_toneport *toneport)
52117 {
52118 - int ticks;
52119 + int *ticks;
52120 struct usb_line6 *line6 = &toneport->line6;
52121 struct usb_device *usbdev = line6->usbdev;
52122 u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
52123
52124 + ticks = kmalloc(sizeof(int), GFP_KERNEL);
52125 + if (ticks == NULL)
52126 + return;
52127 +
52128 /* sync time on device with host: */
52129 - ticks = (int)get_seconds();
52130 - line6_write_data(line6, 0x80c6, &ticks, 4);
52131 + *ticks = (int)get_seconds();
52132 + line6_write_data(line6, 0x80c6, ticks, sizeof(int));
52133 +
52134 + kfree(ticks);
52135
52136 /* enable device: */
52137 toneport_send_cmd(usbdev, 0x0301, 0x0000);
52138 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52139 index a94f336..6a1924d 100644
52140 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52141 +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52142 @@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52143 return 0;
52144 }
52145
52146 -sfw_test_client_ops_t brw_test_client;
52147 -void brw_init_test_client(void)
52148 -{
52149 - brw_test_client.tso_init = brw_client_init;
52150 - brw_test_client.tso_fini = brw_client_fini;
52151 - brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52152 - brw_test_client.tso_done_rpc = brw_client_done_rpc;
52153 +sfw_test_client_ops_t brw_test_client = {
52154 + .tso_init = brw_client_init,
52155 + .tso_fini = brw_client_fini,
52156 + .tso_prep_rpc = brw_client_prep_rpc,
52157 + .tso_done_rpc = brw_client_done_rpc,
52158 };
52159
52160 srpc_service_t brw_test_service;
52161 diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52162 index df04ab7..1deb1ac 100644
52163 --- a/drivers/staging/lustre/lnet/selftest/framework.c
52164 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
52165 @@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
52166
52167 extern sfw_test_client_ops_t ping_test_client;
52168 extern srpc_service_t ping_test_service;
52169 -extern void ping_init_test_client(void);
52170 extern void ping_init_test_service(void);
52171
52172 extern sfw_test_client_ops_t brw_test_client;
52173 extern srpc_service_t brw_test_service;
52174 -extern void brw_init_test_client(void);
52175 extern void brw_init_test_service(void);
52176
52177
52178 @@ -1681,12 +1679,10 @@ sfw_startup (void)
52179 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52180 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52181
52182 - brw_init_test_client();
52183 brw_init_test_service();
52184 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52185 LASSERT (rc == 0);
52186
52187 - ping_init_test_client();
52188 ping_init_test_service();
52189 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52190 LASSERT (rc == 0);
52191 diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52192 index 750cac4..e4d751f 100644
52193 --- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52194 +++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52195 @@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52196 return 0;
52197 }
52198
52199 -sfw_test_client_ops_t ping_test_client;
52200 -void ping_init_test_client(void)
52201 -{
52202 - ping_test_client.tso_init = ping_client_init;
52203 - ping_test_client.tso_fini = ping_client_fini;
52204 - ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52205 - ping_test_client.tso_done_rpc = ping_client_done_rpc;
52206 -}
52207 +sfw_test_client_ops_t ping_test_client = {
52208 + .tso_init = ping_client_init,
52209 + .tso_fini = ping_client_fini,
52210 + .tso_prep_rpc = ping_client_prep_rpc,
52211 + .tso_done_rpc = ping_client_done_rpc,
52212 +};
52213
52214 srpc_service_t ping_test_service;
52215 void ping_init_test_service(void)
52216 diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52217 index 14ac46f..eca2c16 100644
52218 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52219 +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52220 @@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52221 ldlm_completion_callback lcs_completion;
52222 ldlm_blocking_callback lcs_blocking;
52223 ldlm_glimpse_callback lcs_glimpse;
52224 -};
52225 +} __no_const;
52226
52227 /* ldlm_lockd.c */
52228 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52229 diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52230 index 2a88b80..62e7e5f 100644
52231 --- a/drivers/staging/lustre/lustre/include/obd.h
52232 +++ b/drivers/staging/lustre/lustre/include/obd.h
52233 @@ -1362,7 +1362,7 @@ struct md_ops {
52234 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52235 * wrapper function in include/linux/obd_class.h.
52236 */
52237 -};
52238 +} __no_const;
52239
52240 struct lsm_operations {
52241 void (*lsm_free)(struct lov_stripe_md *);
52242 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52243 index b798daa..b28ca8f 100644
52244 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52245 +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52246 @@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52247 int added = (mode == LCK_NL);
52248 int overlaps = 0;
52249 int splitted = 0;
52250 - const struct ldlm_callback_suite null_cbs = { NULL };
52251 + const struct ldlm_callback_suite null_cbs = { };
52252
52253 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52254 *flags, new->l_policy_data.l_flock.owner,
52255 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52256 index bbe2c68..c6b4275 100644
52257 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52258 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52259 @@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52260 void __user *buffer, size_t *lenp, loff_t *ppos)
52261 {
52262 int rc, max_delay_cs;
52263 - struct ctl_table dummy = *table;
52264 + ctl_table_no_const dummy = *table;
52265 long d;
52266
52267 dummy.data = &max_delay_cs;
52268 @@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52269 void __user *buffer, size_t *lenp, loff_t *ppos)
52270 {
52271 int rc, min_delay_cs;
52272 - struct ctl_table dummy = *table;
52273 + ctl_table_no_const dummy = *table;
52274 long d;
52275
52276 dummy.data = &min_delay_cs;
52277 @@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52278 void __user *buffer, size_t *lenp, loff_t *ppos)
52279 {
52280 int rc, backoff;
52281 - struct ctl_table dummy = *table;
52282 + ctl_table_no_const dummy = *table;
52283
52284 dummy.data = &backoff;
52285 dummy.proc_handler = &proc_dointvec;
52286 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52287 index 2c4fc74..b04ca79 100644
52288 --- a/drivers/staging/lustre/lustre/libcfs/module.c
52289 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
52290 @@ -315,11 +315,11 @@ out:
52291
52292
52293 struct cfs_psdev_ops libcfs_psdev_ops = {
52294 - libcfs_psdev_open,
52295 - libcfs_psdev_release,
52296 - NULL,
52297 - NULL,
52298 - libcfs_ioctl
52299 + .p_open = libcfs_psdev_open,
52300 + .p_close = libcfs_psdev_release,
52301 + .p_read = NULL,
52302 + .p_write = NULL,
52303 + .p_ioctl = libcfs_ioctl
52304 };
52305
52306 extern int insert_proc(void);
52307 diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52308 index b0bb709..0117c96 100644
52309 --- a/drivers/staging/lustre/lustre/llite/dir.c
52310 +++ b/drivers/staging/lustre/lustre/llite/dir.c
52311 @@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52312 int mode;
52313 int err;
52314
52315 - mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52316 + mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52317 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52318 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52319 lump);
52320 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52321 index b2b6c3c..302e4e4 100644
52322 --- a/drivers/staging/octeon/ethernet-rx.c
52323 +++ b/drivers/staging/octeon/ethernet-rx.c
52324 @@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52325 /* Increment RX stats for virtual ports */
52326 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52327 #ifdef CONFIG_64BIT
52328 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52329 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52330 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52331 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52332 #else
52333 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52334 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52335 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52336 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52337 #endif
52338 }
52339 netif_receive_skb(skb);
52340 @@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52341 dev->name);
52342 */
52343 #ifdef CONFIG_64BIT
52344 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52345 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52346 #else
52347 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52348 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52349 #endif
52350 dev_kfree_skb_irq(skb);
52351 }
52352 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52353 index 8f9e3fb..d283fb9 100644
52354 --- a/drivers/staging/octeon/ethernet.c
52355 +++ b/drivers/staging/octeon/ethernet.c
52356 @@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52357 * since the RX tasklet also increments it.
52358 */
52359 #ifdef CONFIG_64BIT
52360 - atomic64_add(rx_status.dropped_packets,
52361 - (atomic64_t *)&priv->stats.rx_dropped);
52362 + atomic64_add_unchecked(rx_status.dropped_packets,
52363 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52364 #else
52365 - atomic_add(rx_status.dropped_packets,
52366 - (atomic_t *)&priv->stats.rx_dropped);
52367 + atomic_add_unchecked(rx_status.dropped_packets,
52368 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
52369 #endif
52370 }
52371
52372 diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52373 index 9191993..30e9817 100644
52374 --- a/drivers/staging/rtl8188eu/include/hal_intf.h
52375 +++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52376 @@ -225,7 +225,7 @@ struct hal_ops {
52377
52378 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52379 void (*hal_reset_security_engine)(struct adapter *adapter);
52380 -};
52381 +} __no_const;
52382
52383 enum rt_eeprom_type {
52384 EEPROM_93C46,
52385 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52386 index 070cc03..6806e37 100644
52387 --- a/drivers/staging/rtl8712/rtl871x_io.h
52388 +++ b/drivers/staging/rtl8712/rtl871x_io.h
52389 @@ -108,7 +108,7 @@ struct _io_ops {
52390 u8 *pmem);
52391 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52392 u8 *pmem);
52393 -};
52394 +} __no_const;
52395
52396 struct io_req {
52397 struct list_head list;
52398 diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52399 index 2bf2e2f..84421c9 100644
52400 --- a/drivers/staging/unisys/visorchipset/visorchipset.h
52401 +++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52402 @@ -228,7 +228,7 @@ typedef struct {
52403 void (*device_resume)(ulong busNo, ulong devNo);
52404 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52405 ulong *maxSize);
52406 -} VISORCHIPSET_BUSDEV_NOTIFIERS;
52407 +} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52408
52409 /* These functions live inside visorchipset, and will be called to indicate
52410 * responses to specific events (by code outside of visorchipset).
52411 @@ -243,7 +243,7 @@ typedef struct {
52412 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52413 void (*device_pause)(ulong busNo, ulong devNo, int response);
52414 void (*device_resume)(ulong busNo, ulong devNo, int response);
52415 -} VISORCHIPSET_BUSDEV_RESPONDERS;
52416 +} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52417
52418 /** Register functions (in the bus driver) to get called by visorchipset
52419 * whenever a bus or device appears for which this service partition is
52420 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52421 index ae0dade..803d53a 100644
52422 --- a/drivers/staging/vt6655/hostap.c
52423 +++ b/drivers/staging/vt6655/hostap.c
52424 @@ -65,14 +65,13 @@
52425 *
52426 */
52427
52428 +static net_device_ops_no_const apdev_netdev_ops;
52429 +
52430 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52431 {
52432 struct vnt_private *apdev_priv;
52433 struct net_device *dev = pDevice->dev;
52434 int ret;
52435 - const struct net_device_ops apdev_netdev_ops = {
52436 - .ndo_start_xmit = pDevice->tx_80211,
52437 - };
52438
52439 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52440
52441 @@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52442 *apdev_priv = *pDevice;
52443 eth_hw_addr_inherit(pDevice->apdev, dev);
52444
52445 + /* only half broken now */
52446 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52447 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52448
52449 pDevice->apdev->type = ARPHRD_IEEE80211;
52450 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52451 index e7e9372..161f530 100644
52452 --- a/drivers/target/sbp/sbp_target.c
52453 +++ b/drivers/target/sbp/sbp_target.c
52454 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52455
52456 #define SESSION_MAINTENANCE_INTERVAL HZ
52457
52458 -static atomic_t login_id = ATOMIC_INIT(0);
52459 +static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52460
52461 static void session_maintenance_work(struct work_struct *);
52462 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52463 @@ -444,7 +444,7 @@ static void sbp_management_request_login(
52464 login->lun = se_lun;
52465 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52466 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52467 - login->login_id = atomic_inc_return(&login_id);
52468 + login->login_id = atomic_inc_return_unchecked(&login_id);
52469
52470 login->tgt_agt = sbp_target_agent_register(login);
52471 if (IS_ERR(login->tgt_agt)) {
52472 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52473 index c45f9e9..00e85f0 100644
52474 --- a/drivers/target/target_core_device.c
52475 +++ b/drivers/target/target_core_device.c
52476 @@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52477 spin_lock_init(&dev->se_tmr_lock);
52478 spin_lock_init(&dev->qf_cmd_lock);
52479 sema_init(&dev->caw_sem, 1);
52480 - atomic_set(&dev->dev_ordered_id, 0);
52481 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
52482 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52483 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52484 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52485 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52486 index be877bf..7be9cd4 100644
52487 --- a/drivers/target/target_core_transport.c
52488 +++ b/drivers/target/target_core_transport.c
52489 @@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52490 * Used to determine when ORDERED commands should go from
52491 * Dormant to Active status.
52492 */
52493 - cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52494 + cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52495 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52496 cmd->se_ordered_id, cmd->sam_task_attr,
52497 dev->transport->name);
52498 diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52499 index edc1cce..769e4cb 100644
52500 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52501 +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52502 @@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52503 platform_set_drvdata(pdev, priv);
52504
52505 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52506 - int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52507 - int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52508 + pax_open_kernel();
52509 + *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52510 + *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52511 + pax_close_kernel();
52512 }
52513 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52514 priv, &int3400_thermal_ops,
52515 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52516 index 62143ba..ae21165 100644
52517 --- a/drivers/thermal/of-thermal.c
52518 +++ b/drivers/thermal/of-thermal.c
52519 @@ -30,6 +30,7 @@
52520 #include <linux/err.h>
52521 #include <linux/export.h>
52522 #include <linux/string.h>
52523 +#include <linux/mm.h>
52524
52525 #include "thermal_core.h"
52526
52527 @@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52528 tz->get_trend = get_trend;
52529 tz->sensor_data = data;
52530
52531 - tzd->ops->get_temp = of_thermal_get_temp;
52532 - tzd->ops->get_trend = of_thermal_get_trend;
52533 + pax_open_kernel();
52534 + *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52535 + *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52536 + pax_close_kernel();
52537 mutex_unlock(&tzd->lock);
52538
52539 return tzd;
52540 @@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52541 return;
52542
52543 mutex_lock(&tzd->lock);
52544 - tzd->ops->get_temp = NULL;
52545 - tzd->ops->get_trend = NULL;
52546 + pax_open_kernel();
52547 + *(void **)&tzd->ops->get_temp = NULL;
52548 + *(void **)&tzd->ops->get_trend = NULL;
52549 + pax_close_kernel();
52550
52551 tz->get_temp = NULL;
52552 tz->get_trend = NULL;
52553 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52554 index fd66f57..48e6376 100644
52555 --- a/drivers/tty/cyclades.c
52556 +++ b/drivers/tty/cyclades.c
52557 @@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52558 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52559 info->port.count);
52560 #endif
52561 - info->port.count++;
52562 + atomic_inc(&info->port.count);
52563 #ifdef CY_DEBUG_COUNT
52564 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52565 - current->pid, info->port.count);
52566 + current->pid, atomic_read(&info->port.count));
52567 #endif
52568
52569 /*
52570 @@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52571 for (j = 0; j < cy_card[i].nports; j++) {
52572 info = &cy_card[i].ports[j];
52573
52574 - if (info->port.count) {
52575 + if (atomic_read(&info->port.count)) {
52576 /* XXX is the ldisc num worth this? */
52577 struct tty_struct *tty;
52578 struct tty_ldisc *ld;
52579 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52580 index 4fcec1d..5a036f7 100644
52581 --- a/drivers/tty/hvc/hvc_console.c
52582 +++ b/drivers/tty/hvc/hvc_console.c
52583 @@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52584
52585 spin_lock_irqsave(&hp->port.lock, flags);
52586 /* Check and then increment for fast path open. */
52587 - if (hp->port.count++ > 0) {
52588 + if (atomic_inc_return(&hp->port.count) > 1) {
52589 spin_unlock_irqrestore(&hp->port.lock, flags);
52590 hvc_kick();
52591 return 0;
52592 @@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52593
52594 spin_lock_irqsave(&hp->port.lock, flags);
52595
52596 - if (--hp->port.count == 0) {
52597 + if (atomic_dec_return(&hp->port.count) == 0) {
52598 spin_unlock_irqrestore(&hp->port.lock, flags);
52599 /* We are done with the tty pointer now. */
52600 tty_port_tty_set(&hp->port, NULL);
52601 @@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52602 */
52603 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52604 } else {
52605 - if (hp->port.count < 0)
52606 + if (atomic_read(&hp->port.count) < 0)
52607 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52608 - hp->vtermno, hp->port.count);
52609 + hp->vtermno, atomic_read(&hp->port.count));
52610 spin_unlock_irqrestore(&hp->port.lock, flags);
52611 }
52612 }
52613 @@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52614 * open->hangup case this can be called after the final close so prevent
52615 * that from happening for now.
52616 */
52617 - if (hp->port.count <= 0) {
52618 + if (atomic_read(&hp->port.count) <= 0) {
52619 spin_unlock_irqrestore(&hp->port.lock, flags);
52620 return;
52621 }
52622
52623 - hp->port.count = 0;
52624 + atomic_set(&hp->port.count, 0);
52625 spin_unlock_irqrestore(&hp->port.lock, flags);
52626 tty_port_tty_set(&hp->port, NULL);
52627
52628 @@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52629 return -EPIPE;
52630
52631 /* FIXME what's this (unprotected) check for? */
52632 - if (hp->port.count <= 0)
52633 + if (atomic_read(&hp->port.count) <= 0)
52634 return -EIO;
52635
52636 spin_lock_irqsave(&hp->lock, flags);
52637 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52638 index 81e939e..95ead10 100644
52639 --- a/drivers/tty/hvc/hvcs.c
52640 +++ b/drivers/tty/hvc/hvcs.c
52641 @@ -83,6 +83,7 @@
52642 #include <asm/hvcserver.h>
52643 #include <asm/uaccess.h>
52644 #include <asm/vio.h>
52645 +#include <asm/local.h>
52646
52647 /*
52648 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52649 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52650
52651 spin_lock_irqsave(&hvcsd->lock, flags);
52652
52653 - if (hvcsd->port.count > 0) {
52654 + if (atomic_read(&hvcsd->port.count) > 0) {
52655 spin_unlock_irqrestore(&hvcsd->lock, flags);
52656 printk(KERN_INFO "HVCS: vterm state unchanged. "
52657 "The hvcs device node is still in use.\n");
52658 @@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52659 }
52660 }
52661
52662 - hvcsd->port.count = 0;
52663 + atomic_set(&hvcsd->port.count, 0);
52664 hvcsd->port.tty = tty;
52665 tty->driver_data = hvcsd;
52666
52667 @@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52668 unsigned long flags;
52669
52670 spin_lock_irqsave(&hvcsd->lock, flags);
52671 - hvcsd->port.count++;
52672 + atomic_inc(&hvcsd->port.count);
52673 hvcsd->todo_mask |= HVCS_SCHED_READ;
52674 spin_unlock_irqrestore(&hvcsd->lock, flags);
52675
52676 @@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52677 hvcsd = tty->driver_data;
52678
52679 spin_lock_irqsave(&hvcsd->lock, flags);
52680 - if (--hvcsd->port.count == 0) {
52681 + if (atomic_dec_and_test(&hvcsd->port.count)) {
52682
52683 vio_disable_interrupts(hvcsd->vdev);
52684
52685 @@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52686
52687 free_irq(irq, hvcsd);
52688 return;
52689 - } else if (hvcsd->port.count < 0) {
52690 + } else if (atomic_read(&hvcsd->port.count) < 0) {
52691 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52692 " is missmanaged.\n",
52693 - hvcsd->vdev->unit_address, hvcsd->port.count);
52694 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52695 }
52696
52697 spin_unlock_irqrestore(&hvcsd->lock, flags);
52698 @@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52699
52700 spin_lock_irqsave(&hvcsd->lock, flags);
52701 /* Preserve this so that we know how many kref refs to put */
52702 - temp_open_count = hvcsd->port.count;
52703 + temp_open_count = atomic_read(&hvcsd->port.count);
52704
52705 /*
52706 * Don't kref put inside the spinlock because the destruction
52707 @@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52708 tty->driver_data = NULL;
52709 hvcsd->port.tty = NULL;
52710
52711 - hvcsd->port.count = 0;
52712 + atomic_set(&hvcsd->port.count, 0);
52713
52714 /* This will drop any buffered data on the floor which is OK in a hangup
52715 * scenario. */
52716 @@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52717 * the middle of a write operation? This is a crummy place to do this
52718 * but we want to keep it all in the spinlock.
52719 */
52720 - if (hvcsd->port.count <= 0) {
52721 + if (atomic_read(&hvcsd->port.count) <= 0) {
52722 spin_unlock_irqrestore(&hvcsd->lock, flags);
52723 return -ENODEV;
52724 }
52725 @@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52726 {
52727 struct hvcs_struct *hvcsd = tty->driver_data;
52728
52729 - if (!hvcsd || hvcsd->port.count <= 0)
52730 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52731 return 0;
52732
52733 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52734 diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52735 index 4190199..06d5bfa 100644
52736 --- a/drivers/tty/hvc/hvsi.c
52737 +++ b/drivers/tty/hvc/hvsi.c
52738 @@ -85,7 +85,7 @@ struct hvsi_struct {
52739 int n_outbuf;
52740 uint32_t vtermno;
52741 uint32_t virq;
52742 - atomic_t seqno; /* HVSI packet sequence number */
52743 + atomic_unchecked_t seqno; /* HVSI packet sequence number */
52744 uint16_t mctrl;
52745 uint8_t state; /* HVSI protocol state */
52746 uint8_t flags;
52747 @@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52748
52749 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52750 packet.hdr.len = sizeof(struct hvsi_query_response);
52751 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52752 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52753 packet.verb = VSV_SEND_VERSION_NUMBER;
52754 packet.u.version = HVSI_VERSION;
52755 packet.query_seqno = query_seqno+1;
52756 @@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52757
52758 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52759 packet.hdr.len = sizeof(struct hvsi_query);
52760 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52761 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52762 packet.verb = verb;
52763
52764 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52765 @@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52766 int wrote;
52767
52768 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52769 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52770 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52771 packet.hdr.len = sizeof(struct hvsi_control);
52772 packet.verb = VSV_SET_MODEM_CTL;
52773 packet.mask = HVSI_TSDTR;
52774 @@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52775 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52776
52777 packet.hdr.type = VS_DATA_PACKET_HEADER;
52778 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52779 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52780 packet.hdr.len = count + sizeof(struct hvsi_header);
52781 memcpy(&packet.data, buf, count);
52782
52783 @@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52784 struct hvsi_control packet __ALIGNED__;
52785
52786 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52787 - packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52788 + packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52789 packet.hdr.len = 6;
52790 packet.verb = VSV_CLOSE_PROTOCOL;
52791
52792 @@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52793
52794 tty_port_tty_set(&hp->port, tty);
52795 spin_lock_irqsave(&hp->lock, flags);
52796 - hp->port.count++;
52797 + atomic_inc(&hp->port.count);
52798 atomic_set(&hp->seqno, 0);
52799 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52800 spin_unlock_irqrestore(&hp->lock, flags);
52801 @@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52802
52803 spin_lock_irqsave(&hp->lock, flags);
52804
52805 - if (--hp->port.count == 0) {
52806 + if (atomic_dec_return(&hp->port.count) == 0) {
52807 tty_port_tty_set(&hp->port, NULL);
52808 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52809
52810 @@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52811
52812 spin_lock_irqsave(&hp->lock, flags);
52813 }
52814 - } else if (hp->port.count < 0)
52815 + } else if (atomic_read(&hp->port.count) < 0)
52816 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52817 - hp - hvsi_ports, hp->port.count);
52818 + hp - hvsi_ports, atomic_read(&hp->port.count));
52819
52820 spin_unlock_irqrestore(&hp->lock, flags);
52821 }
52822 @@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52823 tty_port_tty_set(&hp->port, NULL);
52824
52825 spin_lock_irqsave(&hp->lock, flags);
52826 - hp->port.count = 0;
52827 + atomic_set(&hp->port.count, 0);
52828 hp->n_outbuf = 0;
52829 spin_unlock_irqrestore(&hp->lock, flags);
52830 }
52831 diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52832 index 7ae6c29..05c6dba 100644
52833 --- a/drivers/tty/hvc/hvsi_lib.c
52834 +++ b/drivers/tty/hvc/hvsi_lib.c
52835 @@ -8,7 +8,7 @@
52836
52837 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52838 {
52839 - packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52840 + packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52841
52842 /* Assumes that always succeeds, works in practice */
52843 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52844 @@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52845
52846 /* Reset state */
52847 pv->established = 0;
52848 - atomic_set(&pv->seqno, 0);
52849 + atomic_set_unchecked(&pv->seqno, 0);
52850
52851 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52852
52853 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52854 index 345cebb..d5a1e9e 100644
52855 --- a/drivers/tty/ipwireless/tty.c
52856 +++ b/drivers/tty/ipwireless/tty.c
52857 @@ -28,6 +28,7 @@
52858 #include <linux/tty_driver.h>
52859 #include <linux/tty_flip.h>
52860 #include <linux/uaccess.h>
52861 +#include <asm/local.h>
52862
52863 #include "tty.h"
52864 #include "network.h"
52865 @@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52866 return -ENODEV;
52867
52868 mutex_lock(&tty->ipw_tty_mutex);
52869 - if (tty->port.count == 0)
52870 + if (atomic_read(&tty->port.count) == 0)
52871 tty->tx_bytes_queued = 0;
52872
52873 - tty->port.count++;
52874 + atomic_inc(&tty->port.count);
52875
52876 tty->port.tty = linux_tty;
52877 linux_tty->driver_data = tty;
52878 @@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52879
52880 static void do_ipw_close(struct ipw_tty *tty)
52881 {
52882 - tty->port.count--;
52883 -
52884 - if (tty->port.count == 0) {
52885 + if (atomic_dec_return(&tty->port.count) == 0) {
52886 struct tty_struct *linux_tty = tty->port.tty;
52887
52888 if (linux_tty != NULL) {
52889 @@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52890 return;
52891
52892 mutex_lock(&tty->ipw_tty_mutex);
52893 - if (tty->port.count == 0) {
52894 + if (atomic_read(&tty->port.count) == 0) {
52895 mutex_unlock(&tty->ipw_tty_mutex);
52896 return;
52897 }
52898 @@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52899
52900 mutex_lock(&tty->ipw_tty_mutex);
52901
52902 - if (!tty->port.count) {
52903 + if (!atomic_read(&tty->port.count)) {
52904 mutex_unlock(&tty->ipw_tty_mutex);
52905 return;
52906 }
52907 @@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52908 return -ENODEV;
52909
52910 mutex_lock(&tty->ipw_tty_mutex);
52911 - if (!tty->port.count) {
52912 + if (!atomic_read(&tty->port.count)) {
52913 mutex_unlock(&tty->ipw_tty_mutex);
52914 return -EINVAL;
52915 }
52916 @@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52917 if (!tty)
52918 return -ENODEV;
52919
52920 - if (!tty->port.count)
52921 + if (!atomic_read(&tty->port.count))
52922 return -EINVAL;
52923
52924 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52925 @@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52926 if (!tty)
52927 return 0;
52928
52929 - if (!tty->port.count)
52930 + if (!atomic_read(&tty->port.count))
52931 return 0;
52932
52933 return tty->tx_bytes_queued;
52934 @@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52935 if (!tty)
52936 return -ENODEV;
52937
52938 - if (!tty->port.count)
52939 + if (!atomic_read(&tty->port.count))
52940 return -EINVAL;
52941
52942 return get_control_lines(tty);
52943 @@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52944 if (!tty)
52945 return -ENODEV;
52946
52947 - if (!tty->port.count)
52948 + if (!atomic_read(&tty->port.count))
52949 return -EINVAL;
52950
52951 return set_control_lines(tty, set, clear);
52952 @@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
52953 if (!tty)
52954 return -ENODEV;
52955
52956 - if (!tty->port.count)
52957 + if (!atomic_read(&tty->port.count))
52958 return -EINVAL;
52959
52960 /* FIXME: Exactly how is the tty object locked here .. */
52961 @@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
52962 * are gone */
52963 mutex_lock(&ttyj->ipw_tty_mutex);
52964 }
52965 - while (ttyj->port.count)
52966 + while (atomic_read(&ttyj->port.count))
52967 do_ipw_close(ttyj);
52968 ipwireless_disassociate_network_ttys(network,
52969 ttyj->channel_idx);
52970 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
52971 index 14c54e0..1efd4f2 100644
52972 --- a/drivers/tty/moxa.c
52973 +++ b/drivers/tty/moxa.c
52974 @@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
52975 }
52976
52977 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
52978 - ch->port.count++;
52979 + atomic_inc(&ch->port.count);
52980 tty->driver_data = ch;
52981 tty_port_tty_set(&ch->port, tty);
52982 mutex_lock(&ch->port.mutex);
52983 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
52984 index c434376..114ce13 100644
52985 --- a/drivers/tty/n_gsm.c
52986 +++ b/drivers/tty/n_gsm.c
52987 @@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
52988 spin_lock_init(&dlci->lock);
52989 mutex_init(&dlci->mutex);
52990 dlci->fifo = &dlci->_fifo;
52991 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
52992 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
52993 kfree(dlci);
52994 return NULL;
52995 }
52996 @@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
52997 struct gsm_dlci *dlci = tty->driver_data;
52998 struct tty_port *port = &dlci->port;
52999
53000 - port->count++;
53001 + atomic_inc(&port->count);
53002 tty_port_tty_set(port, tty);
53003
53004 dlci->modem_rx = 0;
53005 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
53006 index 47ca0f3..3c0b803 100644
53007 --- a/drivers/tty/n_tty.c
53008 +++ b/drivers/tty/n_tty.c
53009 @@ -115,7 +115,7 @@ struct n_tty_data {
53010 int minimum_to_wake;
53011
53012 /* consumer-published */
53013 - size_t read_tail;
53014 + size_t read_tail __intentional_overflow(-1);
53015 size_t line_start;
53016
53017 /* protected by output lock */
53018 @@ -2523,6 +2523,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
53019 {
53020 *ops = tty_ldisc_N_TTY;
53021 ops->owner = NULL;
53022 - ops->refcount = ops->flags = 0;
53023 + atomic_set(&ops->refcount, 0);
53024 + ops->flags = 0;
53025 }
53026 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
53027 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
53028 index 7c4447a..70fbc1e 100644
53029 --- a/drivers/tty/pty.c
53030 +++ b/drivers/tty/pty.c
53031 @@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
53032 panic("Couldn't register Unix98 pts driver");
53033
53034 /* Now create the /dev/ptmx special device */
53035 + pax_open_kernel();
53036 tty_default_fops(&ptmx_fops);
53037 - ptmx_fops.open = ptmx_open;
53038 + *(void **)&ptmx_fops.open = ptmx_open;
53039 + pax_close_kernel();
53040
53041 cdev_init(&ptmx_cdev, &ptmx_fops);
53042 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
53043 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
53044 index 383c4c7..d408e21 100644
53045 --- a/drivers/tty/rocket.c
53046 +++ b/drivers/tty/rocket.c
53047 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53048 tty->driver_data = info;
53049 tty_port_tty_set(port, tty);
53050
53051 - if (port->count++ == 0) {
53052 + if (atomic_inc_return(&port->count) == 1) {
53053 atomic_inc(&rp_num_ports_open);
53054
53055 #ifdef ROCKET_DEBUG_OPEN
53056 @@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53057 #endif
53058 }
53059 #ifdef ROCKET_DEBUG_OPEN
53060 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
53061 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
53062 #endif
53063
53064 /*
53065 @@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
53066 spin_unlock_irqrestore(&info->port.lock, flags);
53067 return;
53068 }
53069 - if (info->port.count)
53070 + if (atomic_read(&info->port.count))
53071 atomic_dec(&rp_num_ports_open);
53072 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
53073 spin_unlock_irqrestore(&info->port.lock, flags);
53074 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53075 index aa28209..e08fb85 100644
53076 --- a/drivers/tty/serial/ioc4_serial.c
53077 +++ b/drivers/tty/serial/ioc4_serial.c
53078 @@ -437,7 +437,7 @@ struct ioc4_soft {
53079 } is_intr_info[MAX_IOC4_INTR_ENTS];
53080
53081 /* Number of entries active in the above array */
53082 - atomic_t is_num_intrs;
53083 + atomic_unchecked_t is_num_intrs;
53084 } is_intr_type[IOC4_NUM_INTR_TYPES];
53085
53086 /* is_ir_lock must be held while
53087 @@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53088 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53089 || (type == IOC4_OTHER_INTR_TYPE)));
53090
53091 - i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53092 + i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53093 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53094
53095 /* Save off the lower level interrupt handler */
53096 @@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53097
53098 soft = arg;
53099 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53100 - num_intrs = (int)atomic_read(
53101 + num_intrs = (int)atomic_read_unchecked(
53102 &soft->is_intr_type[intr_type].is_num_intrs);
53103
53104 this_mir = this_ir = pending_intrs(soft, intr_type);
53105 diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53106 index 129dc5b..1da5bb8 100644
53107 --- a/drivers/tty/serial/kgdb_nmi.c
53108 +++ b/drivers/tty/serial/kgdb_nmi.c
53109 @@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53110 * I/O utilities that messages sent to the console will automatically
53111 * be displayed on the dbg_io.
53112 */
53113 - dbg_io_ops->is_console = true;
53114 + pax_open_kernel();
53115 + *(int *)&dbg_io_ops->is_console = true;
53116 + pax_close_kernel();
53117
53118 return 0;
53119 }
53120 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53121 index a260cde..6b2b5ce 100644
53122 --- a/drivers/tty/serial/kgdboc.c
53123 +++ b/drivers/tty/serial/kgdboc.c
53124 @@ -24,8 +24,9 @@
53125 #define MAX_CONFIG_LEN 40
53126
53127 static struct kgdb_io kgdboc_io_ops;
53128 +static struct kgdb_io kgdboc_io_ops_console;
53129
53130 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53131 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53132 static int configured = -1;
53133
53134 static char config[MAX_CONFIG_LEN];
53135 @@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53136 kgdboc_unregister_kbd();
53137 if (configured == 1)
53138 kgdb_unregister_io_module(&kgdboc_io_ops);
53139 + else if (configured == 2)
53140 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
53141 }
53142
53143 static int configure_kgdboc(void)
53144 @@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53145 int err;
53146 char *cptr = config;
53147 struct console *cons;
53148 + int is_console = 0;
53149
53150 err = kgdboc_option_setup(config);
53151 if (err || !strlen(config) || isspace(config[0]))
53152 goto noconfig;
53153
53154 err = -ENODEV;
53155 - kgdboc_io_ops.is_console = 0;
53156 kgdb_tty_driver = NULL;
53157
53158 kgdboc_use_kms = 0;
53159 @@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53160 int idx;
53161 if (cons->device && cons->device(cons, &idx) == p &&
53162 idx == tty_line) {
53163 - kgdboc_io_ops.is_console = 1;
53164 + is_console = 1;
53165 break;
53166 }
53167 cons = cons->next;
53168 @@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53169 kgdb_tty_line = tty_line;
53170
53171 do_register:
53172 - err = kgdb_register_io_module(&kgdboc_io_ops);
53173 + if (is_console) {
53174 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
53175 + configured = 2;
53176 + } else {
53177 + err = kgdb_register_io_module(&kgdboc_io_ops);
53178 + configured = 1;
53179 + }
53180 if (err)
53181 goto noconfig;
53182
53183 @@ -205,8 +214,6 @@ do_register:
53184 if (err)
53185 goto nmi_con_failed;
53186
53187 - configured = 1;
53188 -
53189 return 0;
53190
53191 nmi_con_failed:
53192 @@ -223,7 +230,7 @@ noconfig:
53193 static int __init init_kgdboc(void)
53194 {
53195 /* Already configured? */
53196 - if (configured == 1)
53197 + if (configured >= 1)
53198 return 0;
53199
53200 return configure_kgdboc();
53201 @@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53202 if (config[len - 1] == '\n')
53203 config[len - 1] = '\0';
53204
53205 - if (configured == 1)
53206 + if (configured >= 1)
53207 cleanup_kgdboc();
53208
53209 /* Go and configure with the new params. */
53210 @@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53211 .post_exception = kgdboc_post_exp_handler,
53212 };
53213
53214 +static struct kgdb_io kgdboc_io_ops_console = {
53215 + .name = "kgdboc",
53216 + .read_char = kgdboc_get_char,
53217 + .write_char = kgdboc_put_char,
53218 + .pre_exception = kgdboc_pre_exp_handler,
53219 + .post_exception = kgdboc_post_exp_handler,
53220 + .is_console = 1
53221 +};
53222 +
53223 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53224 /* This is only available if kgdboc is a built in for early debugging */
53225 static int __init kgdboc_early_init(char *opt)
53226 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53227 index 4b6c783..9a19db3 100644
53228 --- a/drivers/tty/serial/msm_serial.c
53229 +++ b/drivers/tty/serial/msm_serial.c
53230 @@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53231 .cons = MSM_CONSOLE,
53232 };
53233
53234 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53235 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53236
53237 static const struct of_device_id msm_uartdm_table[] = {
53238 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53239 @@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53240 int irq;
53241
53242 if (pdev->id == -1)
53243 - pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53244 + pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53245
53246 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53247 return -ENXIO;
53248 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53249 index 587d63b..48423a6 100644
53250 --- a/drivers/tty/serial/samsung.c
53251 +++ b/drivers/tty/serial/samsung.c
53252 @@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53253 }
53254 }
53255
53256 +static int s3c64xx_serial_startup(struct uart_port *port);
53257 static int s3c24xx_serial_startup(struct uart_port *port)
53258 {
53259 struct s3c24xx_uart_port *ourport = to_ourport(port);
53260 int ret;
53261
53262 + /* Startup sequence is different for s3c64xx and higher SoC's */
53263 + if (s3c24xx_serial_has_interrupt_mask(port))
53264 + return s3c64xx_serial_startup(port);
53265 +
53266 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53267 port, (unsigned long long)port->mapbase, port->membase);
53268
53269 @@ -1159,10 +1164,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53270 /* setup info for port */
53271 port->dev = &platdev->dev;
53272
53273 - /* Startup sequence is different for s3c64xx and higher SoC's */
53274 - if (s3c24xx_serial_has_interrupt_mask(port))
53275 - s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53276 -
53277 port->uartclk = 1;
53278
53279 if (cfg->uart_flags & UPF_CONS_FLOW) {
53280 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53281 index eaeb9a0..01a238c 100644
53282 --- a/drivers/tty/serial/serial_core.c
53283 +++ b/drivers/tty/serial/serial_core.c
53284 @@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53285
53286 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53287
53288 - if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53289 + if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53290 return;
53291
53292 /*
53293 @@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53294 uart_flush_buffer(tty);
53295 uart_shutdown(tty, state);
53296 spin_lock_irqsave(&port->lock, flags);
53297 - port->count = 0;
53298 + atomic_set(&port->count, 0);
53299 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53300 spin_unlock_irqrestore(&port->lock, flags);
53301 tty_port_tty_set(port, NULL);
53302 @@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53303 goto end;
53304 }
53305
53306 - port->count++;
53307 + atomic_inc(&port->count);
53308 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53309 retval = -ENXIO;
53310 goto err_dec_count;
53311 @@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53312 end:
53313 return retval;
53314 err_dec_count:
53315 - port->count--;
53316 + atomic_dec(&port->count);
53317 mutex_unlock(&port->mutex);
53318 goto end;
53319 }
53320 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53321 index b799170..87dafd5 100644
53322 --- a/drivers/tty/synclink.c
53323 +++ b/drivers/tty/synclink.c
53324 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53325
53326 if (debug_level >= DEBUG_LEVEL_INFO)
53327 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53328 - __FILE__,__LINE__, info->device_name, info->port.count);
53329 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53330
53331 if (tty_port_close_start(&info->port, tty, filp) == 0)
53332 goto cleanup;
53333 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53334 cleanup:
53335 if (debug_level >= DEBUG_LEVEL_INFO)
53336 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53337 - tty->driver->name, info->port.count);
53338 + tty->driver->name, atomic_read(&info->port.count));
53339
53340 } /* end of mgsl_close() */
53341
53342 @@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53343
53344 mgsl_flush_buffer(tty);
53345 shutdown(info);
53346 -
53347 - info->port.count = 0;
53348 +
53349 + atomic_set(&info->port.count, 0);
53350 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53351 info->port.tty = NULL;
53352
53353 @@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53354
53355 if (debug_level >= DEBUG_LEVEL_INFO)
53356 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53357 - __FILE__,__LINE__, tty->driver->name, port->count );
53358 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53359
53360 spin_lock_irqsave(&info->irq_spinlock, flags);
53361 - port->count--;
53362 + atomic_dec(&port->count);
53363 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53364 port->blocked_open++;
53365
53366 @@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53367
53368 if (debug_level >= DEBUG_LEVEL_INFO)
53369 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53370 - __FILE__,__LINE__, tty->driver->name, port->count );
53371 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53372
53373 tty_unlock(tty);
53374 schedule();
53375 @@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53376
53377 /* FIXME: Racy on hangup during close wait */
53378 if (!tty_hung_up_p(filp))
53379 - port->count++;
53380 + atomic_inc(&port->count);
53381 port->blocked_open--;
53382
53383 if (debug_level >= DEBUG_LEVEL_INFO)
53384 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53385 - __FILE__,__LINE__, tty->driver->name, port->count );
53386 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53387
53388 if (!retval)
53389 port->flags |= ASYNC_NORMAL_ACTIVE;
53390 @@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53391
53392 if (debug_level >= DEBUG_LEVEL_INFO)
53393 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53394 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53395 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53396
53397 /* If port is closing, signal caller to try again */
53398 if (info->port.flags & ASYNC_CLOSING){
53399 @@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53400 spin_unlock_irqrestore(&info->netlock, flags);
53401 goto cleanup;
53402 }
53403 - info->port.count++;
53404 + atomic_inc(&info->port.count);
53405 spin_unlock_irqrestore(&info->netlock, flags);
53406
53407 - if (info->port.count == 1) {
53408 + if (atomic_read(&info->port.count) == 1) {
53409 /* 1st open on this device, init hardware */
53410 retval = startup(info);
53411 if (retval < 0)
53412 @@ -3442,8 +3442,8 @@ cleanup:
53413 if (retval) {
53414 if (tty->count == 1)
53415 info->port.tty = NULL; /* tty layer will release tty struct */
53416 - if(info->port.count)
53417 - info->port.count--;
53418 + if (atomic_read(&info->port.count))
53419 + atomic_dec(&info->port.count);
53420 }
53421
53422 return retval;
53423 @@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53424 unsigned short new_crctype;
53425
53426 /* return error if TTY interface open */
53427 - if (info->port.count)
53428 + if (atomic_read(&info->port.count))
53429 return -EBUSY;
53430
53431 switch (encoding)
53432 @@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53433
53434 /* arbitrate between network and tty opens */
53435 spin_lock_irqsave(&info->netlock, flags);
53436 - if (info->port.count != 0 || info->netcount != 0) {
53437 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53438 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53439 spin_unlock_irqrestore(&info->netlock, flags);
53440 return -EBUSY;
53441 @@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53442 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53443
53444 /* return error if TTY interface open */
53445 - if (info->port.count)
53446 + if (atomic_read(&info->port.count))
53447 return -EBUSY;
53448
53449 if (cmd != SIOCWANDEV)
53450 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53451 index 0e8c39b..e0cb171 100644
53452 --- a/drivers/tty/synclink_gt.c
53453 +++ b/drivers/tty/synclink_gt.c
53454 @@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53455 tty->driver_data = info;
53456 info->port.tty = tty;
53457
53458 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53459 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53460
53461 /* If port is closing, signal caller to try again */
53462 if (info->port.flags & ASYNC_CLOSING){
53463 @@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53464 mutex_unlock(&info->port.mutex);
53465 goto cleanup;
53466 }
53467 - info->port.count++;
53468 + atomic_inc(&info->port.count);
53469 spin_unlock_irqrestore(&info->netlock, flags);
53470
53471 - if (info->port.count == 1) {
53472 + if (atomic_read(&info->port.count) == 1) {
53473 /* 1st open on this device, init hardware */
53474 retval = startup(info);
53475 if (retval < 0) {
53476 @@ -715,8 +715,8 @@ cleanup:
53477 if (retval) {
53478 if (tty->count == 1)
53479 info->port.tty = NULL; /* tty layer will release tty struct */
53480 - if(info->port.count)
53481 - info->port.count--;
53482 + if(atomic_read(&info->port.count))
53483 + atomic_dec(&info->port.count);
53484 }
53485
53486 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53487 @@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53488
53489 if (sanity_check(info, tty->name, "close"))
53490 return;
53491 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53492 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53493
53494 if (tty_port_close_start(&info->port, tty, filp) == 0)
53495 goto cleanup;
53496 @@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53497 tty_port_close_end(&info->port, tty);
53498 info->port.tty = NULL;
53499 cleanup:
53500 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53501 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53502 }
53503
53504 static void hangup(struct tty_struct *tty)
53505 @@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53506 shutdown(info);
53507
53508 spin_lock_irqsave(&info->port.lock, flags);
53509 - info->port.count = 0;
53510 + atomic_set(&info->port.count, 0);
53511 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53512 info->port.tty = NULL;
53513 spin_unlock_irqrestore(&info->port.lock, flags);
53514 @@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53515 unsigned short new_crctype;
53516
53517 /* return error if TTY interface open */
53518 - if (info->port.count)
53519 + if (atomic_read(&info->port.count))
53520 return -EBUSY;
53521
53522 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53523 @@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53524
53525 /* arbitrate between network and tty opens */
53526 spin_lock_irqsave(&info->netlock, flags);
53527 - if (info->port.count != 0 || info->netcount != 0) {
53528 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53529 DBGINFO(("%s hdlc_open busy\n", dev->name));
53530 spin_unlock_irqrestore(&info->netlock, flags);
53531 return -EBUSY;
53532 @@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53533 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53534
53535 /* return error if TTY interface open */
53536 - if (info->port.count)
53537 + if (atomic_read(&info->port.count))
53538 return -EBUSY;
53539
53540 if (cmd != SIOCWANDEV)
53541 @@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53542 if (port == NULL)
53543 continue;
53544 spin_lock(&port->lock);
53545 - if ((port->port.count || port->netcount) &&
53546 + if ((atomic_read(&port->port.count) || port->netcount) &&
53547 port->pending_bh && !port->bh_running &&
53548 !port->bh_requested) {
53549 DBGISR(("%s bh queued\n", port->device_name));
53550 @@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53551 add_wait_queue(&port->open_wait, &wait);
53552
53553 spin_lock_irqsave(&info->lock, flags);
53554 - port->count--;
53555 + atomic_dec(&port->count);
53556 spin_unlock_irqrestore(&info->lock, flags);
53557 port->blocked_open++;
53558
53559 @@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53560 remove_wait_queue(&port->open_wait, &wait);
53561
53562 if (!tty_hung_up_p(filp))
53563 - port->count++;
53564 + atomic_inc(&port->count);
53565 port->blocked_open--;
53566
53567 if (!retval)
53568 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53569 index c3f9091..abe4601 100644
53570 --- a/drivers/tty/synclinkmp.c
53571 +++ b/drivers/tty/synclinkmp.c
53572 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53573
53574 if (debug_level >= DEBUG_LEVEL_INFO)
53575 printk("%s(%d):%s open(), old ref count = %d\n",
53576 - __FILE__,__LINE__,tty->driver->name, info->port.count);
53577 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53578
53579 /* If port is closing, signal caller to try again */
53580 if (info->port.flags & ASYNC_CLOSING){
53581 @@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53582 spin_unlock_irqrestore(&info->netlock, flags);
53583 goto cleanup;
53584 }
53585 - info->port.count++;
53586 + atomic_inc(&info->port.count);
53587 spin_unlock_irqrestore(&info->netlock, flags);
53588
53589 - if (info->port.count == 1) {
53590 + if (atomic_read(&info->port.count) == 1) {
53591 /* 1st open on this device, init hardware */
53592 retval = startup(info);
53593 if (retval < 0)
53594 @@ -796,8 +796,8 @@ cleanup:
53595 if (retval) {
53596 if (tty->count == 1)
53597 info->port.tty = NULL; /* tty layer will release tty struct */
53598 - if(info->port.count)
53599 - info->port.count--;
53600 + if(atomic_read(&info->port.count))
53601 + atomic_dec(&info->port.count);
53602 }
53603
53604 return retval;
53605 @@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53606
53607 if (debug_level >= DEBUG_LEVEL_INFO)
53608 printk("%s(%d):%s close() entry, count=%d\n",
53609 - __FILE__,__LINE__, info->device_name, info->port.count);
53610 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53611
53612 if (tty_port_close_start(&info->port, tty, filp) == 0)
53613 goto cleanup;
53614 @@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53615 cleanup:
53616 if (debug_level >= DEBUG_LEVEL_INFO)
53617 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53618 - tty->driver->name, info->port.count);
53619 + tty->driver->name, atomic_read(&info->port.count));
53620 }
53621
53622 /* Called by tty_hangup() when a hangup is signaled.
53623 @@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53624 shutdown(info);
53625
53626 spin_lock_irqsave(&info->port.lock, flags);
53627 - info->port.count = 0;
53628 + atomic_set(&info->port.count, 0);
53629 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53630 info->port.tty = NULL;
53631 spin_unlock_irqrestore(&info->port.lock, flags);
53632 @@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53633 unsigned short new_crctype;
53634
53635 /* return error if TTY interface open */
53636 - if (info->port.count)
53637 + if (atomic_read(&info->port.count))
53638 return -EBUSY;
53639
53640 switch (encoding)
53641 @@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53642
53643 /* arbitrate between network and tty opens */
53644 spin_lock_irqsave(&info->netlock, flags);
53645 - if (info->port.count != 0 || info->netcount != 0) {
53646 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53647 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53648 spin_unlock_irqrestore(&info->netlock, flags);
53649 return -EBUSY;
53650 @@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53651 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53652
53653 /* return error if TTY interface open */
53654 - if (info->port.count)
53655 + if (atomic_read(&info->port.count))
53656 return -EBUSY;
53657
53658 if (cmd != SIOCWANDEV)
53659 @@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53660 * do not request bottom half processing if the
53661 * device is not open in a normal mode.
53662 */
53663 - if ( port && (port->port.count || port->netcount) &&
53664 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53665 port->pending_bh && !port->bh_running &&
53666 !port->bh_requested ) {
53667 if ( debug_level >= DEBUG_LEVEL_ISR )
53668 @@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53669
53670 if (debug_level >= DEBUG_LEVEL_INFO)
53671 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53672 - __FILE__,__LINE__, tty->driver->name, port->count );
53673 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53674
53675 spin_lock_irqsave(&info->lock, flags);
53676 - port->count--;
53677 + atomic_dec(&port->count);
53678 spin_unlock_irqrestore(&info->lock, flags);
53679 port->blocked_open++;
53680
53681 @@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53682
53683 if (debug_level >= DEBUG_LEVEL_INFO)
53684 printk("%s(%d):%s block_til_ready() count=%d\n",
53685 - __FILE__,__LINE__, tty->driver->name, port->count );
53686 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53687
53688 tty_unlock(tty);
53689 schedule();
53690 @@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53691 set_current_state(TASK_RUNNING);
53692 remove_wait_queue(&port->open_wait, &wait);
53693 if (!tty_hung_up_p(filp))
53694 - port->count++;
53695 + atomic_inc(&port->count);
53696 port->blocked_open--;
53697
53698 if (debug_level >= DEBUG_LEVEL_INFO)
53699 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53700 - __FILE__,__LINE__, tty->driver->name, port->count );
53701 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53702
53703 if (!retval)
53704 port->flags |= ASYNC_NORMAL_ACTIVE;
53705 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53706 index 42bad18..447d7a2 100644
53707 --- a/drivers/tty/sysrq.c
53708 +++ b/drivers/tty/sysrq.c
53709 @@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53710 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53711 size_t count, loff_t *ppos)
53712 {
53713 - if (count) {
53714 + if (count && capable(CAP_SYS_ADMIN)) {
53715 char c;
53716
53717 if (get_user(c, buf))
53718 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53719 index 0508a1d..b610592 100644
53720 --- a/drivers/tty/tty_io.c
53721 +++ b/drivers/tty/tty_io.c
53722 @@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53723
53724 void tty_default_fops(struct file_operations *fops)
53725 {
53726 - *fops = tty_fops;
53727 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53728 }
53729
53730 /*
53731 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53732 index 2d822aa..a566234 100644
53733 --- a/drivers/tty/tty_ldisc.c
53734 +++ b/drivers/tty/tty_ldisc.c
53735 @@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53736 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53737 tty_ldiscs[disc] = new_ldisc;
53738 new_ldisc->num = disc;
53739 - new_ldisc->refcount = 0;
53740 + atomic_set(&new_ldisc->refcount, 0);
53741 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53742
53743 return ret;
53744 @@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53745 return -EINVAL;
53746
53747 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53748 - if (tty_ldiscs[disc]->refcount)
53749 + if (atomic_read(&tty_ldiscs[disc]->refcount))
53750 ret = -EBUSY;
53751 else
53752 tty_ldiscs[disc] = NULL;
53753 @@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53754 if (ldops) {
53755 ret = ERR_PTR(-EAGAIN);
53756 if (try_module_get(ldops->owner)) {
53757 - ldops->refcount++;
53758 + atomic_inc(&ldops->refcount);
53759 ret = ldops;
53760 }
53761 }
53762 @@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53763 unsigned long flags;
53764
53765 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53766 - ldops->refcount--;
53767 + atomic_dec(&ldops->refcount);
53768 module_put(ldops->owner);
53769 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53770 }
53771 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53772 index 1b93357..ea9f82c 100644
53773 --- a/drivers/tty/tty_port.c
53774 +++ b/drivers/tty/tty_port.c
53775 @@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53776 unsigned long flags;
53777
53778 spin_lock_irqsave(&port->lock, flags);
53779 - port->count = 0;
53780 + atomic_set(&port->count, 0);
53781 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53782 tty = port->tty;
53783 if (tty)
53784 @@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53785
53786 /* The port lock protects the port counts */
53787 spin_lock_irqsave(&port->lock, flags);
53788 - port->count--;
53789 + atomic_dec(&port->count);
53790 port->blocked_open++;
53791 spin_unlock_irqrestore(&port->lock, flags);
53792
53793 @@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53794 we must not mess that up further */
53795 spin_lock_irqsave(&port->lock, flags);
53796 if (!tty_hung_up_p(filp))
53797 - port->count++;
53798 + atomic_inc(&port->count);
53799 port->blocked_open--;
53800 if (retval == 0)
53801 port->flags |= ASYNC_NORMAL_ACTIVE;
53802 @@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53803 return 0;
53804 }
53805
53806 - if (tty->count == 1 && port->count != 1) {
53807 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
53808 printk(KERN_WARNING
53809 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53810 - port->count);
53811 - port->count = 1;
53812 + atomic_read(&port->count));
53813 + atomic_set(&port->count, 1);
53814 }
53815 - if (--port->count < 0) {
53816 + if (atomic_dec_return(&port->count) < 0) {
53817 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53818 - port->count);
53819 - port->count = 0;
53820 + atomic_read(&port->count));
53821 + atomic_set(&port->count, 0);
53822 }
53823
53824 - if (port->count) {
53825 + if (atomic_read(&port->count)) {
53826 spin_unlock_irqrestore(&port->lock, flags);
53827 return 0;
53828 }
53829 @@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53830 struct file *filp)
53831 {
53832 spin_lock_irq(&port->lock);
53833 - ++port->count;
53834 + atomic_inc(&port->count);
53835 spin_unlock_irq(&port->lock);
53836 tty_port_tty_set(port, tty);
53837
53838 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53839 index c039cfe..0b463b0 100644
53840 --- a/drivers/tty/vt/keyboard.c
53841 +++ b/drivers/tty/vt/keyboard.c
53842 @@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53843 kbd->kbdmode == VC_OFF) &&
53844 value != KVAL(K_SAK))
53845 return; /* SAK is allowed even in raw mode */
53846 +
53847 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53848 + {
53849 + void *func = fn_handler[value];
53850 + if (func == fn_show_state || func == fn_show_ptregs ||
53851 + func == fn_show_mem)
53852 + return;
53853 + }
53854 +#endif
53855 +
53856 fn_handler[value](vc);
53857 }
53858
53859 @@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53860 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53861 return -EFAULT;
53862
53863 - if (!capable(CAP_SYS_TTY_CONFIG))
53864 - perm = 0;
53865 -
53866 switch (cmd) {
53867 case KDGKBENT:
53868 /* Ensure another thread doesn't free it under us */
53869 @@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53870 spin_unlock_irqrestore(&kbd_event_lock, flags);
53871 return put_user(val, &user_kbe->kb_value);
53872 case KDSKBENT:
53873 + if (!capable(CAP_SYS_TTY_CONFIG))
53874 + perm = 0;
53875 +
53876 if (!perm)
53877 return -EPERM;
53878 if (!i && v == K_NOSUCHMAP) {
53879 @@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53880 int i, j, k;
53881 int ret;
53882
53883 - if (!capable(CAP_SYS_TTY_CONFIG))
53884 - perm = 0;
53885 -
53886 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53887 if (!kbs) {
53888 ret = -ENOMEM;
53889 @@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53890 kfree(kbs);
53891 return ((p && *p) ? -EOVERFLOW : 0);
53892 case KDSKBSENT:
53893 + if (!capable(CAP_SYS_TTY_CONFIG))
53894 + perm = 0;
53895 +
53896 if (!perm) {
53897 ret = -EPERM;
53898 goto reterr;
53899 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53900 index 60fa627..7214965 100644
53901 --- a/drivers/uio/uio.c
53902 +++ b/drivers/uio/uio.c
53903 @@ -25,6 +25,7 @@
53904 #include <linux/kobject.h>
53905 #include <linux/cdev.h>
53906 #include <linux/uio_driver.h>
53907 +#include <asm/local.h>
53908
53909 #define UIO_MAX_DEVICES (1U << MINORBITS)
53910
53911 @@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53912 struct device_attribute *attr, char *buf)
53913 {
53914 struct uio_device *idev = dev_get_drvdata(dev);
53915 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53916 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53917 }
53918 static DEVICE_ATTR_RO(event);
53919
53920 @@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53921 {
53922 struct uio_device *idev = info->uio_dev;
53923
53924 - atomic_inc(&idev->event);
53925 + atomic_inc_unchecked(&idev->event);
53926 wake_up_interruptible(&idev->wait);
53927 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53928 }
53929 @@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53930 }
53931
53932 listener->dev = idev;
53933 - listener->event_count = atomic_read(&idev->event);
53934 + listener->event_count = atomic_read_unchecked(&idev->event);
53935 filep->private_data = listener;
53936
53937 if (idev->info->open) {
53938 @@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53939 return -EIO;
53940
53941 poll_wait(filep, &idev->wait, wait);
53942 - if (listener->event_count != atomic_read(&idev->event))
53943 + if (listener->event_count != atomic_read_unchecked(&idev->event))
53944 return POLLIN | POLLRDNORM;
53945 return 0;
53946 }
53947 @@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
53948 do {
53949 set_current_state(TASK_INTERRUPTIBLE);
53950
53951 - event_count = atomic_read(&idev->event);
53952 + event_count = atomic_read_unchecked(&idev->event);
53953 if (event_count != listener->event_count) {
53954 if (copy_to_user(buf, &event_count, count))
53955 retval = -EFAULT;
53956 @@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
53957 static int uio_find_mem_index(struct vm_area_struct *vma)
53958 {
53959 struct uio_device *idev = vma->vm_private_data;
53960 + unsigned long size;
53961
53962 if (vma->vm_pgoff < MAX_UIO_MAPS) {
53963 - if (idev->info->mem[vma->vm_pgoff].size == 0)
53964 + size = idev->info->mem[vma->vm_pgoff].size;
53965 + if (size == 0)
53966 + return -1;
53967 + if (vma->vm_end - vma->vm_start > size)
53968 return -1;
53969 return (int)vma->vm_pgoff;
53970 }
53971 @@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
53972 idev->owner = owner;
53973 idev->info = info;
53974 init_waitqueue_head(&idev->wait);
53975 - atomic_set(&idev->event, 0);
53976 + atomic_set_unchecked(&idev->event, 0);
53977
53978 ret = uio_get_minor(idev);
53979 if (ret)
53980 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
53981 index 813d4d3..a71934f 100644
53982 --- a/drivers/usb/atm/cxacru.c
53983 +++ b/drivers/usb/atm/cxacru.c
53984 @@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
53985 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
53986 if (ret < 2)
53987 return -EINVAL;
53988 - if (index < 0 || index > 0x7f)
53989 + if (index > 0x7f)
53990 return -EINVAL;
53991 pos += tmp;
53992
53993 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
53994 index dada014..1d0d517 100644
53995 --- a/drivers/usb/atm/usbatm.c
53996 +++ b/drivers/usb/atm/usbatm.c
53997 @@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53998 if (printk_ratelimit())
53999 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
54000 __func__, vpi, vci);
54001 - atomic_inc(&vcc->stats->rx_err);
54002 + atomic_inc_unchecked(&vcc->stats->rx_err);
54003 return;
54004 }
54005
54006 @@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54007 if (length > ATM_MAX_AAL5_PDU) {
54008 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
54009 __func__, length, vcc);
54010 - atomic_inc(&vcc->stats->rx_err);
54011 + atomic_inc_unchecked(&vcc->stats->rx_err);
54012 goto out;
54013 }
54014
54015 @@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54016 if (sarb->len < pdu_length) {
54017 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
54018 __func__, pdu_length, sarb->len, vcc);
54019 - atomic_inc(&vcc->stats->rx_err);
54020 + atomic_inc_unchecked(&vcc->stats->rx_err);
54021 goto out;
54022 }
54023
54024 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
54025 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
54026 __func__, vcc);
54027 - atomic_inc(&vcc->stats->rx_err);
54028 + atomic_inc_unchecked(&vcc->stats->rx_err);
54029 goto out;
54030 }
54031
54032 @@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54033 if (printk_ratelimit())
54034 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
54035 __func__, length);
54036 - atomic_inc(&vcc->stats->rx_drop);
54037 + atomic_inc_unchecked(&vcc->stats->rx_drop);
54038 goto out;
54039 }
54040
54041 @@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54042
54043 vcc->push(vcc, skb);
54044
54045 - atomic_inc(&vcc->stats->rx);
54046 + atomic_inc_unchecked(&vcc->stats->rx);
54047 out:
54048 skb_trim(sarb, 0);
54049 }
54050 @@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
54051 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
54052
54053 usbatm_pop(vcc, skb);
54054 - atomic_inc(&vcc->stats->tx);
54055 + atomic_inc_unchecked(&vcc->stats->tx);
54056
54057 skb = skb_dequeue(&instance->sndqueue);
54058 }
54059 @@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
54060 if (!left--)
54061 return sprintf(page,
54062 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
54063 - atomic_read(&atm_dev->stats.aal5.tx),
54064 - atomic_read(&atm_dev->stats.aal5.tx_err),
54065 - atomic_read(&atm_dev->stats.aal5.rx),
54066 - atomic_read(&atm_dev->stats.aal5.rx_err),
54067 - atomic_read(&atm_dev->stats.aal5.rx_drop));
54068 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
54069 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
54070 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
54071 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
54072 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
54073
54074 if (!left--) {
54075 if (instance->disconnected)
54076 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54077 index 2a3bbdf..91d72cf 100644
54078 --- a/drivers/usb/core/devices.c
54079 +++ b/drivers/usb/core/devices.c
54080 @@ -126,7 +126,7 @@ static const char format_endpt[] =
54081 * time it gets called.
54082 */
54083 static struct device_connect_event {
54084 - atomic_t count;
54085 + atomic_unchecked_t count;
54086 wait_queue_head_t wait;
54087 } device_event = {
54088 .count = ATOMIC_INIT(1),
54089 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54090
54091 void usbfs_conn_disc_event(void)
54092 {
54093 - atomic_add(2, &device_event.count);
54094 + atomic_add_unchecked(2, &device_event.count);
54095 wake_up(&device_event.wait);
54096 }
54097
54098 @@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54099
54100 poll_wait(file, &device_event.wait, wait);
54101
54102 - event_count = atomic_read(&device_event.count);
54103 + event_count = atomic_read_unchecked(&device_event.count);
54104 if (file->f_version != event_count) {
54105 file->f_version = event_count;
54106 return POLLIN | POLLRDNORM;
54107 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54108 index 0b59731..46ee7d1 100644
54109 --- a/drivers/usb/core/devio.c
54110 +++ b/drivers/usb/core/devio.c
54111 @@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54112 struct usb_dev_state *ps = file->private_data;
54113 struct usb_device *dev = ps->dev;
54114 ssize_t ret = 0;
54115 - unsigned len;
54116 + size_t len;
54117 loff_t pos;
54118 int i;
54119
54120 @@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54121 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54122 struct usb_config_descriptor *config =
54123 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54124 - unsigned int length = le16_to_cpu(config->wTotalLength);
54125 + size_t length = le16_to_cpu(config->wTotalLength);
54126
54127 if (*ppos < pos + length) {
54128
54129 /* The descriptor may claim to be longer than it
54130 * really is. Here is the actual allocated length. */
54131 - unsigned alloclen =
54132 + size_t alloclen =
54133 le16_to_cpu(dev->config[i].desc.wTotalLength);
54134
54135 - len = length - (*ppos - pos);
54136 + len = length + pos - *ppos;
54137 if (len > nbytes)
54138 len = nbytes;
54139
54140 /* Simply don't write (skip over) unallocated parts */
54141 if (alloclen > (*ppos - pos)) {
54142 - alloclen -= (*ppos - pos);
54143 + alloclen = alloclen + pos - *ppos;
54144 if (copy_to_user(buf,
54145 dev->rawdescriptors[i] + (*ppos - pos),
54146 min(len, alloclen))) {
54147 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54148 index a6efb41..6f72549b 100644
54149 --- a/drivers/usb/core/hcd.c
54150 +++ b/drivers/usb/core/hcd.c
54151 @@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54152 */
54153 usb_get_urb(urb);
54154 atomic_inc(&urb->use_count);
54155 - atomic_inc(&urb->dev->urbnum);
54156 + atomic_inc_unchecked(&urb->dev->urbnum);
54157 usbmon_urb_submit(&hcd->self, urb);
54158
54159 /* NOTE requirements on root-hub callers (usbfs and the hub
54160 @@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54161 urb->hcpriv = NULL;
54162 INIT_LIST_HEAD(&urb->urb_list);
54163 atomic_dec(&urb->use_count);
54164 - atomic_dec(&urb->dev->urbnum);
54165 + atomic_dec_unchecked(&urb->dev->urbnum);
54166 if (atomic_read(&urb->reject))
54167 wake_up(&usb_kill_urb_queue);
54168 usb_put_urb(urb);
54169 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54170 index b649fef..c7107a0 100644
54171 --- a/drivers/usb/core/hub.c
54172 +++ b/drivers/usb/core/hub.c
54173 @@ -26,6 +26,7 @@
54174 #include <linux/mutex.h>
54175 #include <linux/random.h>
54176 #include <linux/pm_qos.h>
54177 +#include <linux/grsecurity.h>
54178
54179 #include <asm/uaccess.h>
54180 #include <asm/byteorder.h>
54181 @@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54182 goto done;
54183 return;
54184 }
54185 +
54186 + if (gr_handle_new_usb())
54187 + goto done;
54188 +
54189 if (hub_is_superspeed(hub->hdev))
54190 unit_load = 150;
54191 else
54192 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54193 index f7b7713..23d07ec 100644
54194 --- a/drivers/usb/core/message.c
54195 +++ b/drivers/usb/core/message.c
54196 @@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54197 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54198 * error number.
54199 */
54200 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54201 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54202 __u8 requesttype, __u16 value, __u16 index, void *data,
54203 __u16 size, int timeout)
54204 {
54205 @@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54206 * If successful, 0. Otherwise a negative error number. The number of actual
54207 * bytes transferred will be stored in the @actual_length parameter.
54208 */
54209 -int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54210 +int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54211 void *data, int len, int *actual_length, int timeout)
54212 {
54213 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54214 @@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54215 * bytes transferred will be stored in the @actual_length parameter.
54216 *
54217 */
54218 -int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54219 +int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54220 void *data, int len, int *actual_length, int timeout)
54221 {
54222 struct urb *urb;
54223 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54224 index 1236c60..d47a51c 100644
54225 --- a/drivers/usb/core/sysfs.c
54226 +++ b/drivers/usb/core/sysfs.c
54227 @@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54228 struct usb_device *udev;
54229
54230 udev = to_usb_device(dev);
54231 - return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54232 + return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54233 }
54234 static DEVICE_ATTR_RO(urbnum);
54235
54236 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54237 index 2dd2362..1135437 100644
54238 --- a/drivers/usb/core/usb.c
54239 +++ b/drivers/usb/core/usb.c
54240 @@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54241 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54242 dev->state = USB_STATE_ATTACHED;
54243 dev->lpm_disable_count = 1;
54244 - atomic_set(&dev->urbnum, 0);
54245 + atomic_set_unchecked(&dev->urbnum, 0);
54246
54247 INIT_LIST_HEAD(&dev->ep0.urb_list);
54248 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54249 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54250 index 8cfc319..4868255 100644
54251 --- a/drivers/usb/early/ehci-dbgp.c
54252 +++ b/drivers/usb/early/ehci-dbgp.c
54253 @@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54254
54255 #ifdef CONFIG_KGDB
54256 static struct kgdb_io kgdbdbgp_io_ops;
54257 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54258 +static struct kgdb_io kgdbdbgp_io_ops_console;
54259 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54260 #else
54261 #define dbgp_kgdb_mode (0)
54262 #endif
54263 @@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54264 .write_char = kgdbdbgp_write_char,
54265 };
54266
54267 +static struct kgdb_io kgdbdbgp_io_ops_console = {
54268 + .name = "kgdbdbgp",
54269 + .read_char = kgdbdbgp_read_char,
54270 + .write_char = kgdbdbgp_write_char,
54271 + .is_console = 1
54272 +};
54273 +
54274 static int kgdbdbgp_wait_time;
54275
54276 static int __init kgdbdbgp_parse_config(char *str)
54277 @@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54278 ptr++;
54279 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54280 }
54281 - kgdb_register_io_module(&kgdbdbgp_io_ops);
54282 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54283 + if (early_dbgp_console.index != -1)
54284 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54285 + else
54286 + kgdb_register_io_module(&kgdbdbgp_io_ops);
54287
54288 return 0;
54289 }
54290 diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54291 index f7b2032..fbb340c 100644
54292 --- a/drivers/usb/gadget/function/f_uac1.c
54293 +++ b/drivers/usb/gadget/function/f_uac1.c
54294 @@ -14,6 +14,7 @@
54295 #include <linux/module.h>
54296 #include <linux/device.h>
54297 #include <linux/atomic.h>
54298 +#include <linux/module.h>
54299
54300 #include "u_uac1.h"
54301
54302 diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54303 index 491082a..dfd7d17 100644
54304 --- a/drivers/usb/gadget/function/u_serial.c
54305 +++ b/drivers/usb/gadget/function/u_serial.c
54306 @@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54307 spin_lock_irq(&port->port_lock);
54308
54309 /* already open? Great. */
54310 - if (port->port.count) {
54311 + if (atomic_read(&port->port.count)) {
54312 status = 0;
54313 - port->port.count++;
54314 + atomic_inc(&port->port.count);
54315
54316 /* currently opening/closing? wait ... */
54317 } else if (port->openclose) {
54318 @@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54319 tty->driver_data = port;
54320 port->port.tty = tty;
54321
54322 - port->port.count = 1;
54323 + atomic_set(&port->port.count, 1);
54324 port->openclose = false;
54325
54326 /* if connected, start the I/O stream */
54327 @@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54328
54329 spin_lock_irq(&port->port_lock);
54330
54331 - if (port->port.count != 1) {
54332 - if (port->port.count == 0)
54333 + if (atomic_read(&port->port.count) != 1) {
54334 + if (atomic_read(&port->port.count) == 0)
54335 WARN_ON(1);
54336 else
54337 - --port->port.count;
54338 + atomic_dec(&port->port.count);
54339 goto exit;
54340 }
54341
54342 @@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54343 * and sleep if necessary
54344 */
54345 port->openclose = true;
54346 - port->port.count = 0;
54347 + atomic_set(&port->port.count, 0);
54348
54349 gser = port->port_usb;
54350 if (gser && gser->disconnect)
54351 @@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54352 int cond;
54353
54354 spin_lock_irq(&port->port_lock);
54355 - cond = (port->port.count == 0) && !port->openclose;
54356 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54357 spin_unlock_irq(&port->port_lock);
54358 return cond;
54359 }
54360 @@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54361 /* if it's already open, start I/O ... and notify the serial
54362 * protocol about open/close status (connect/disconnect).
54363 */
54364 - if (port->port.count) {
54365 + if (atomic_read(&port->port.count)) {
54366 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54367 gs_start_io(port);
54368 if (gser->connect)
54369 @@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54370
54371 port->port_usb = NULL;
54372 gser->ioport = NULL;
54373 - if (port->port.count > 0 || port->openclose) {
54374 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
54375 wake_up_interruptible(&port->drain_wait);
54376 if (port->port.tty)
54377 tty_hangup(port->port.tty);
54378 @@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54379
54380 /* finally, free any unused/unusable I/O buffers */
54381 spin_lock_irqsave(&port->port_lock, flags);
54382 - if (port->port.count == 0 && !port->openclose)
54383 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
54384 gs_buf_free(&port->port_write_buf);
54385 gs_free_requests(gser->out, &port->read_pool, NULL);
54386 gs_free_requests(gser->out, &port->read_queue, NULL);
54387 diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54388 index a44a07f..ecea924 100644
54389 --- a/drivers/usb/gadget/function/u_uac1.c
54390 +++ b/drivers/usb/gadget/function/u_uac1.c
54391 @@ -17,6 +17,7 @@
54392 #include <linux/ctype.h>
54393 #include <linux/random.h>
54394 #include <linux/syscalls.h>
54395 +#include <linux/module.h>
54396
54397 #include "u_uac1.h"
54398
54399 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54400 index 5728829..fefc6bf 100644
54401 --- a/drivers/usb/host/ehci-hub.c
54402 +++ b/drivers/usb/host/ehci-hub.c
54403 @@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54404 urb->transfer_flags = URB_DIR_IN;
54405 usb_get_urb(urb);
54406 atomic_inc(&urb->use_count);
54407 - atomic_inc(&urb->dev->urbnum);
54408 + atomic_inc_unchecked(&urb->dev->urbnum);
54409 urb->setup_dma = dma_map_single(
54410 hcd->self.controller,
54411 urb->setup_packet,
54412 @@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54413 urb->status = -EINPROGRESS;
54414 usb_get_urb(urb);
54415 atomic_inc(&urb->use_count);
54416 - atomic_inc(&urb->dev->urbnum);
54417 + atomic_inc_unchecked(&urb->dev->urbnum);
54418 retval = submit_single_step_set_feature(hcd, urb, 0);
54419 if (!retval && !wait_for_completion_timeout(&done,
54420 msecs_to_jiffies(2000))) {
54421 diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54422 index 1db0626..4948782 100644
54423 --- a/drivers/usb/host/hwa-hc.c
54424 +++ b/drivers/usb/host/hwa-hc.c
54425 @@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54426 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54427 struct wahc *wa = &hwahc->wa;
54428 struct device *dev = &wa->usb_iface->dev;
54429 - u8 mas_le[UWB_NUM_MAS/8];
54430 + u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54431 +
54432 + if (mas_le == NULL)
54433 + return -ENOMEM;
54434
54435 /* Set the stream index */
54436 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54437 @@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54438 WUSB_REQ_SET_WUSB_MAS,
54439 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54440 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54441 - mas_le, 32, USB_CTRL_SET_TIMEOUT);
54442 + mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54443 if (result < 0)
54444 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54445 out:
54446 + kfree(mas_le);
54447 +
54448 return result;
54449 }
54450
54451 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54452 index b3d245e..99549ed 100644
54453 --- a/drivers/usb/misc/appledisplay.c
54454 +++ b/drivers/usb/misc/appledisplay.c
54455 @@ -84,7 +84,7 @@ struct appledisplay {
54456 struct mutex sysfslock; /* concurrent read and write */
54457 };
54458
54459 -static atomic_t count_displays = ATOMIC_INIT(0);
54460 +static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54461 static struct workqueue_struct *wq;
54462
54463 static void appledisplay_complete(struct urb *urb)
54464 @@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54465
54466 /* Register backlight device */
54467 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54468 - atomic_inc_return(&count_displays) - 1);
54469 + atomic_inc_return_unchecked(&count_displays) - 1);
54470 memset(&props, 0, sizeof(struct backlight_properties));
54471 props.type = BACKLIGHT_RAW;
54472 props.max_brightness = 0xff;
54473 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54474 index 8d7fc48..01c4986 100644
54475 --- a/drivers/usb/serial/console.c
54476 +++ b/drivers/usb/serial/console.c
54477 @@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
54478
54479 info->port = port;
54480
54481 - ++port->port.count;
54482 + atomic_inc(&port->port.count);
54483 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54484 if (serial->type->set_termios) {
54485 /*
54486 @@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
54487 }
54488 /* Now that any required fake tty operations are completed restore
54489 * the tty port count */
54490 - --port->port.count;
54491 + atomic_dec(&port->port.count);
54492 /* The console is special in terms of closing the device so
54493 * indicate this port is now acting as a system console. */
54494 port->port.console = 1;
54495 @@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
54496 free_tty:
54497 kfree(tty);
54498 reset_open_count:
54499 - port->port.count = 0;
54500 + atomic_set(&port->port.count, 0);
54501 usb_autopm_put_interface(serial->interface);
54502 error_get_interface:
54503 usb_serial_put(serial);
54504 @@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
54505 static void usb_console_write(struct console *co,
54506 const char *buf, unsigned count)
54507 {
54508 - static struct usbcons_info *info = &usbcons_info;
54509 + struct usbcons_info *info = &usbcons_info;
54510 struct usb_serial_port *port = info->port;
54511 struct usb_serial *serial;
54512 int retval = -ENODEV;
54513 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54514 index 307e339..6aa97cb 100644
54515 --- a/drivers/usb/storage/usb.h
54516 +++ b/drivers/usb/storage/usb.h
54517 @@ -63,7 +63,7 @@ struct us_unusual_dev {
54518 __u8 useProtocol;
54519 __u8 useTransport;
54520 int (*initFunction)(struct us_data *);
54521 -};
54522 +} __do_const;
54523
54524
54525 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54526 diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54527 index a863a98..d272795 100644
54528 --- a/drivers/usb/usbip/vhci.h
54529 +++ b/drivers/usb/usbip/vhci.h
54530 @@ -83,7 +83,7 @@ struct vhci_hcd {
54531 unsigned resuming:1;
54532 unsigned long re_timeout;
54533
54534 - atomic_t seqnum;
54535 + atomic_unchecked_t seqnum;
54536
54537 /*
54538 * NOTE:
54539 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54540 index c02374b..32d47a9 100644
54541 --- a/drivers/usb/usbip/vhci_hcd.c
54542 +++ b/drivers/usb/usbip/vhci_hcd.c
54543 @@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54544
54545 spin_lock(&vdev->priv_lock);
54546
54547 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54548 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54549 if (priv->seqnum == 0xffff)
54550 dev_info(&urb->dev->dev, "seqnum max\n");
54551
54552 @@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54553 return -ENOMEM;
54554 }
54555
54556 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54557 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54558 if (unlink->seqnum == 0xffff)
54559 pr_info("seqnum max\n");
54560
54561 @@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54562 vdev->rhport = rhport;
54563 }
54564
54565 - atomic_set(&vhci->seqnum, 0);
54566 + atomic_set_unchecked(&vhci->seqnum, 0);
54567 spin_lock_init(&vhci->lock);
54568
54569 hcd->power_budget = 0; /* no limit */
54570 diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54571 index 00e4a54..d676f85 100644
54572 --- a/drivers/usb/usbip/vhci_rx.c
54573 +++ b/drivers/usb/usbip/vhci_rx.c
54574 @@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54575 if (!urb) {
54576 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54577 pr_info("max seqnum %d\n",
54578 - atomic_read(&the_controller->seqnum));
54579 + atomic_read_unchecked(&the_controller->seqnum));
54580 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54581 return;
54582 }
54583 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54584 index edc7267..9f65ce2 100644
54585 --- a/drivers/usb/wusbcore/wa-hc.h
54586 +++ b/drivers/usb/wusbcore/wa-hc.h
54587 @@ -240,7 +240,7 @@ struct wahc {
54588 spinlock_t xfer_list_lock;
54589 struct work_struct xfer_enqueue_work;
54590 struct work_struct xfer_error_work;
54591 - atomic_t xfer_id_count;
54592 + atomic_unchecked_t xfer_id_count;
54593
54594 kernel_ulong_t quirks;
54595 };
54596 @@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54597 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54598 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54599 wa->dto_in_use = 0;
54600 - atomic_set(&wa->xfer_id_count, 1);
54601 + atomic_set_unchecked(&wa->xfer_id_count, 1);
54602 /* init the buf in URBs */
54603 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54604 usb_init_urb(&(wa->buf_in_urbs[index]));
54605 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54606 index 69af4fd..da390d7 100644
54607 --- a/drivers/usb/wusbcore/wa-xfer.c
54608 +++ b/drivers/usb/wusbcore/wa-xfer.c
54609 @@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54610 */
54611 static void wa_xfer_id_init(struct wa_xfer *xfer)
54612 {
54613 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54614 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54615 }
54616
54617 /* Return the xfer's ID. */
54618 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54619 index f018d8d..ccab63f 100644
54620 --- a/drivers/vfio/vfio.c
54621 +++ b/drivers/vfio/vfio.c
54622 @@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54623 return 0;
54624
54625 /* TODO Prevent device auto probing */
54626 - WARN("Device %s added to live group %d!\n", dev_name(dev),
54627 + WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54628 iommu_group_id(group->iommu_group));
54629
54630 return 0;
54631 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54632 index 5174eba..451e6bc 100644
54633 --- a/drivers/vhost/vringh.c
54634 +++ b/drivers/vhost/vringh.c
54635 @@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54636 /* Userspace access helpers: in this case, addresses are really userspace. */
54637 static inline int getu16_user(u16 *val, const u16 *p)
54638 {
54639 - return get_user(*val, (__force u16 __user *)p);
54640 + return get_user(*val, (u16 __force_user *)p);
54641 }
54642
54643 static inline int putu16_user(u16 *p, u16 val)
54644 {
54645 - return put_user(val, (__force u16 __user *)p);
54646 + return put_user(val, (u16 __force_user *)p);
54647 }
54648
54649 static inline int copydesc_user(void *dst, const void *src, size_t len)
54650 {
54651 - return copy_from_user(dst, (__force void __user *)src, len) ?
54652 + return copy_from_user(dst, (void __force_user *)src, len) ?
54653 -EFAULT : 0;
54654 }
54655
54656 @@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54657 const struct vring_used_elem *src,
54658 unsigned int num)
54659 {
54660 - return copy_to_user((__force void __user *)dst, src,
54661 + return copy_to_user((void __force_user *)dst, src,
54662 sizeof(*dst) * num) ? -EFAULT : 0;
54663 }
54664
54665 static inline int xfer_from_user(void *src, void *dst, size_t len)
54666 {
54667 - return copy_from_user(dst, (__force void __user *)src, len) ?
54668 + return copy_from_user(dst, (void __force_user *)src, len) ?
54669 -EFAULT : 0;
54670 }
54671
54672 static inline int xfer_to_user(void *dst, void *src, size_t len)
54673 {
54674 - return copy_to_user((__force void __user *)dst, src, len) ?
54675 + return copy_to_user((void __force_user *)dst, src, len) ?
54676 -EFAULT : 0;
54677 }
54678
54679 @@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54680 vrh->last_used_idx = 0;
54681 vrh->vring.num = num;
54682 /* vring expects kernel addresses, but only used via accessors. */
54683 - vrh->vring.desc = (__force struct vring_desc *)desc;
54684 - vrh->vring.avail = (__force struct vring_avail *)avail;
54685 - vrh->vring.used = (__force struct vring_used *)used;
54686 + vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54687 + vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54688 + vrh->vring.used = (__force_kernel struct vring_used *)used;
54689 return 0;
54690 }
54691 EXPORT_SYMBOL(vringh_init_user);
54692 @@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54693
54694 static inline int putu16_kern(u16 *p, u16 val)
54695 {
54696 - ACCESS_ONCE(*p) = val;
54697 + ACCESS_ONCE_RW(*p) = val;
54698 return 0;
54699 }
54700
54701 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54702 index 84a110a..96312c3 100644
54703 --- a/drivers/video/backlight/kb3886_bl.c
54704 +++ b/drivers/video/backlight/kb3886_bl.c
54705 @@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54706 static unsigned long kb3886bl_flags;
54707 #define KB3886BL_SUSPENDED 0x01
54708
54709 -static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54710 +static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54711 {
54712 .ident = "Sahara Touch-iT",
54713 .matches = {
54714 diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54715 index 1b0b233..6f34c2c 100644
54716 --- a/drivers/video/fbdev/arcfb.c
54717 +++ b/drivers/video/fbdev/arcfb.c
54718 @@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54719 return -ENOSPC;
54720
54721 err = 0;
54722 - if ((count + p) > fbmemlength) {
54723 + if (count > (fbmemlength - p)) {
54724 count = fbmemlength - p;
54725 err = -ENOSPC;
54726 }
54727 diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54728 index aedf2fb..47c9aca 100644
54729 --- a/drivers/video/fbdev/aty/aty128fb.c
54730 +++ b/drivers/video/fbdev/aty/aty128fb.c
54731 @@ -149,7 +149,7 @@ enum {
54732 };
54733
54734 /* Must match above enum */
54735 -static char * const r128_family[] = {
54736 +static const char * const r128_family[] = {
54737 "AGP",
54738 "PCI",
54739 "PRO AGP",
54740 diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54741 index 37ec09b..98f8862 100644
54742 --- a/drivers/video/fbdev/aty/atyfb_base.c
54743 +++ b/drivers/video/fbdev/aty/atyfb_base.c
54744 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54745 par->accel_flags = var->accel_flags; /* hack */
54746
54747 if (var->accel_flags) {
54748 - info->fbops->fb_sync = atyfb_sync;
54749 + pax_open_kernel();
54750 + *(void **)&info->fbops->fb_sync = atyfb_sync;
54751 + pax_close_kernel();
54752 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54753 } else {
54754 - info->fbops->fb_sync = NULL;
54755 + pax_open_kernel();
54756 + *(void **)&info->fbops->fb_sync = NULL;
54757 + pax_close_kernel();
54758 info->flags |= FBINFO_HWACCEL_DISABLED;
54759 }
54760
54761 diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54762 index 2fa0317..4983f2a 100644
54763 --- a/drivers/video/fbdev/aty/mach64_cursor.c
54764 +++ b/drivers/video/fbdev/aty/mach64_cursor.c
54765 @@ -8,6 +8,7 @@
54766 #include "../core/fb_draw.h"
54767
54768 #include <asm/io.h>
54769 +#include <asm/pgtable.h>
54770
54771 #ifdef __sparc__
54772 #include <asm/fbio.h>
54773 @@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54774 info->sprite.buf_align = 16; /* and 64 lines tall. */
54775 info->sprite.flags = FB_PIXMAP_IO;
54776
54777 - info->fbops->fb_cursor = atyfb_cursor;
54778 + pax_open_kernel();
54779 + *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54780 + pax_close_kernel();
54781
54782 return 0;
54783 }
54784 diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54785 index 900aa4e..6d49418 100644
54786 --- a/drivers/video/fbdev/core/fb_defio.c
54787 +++ b/drivers/video/fbdev/core/fb_defio.c
54788 @@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
54789
54790 BUG_ON(!fbdefio);
54791 mutex_init(&fbdefio->lock);
54792 - info->fbops->fb_mmap = fb_deferred_io_mmap;
54793 + pax_open_kernel();
54794 + *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54795 + pax_close_kernel();
54796 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54797 INIT_LIST_HEAD(&fbdefio->pagelist);
54798 if (fbdefio->delay == 0) /* set a default of 1 s */
54799 @@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54800 page->mapping = NULL;
54801 }
54802
54803 - info->fbops->fb_mmap = NULL;
54804 + *(void **)&info->fbops->fb_mmap = NULL;
54805 mutex_destroy(&fbdefio->lock);
54806 }
54807 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54808 diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54809 index 0705d88..d9429bf 100644
54810 --- a/drivers/video/fbdev/core/fbmem.c
54811 +++ b/drivers/video/fbdev/core/fbmem.c
54812 @@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54813 __u32 data;
54814 int err;
54815
54816 - err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54817 + err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54818
54819 data = (__u32) (unsigned long) fix->smem_start;
54820 err |= put_user(data, &fix32->smem_start);
54821 diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54822 index 4254336..282567e 100644
54823 --- a/drivers/video/fbdev/hyperv_fb.c
54824 +++ b/drivers/video/fbdev/hyperv_fb.c
54825 @@ -240,7 +240,7 @@ static uint screen_fb_size;
54826 static inline int synthvid_send(struct hv_device *hdev,
54827 struct synthvid_msg *msg)
54828 {
54829 - static atomic64_t request_id = ATOMIC64_INIT(0);
54830 + static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54831 int ret;
54832
54833 msg->pipe_hdr.type = PIPE_MSG_DATA;
54834 @@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54835
54836 ret = vmbus_sendpacket(hdev->channel, msg,
54837 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54838 - atomic64_inc_return(&request_id),
54839 + atomic64_inc_return_unchecked(&request_id),
54840 VM_PKT_DATA_INBAND, 0);
54841
54842 if (ret)
54843 diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54844 index 7672d2e..b56437f 100644
54845 --- a/drivers/video/fbdev/i810/i810_accel.c
54846 +++ b/drivers/video/fbdev/i810/i810_accel.c
54847 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54848 }
54849 }
54850 printk("ringbuffer lockup!!!\n");
54851 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54852 i810_report_error(mmio);
54853 par->dev_flags |= LOCKUP;
54854 info->pixmap.scan_align = 1;
54855 diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54856 index a01147f..5d896f8 100644
54857 --- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54858 +++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54859 @@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54860
54861 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54862 struct matrox_switch matrox_mystique = {
54863 - MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54864 + .preinit = MGA1064_preinit,
54865 + .reset = MGA1064_reset,
54866 + .init = MGA1064_init,
54867 + .restore = MGA1064_restore,
54868 };
54869 EXPORT_SYMBOL(matrox_mystique);
54870 #endif
54871
54872 #ifdef CONFIG_FB_MATROX_G
54873 struct matrox_switch matrox_G100 = {
54874 - MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54875 + .preinit = MGAG100_preinit,
54876 + .reset = MGAG100_reset,
54877 + .init = MGAG100_init,
54878 + .restore = MGAG100_restore,
54879 };
54880 EXPORT_SYMBOL(matrox_G100);
54881 #endif
54882 diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54883 index 195ad7c..09743fc 100644
54884 --- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54885 +++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54886 @@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54887 }
54888
54889 struct matrox_switch matrox_millennium = {
54890 - Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54891 + .preinit = Ti3026_preinit,
54892 + .reset = Ti3026_reset,
54893 + .init = Ti3026_init,
54894 + .restore = Ti3026_restore
54895 };
54896 EXPORT_SYMBOL(matrox_millennium);
54897 #endif
54898 diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54899 index fe92eed..106e085 100644
54900 --- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54901 +++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54902 @@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54903 struct mb862xxfb_par *par = info->par;
54904
54905 if (info->var.bits_per_pixel == 32) {
54906 - info->fbops->fb_fillrect = cfb_fillrect;
54907 - info->fbops->fb_copyarea = cfb_copyarea;
54908 - info->fbops->fb_imageblit = cfb_imageblit;
54909 + pax_open_kernel();
54910 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54911 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54912 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54913 + pax_close_kernel();
54914 } else {
54915 outreg(disp, GC_L0EM, 3);
54916 - info->fbops->fb_fillrect = mb86290fb_fillrect;
54917 - info->fbops->fb_copyarea = mb86290fb_copyarea;
54918 - info->fbops->fb_imageblit = mb86290fb_imageblit;
54919 + pax_open_kernel();
54920 + *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54921 + *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54922 + *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54923 + pax_close_kernel();
54924 }
54925 outreg(draw, GDC_REG_DRAW_BASE, 0);
54926 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54927 diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54928 index def0412..fed6529 100644
54929 --- a/drivers/video/fbdev/nvidia/nvidia.c
54930 +++ b/drivers/video/fbdev/nvidia/nvidia.c
54931 @@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54932 info->fix.line_length = (info->var.xres_virtual *
54933 info->var.bits_per_pixel) >> 3;
54934 if (info->var.accel_flags) {
54935 - info->fbops->fb_imageblit = nvidiafb_imageblit;
54936 - info->fbops->fb_fillrect = nvidiafb_fillrect;
54937 - info->fbops->fb_copyarea = nvidiafb_copyarea;
54938 - info->fbops->fb_sync = nvidiafb_sync;
54939 + pax_open_kernel();
54940 + *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54941 + *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54942 + *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54943 + *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54944 + pax_close_kernel();
54945 info->pixmap.scan_align = 4;
54946 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54947 info->flags |= FBINFO_READS_FAST;
54948 NVResetGraphics(info);
54949 } else {
54950 - info->fbops->fb_imageblit = cfb_imageblit;
54951 - info->fbops->fb_fillrect = cfb_fillrect;
54952 - info->fbops->fb_copyarea = cfb_copyarea;
54953 - info->fbops->fb_sync = NULL;
54954 + pax_open_kernel();
54955 + *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54956 + *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54957 + *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54958 + *(void **)&info->fbops->fb_sync = NULL;
54959 + pax_close_kernel();
54960 info->pixmap.scan_align = 1;
54961 info->flags |= FBINFO_HWACCEL_DISABLED;
54962 info->flags &= ~FBINFO_READS_FAST;
54963 @@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
54964 info->pixmap.size = 8 * 1024;
54965 info->pixmap.flags = FB_PIXMAP_SYSTEM;
54966
54967 - if (!hwcur)
54968 - info->fbops->fb_cursor = NULL;
54969 + if (!hwcur) {
54970 + pax_open_kernel();
54971 + *(void **)&info->fbops->fb_cursor = NULL;
54972 + pax_close_kernel();
54973 + }
54974
54975 info->var.accel_flags = (!noaccel);
54976
54977 diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
54978 index 2412a0d..294215b 100644
54979 --- a/drivers/video/fbdev/omap2/dss/display.c
54980 +++ b/drivers/video/fbdev/omap2/dss/display.c
54981 @@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
54982 if (dssdev->name == NULL)
54983 dssdev->name = dssdev->alias;
54984
54985 + pax_open_kernel();
54986 if (drv && drv->get_resolution == NULL)
54987 - drv->get_resolution = omapdss_default_get_resolution;
54988 + *(void **)&drv->get_resolution = omapdss_default_get_resolution;
54989 if (drv && drv->get_recommended_bpp == NULL)
54990 - drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54991 + *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54992 if (drv && drv->get_timings == NULL)
54993 - drv->get_timings = omapdss_default_get_timings;
54994 + *(void **)&drv->get_timings = omapdss_default_get_timings;
54995 + pax_close_kernel();
54996
54997 mutex_lock(&panel_list_mutex);
54998 list_add_tail(&dssdev->panel_list, &panel_list);
54999 diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
55000 index 83433cb..71e9b98 100644
55001 --- a/drivers/video/fbdev/s1d13xxxfb.c
55002 +++ b/drivers/video/fbdev/s1d13xxxfb.c
55003 @@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55004
55005 switch(prod_id) {
55006 case S1D13506_PROD_ID: /* activate acceleration */
55007 - s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55008 - s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55009 + pax_open_kernel();
55010 + *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55011 + *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55012 + pax_close_kernel();
55013 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55014 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55015 break;
55016 diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55017 index 2bcc84a..29dd1ea 100644
55018 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
55019 +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55020 @@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55021 }
55022
55023 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55024 - lcdc_sys_write_index,
55025 - lcdc_sys_write_data,
55026 - lcdc_sys_read_data,
55027 + .write_index = lcdc_sys_write_index,
55028 + .write_data = lcdc_sys_write_data,
55029 + .read_data = lcdc_sys_read_data,
55030 };
55031
55032 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55033 diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
55034 index d513ed6..90b0de9 100644
55035 --- a/drivers/video/fbdev/smscufx.c
55036 +++ b/drivers/video/fbdev/smscufx.c
55037 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55038 fb_deferred_io_cleanup(info);
55039 kfree(info->fbdefio);
55040 info->fbdefio = NULL;
55041 - info->fbops->fb_mmap = ufx_ops_mmap;
55042 + pax_open_kernel();
55043 + *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55044 + pax_close_kernel();
55045 }
55046
55047 pr_debug("released /dev/fb%d user=%d count=%d",
55048 diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
55049 index 046d51d..be564da 100644
55050 --- a/drivers/video/fbdev/udlfb.c
55051 +++ b/drivers/video/fbdev/udlfb.c
55052 @@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55053 dlfb_urb_completion(urb);
55054
55055 error:
55056 - atomic_add(bytes_sent, &dev->bytes_sent);
55057 - atomic_add(bytes_identical, &dev->bytes_identical);
55058 - atomic_add(width*height*2, &dev->bytes_rendered);
55059 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55060 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55061 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55062 end_cycles = get_cycles();
55063 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
55064 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55065 >> 10)), /* Kcycles */
55066 &dev->cpu_kcycles_used);
55067
55068 @@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55069 dlfb_urb_completion(urb);
55070
55071 error:
55072 - atomic_add(bytes_sent, &dev->bytes_sent);
55073 - atomic_add(bytes_identical, &dev->bytes_identical);
55074 - atomic_add(bytes_rendered, &dev->bytes_rendered);
55075 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55076 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55077 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55078 end_cycles = get_cycles();
55079 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
55080 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55081 >> 10)), /* Kcycles */
55082 &dev->cpu_kcycles_used);
55083 }
55084 @@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55085 fb_deferred_io_cleanup(info);
55086 kfree(info->fbdefio);
55087 info->fbdefio = NULL;
55088 - info->fbops->fb_mmap = dlfb_ops_mmap;
55089 + pax_open_kernel();
55090 + *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55091 + pax_close_kernel();
55092 }
55093
55094 pr_warn("released /dev/fb%d user=%d count=%d\n",
55095 @@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55096 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55097 struct dlfb_data *dev = fb_info->par;
55098 return snprintf(buf, PAGE_SIZE, "%u\n",
55099 - atomic_read(&dev->bytes_rendered));
55100 + atomic_read_unchecked(&dev->bytes_rendered));
55101 }
55102
55103 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55104 @@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55105 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55106 struct dlfb_data *dev = fb_info->par;
55107 return snprintf(buf, PAGE_SIZE, "%u\n",
55108 - atomic_read(&dev->bytes_identical));
55109 + atomic_read_unchecked(&dev->bytes_identical));
55110 }
55111
55112 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55113 @@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55114 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55115 struct dlfb_data *dev = fb_info->par;
55116 return snprintf(buf, PAGE_SIZE, "%u\n",
55117 - atomic_read(&dev->bytes_sent));
55118 + atomic_read_unchecked(&dev->bytes_sent));
55119 }
55120
55121 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55122 @@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55123 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55124 struct dlfb_data *dev = fb_info->par;
55125 return snprintf(buf, PAGE_SIZE, "%u\n",
55126 - atomic_read(&dev->cpu_kcycles_used));
55127 + atomic_read_unchecked(&dev->cpu_kcycles_used));
55128 }
55129
55130 static ssize_t edid_show(
55131 @@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55132 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55133 struct dlfb_data *dev = fb_info->par;
55134
55135 - atomic_set(&dev->bytes_rendered, 0);
55136 - atomic_set(&dev->bytes_identical, 0);
55137 - atomic_set(&dev->bytes_sent, 0);
55138 - atomic_set(&dev->cpu_kcycles_used, 0);
55139 + atomic_set_unchecked(&dev->bytes_rendered, 0);
55140 + atomic_set_unchecked(&dev->bytes_identical, 0);
55141 + atomic_set_unchecked(&dev->bytes_sent, 0);
55142 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55143
55144 return count;
55145 }
55146 diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55147 index 509d452..7c9d2de 100644
55148 --- a/drivers/video/fbdev/uvesafb.c
55149 +++ b/drivers/video/fbdev/uvesafb.c
55150 @@ -19,6 +19,7 @@
55151 #include <linux/io.h>
55152 #include <linux/mutex.h>
55153 #include <linux/slab.h>
55154 +#include <linux/moduleloader.h>
55155 #include <video/edid.h>
55156 #include <video/uvesafb.h>
55157 #ifdef CONFIG_X86
55158 @@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55159 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55160 par->pmi_setpal = par->ypan = 0;
55161 } else {
55162 +
55163 +#ifdef CONFIG_PAX_KERNEXEC
55164 +#ifdef CONFIG_MODULES
55165 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55166 +#endif
55167 + if (!par->pmi_code) {
55168 + par->pmi_setpal = par->ypan = 0;
55169 + return 0;
55170 + }
55171 +#endif
55172 +
55173 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55174 + task->t.regs.edi);
55175 +
55176 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55177 + pax_open_kernel();
55178 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55179 + pax_close_kernel();
55180 +
55181 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55182 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55183 +#else
55184 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55185 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55186 +#endif
55187 +
55188 printk(KERN_INFO "uvesafb: protected mode interface info at "
55189 "%04x:%04x\n",
55190 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55191 @@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55192 par->ypan = ypan;
55193
55194 if (par->pmi_setpal || par->ypan) {
55195 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55196 if (__supported_pte_mask & _PAGE_NX) {
55197 par->pmi_setpal = par->ypan = 0;
55198 printk(KERN_WARNING "uvesafb: NX protection is active, "
55199 "better not use the PMI.\n");
55200 - } else {
55201 + } else
55202 +#endif
55203 uvesafb_vbe_getpmi(task, par);
55204 - }
55205 }
55206 #else
55207 /* The protected mode interface is not available on non-x86. */
55208 @@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55209 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55210
55211 /* Disable blanking if the user requested so. */
55212 - if (!blank)
55213 - info->fbops->fb_blank = NULL;
55214 + if (!blank) {
55215 + pax_open_kernel();
55216 + *(void **)&info->fbops->fb_blank = NULL;
55217 + pax_close_kernel();
55218 + }
55219
55220 /*
55221 * Find out how much IO memory is required for the mode with
55222 @@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55223 info->flags = FBINFO_FLAG_DEFAULT |
55224 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55225
55226 - if (!par->ypan)
55227 - info->fbops->fb_pan_display = NULL;
55228 + if (!par->ypan) {
55229 + pax_open_kernel();
55230 + *(void **)&info->fbops->fb_pan_display = NULL;
55231 + pax_close_kernel();
55232 + }
55233 }
55234
55235 static void uvesafb_init_mtrr(struct fb_info *info)
55236 @@ -1787,6 +1817,11 @@ out_mode:
55237 out:
55238 kfree(par->vbe_modes);
55239
55240 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55241 + if (par->pmi_code)
55242 + module_free_exec(NULL, par->pmi_code);
55243 +#endif
55244 +
55245 framebuffer_release(info);
55246 return err;
55247 }
55248 @@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55249 kfree(par->vbe_state_orig);
55250 kfree(par->vbe_state_saved);
55251
55252 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55253 + if (par->pmi_code)
55254 + module_free_exec(NULL, par->pmi_code);
55255 +#endif
55256 +
55257 framebuffer_release(info);
55258 }
55259 return 0;
55260 diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55261 index 6170e7f..dd63031 100644
55262 --- a/drivers/video/fbdev/vesafb.c
55263 +++ b/drivers/video/fbdev/vesafb.c
55264 @@ -9,6 +9,7 @@
55265 */
55266
55267 #include <linux/module.h>
55268 +#include <linux/moduleloader.h>
55269 #include <linux/kernel.h>
55270 #include <linux/errno.h>
55271 #include <linux/string.h>
55272 @@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55273 static int vram_total; /* Set total amount of memory */
55274 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55275 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55276 -static void (*pmi_start)(void) __read_mostly;
55277 -static void (*pmi_pal) (void) __read_mostly;
55278 +static void (*pmi_start)(void) __read_only;
55279 +static void (*pmi_pal) (void) __read_only;
55280 static int depth __read_mostly;
55281 static int vga_compat __read_mostly;
55282 /* --------------------------------------------------------------------- */
55283 @@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55284 unsigned int size_remap;
55285 unsigned int size_total;
55286 char *option = NULL;
55287 + void *pmi_code = NULL;
55288
55289 /* ignore error return of fb_get_options */
55290 fb_get_options("vesafb", &option);
55291 @@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55292 size_remap = size_total;
55293 vesafb_fix.smem_len = size_remap;
55294
55295 -#ifndef __i386__
55296 - screen_info.vesapm_seg = 0;
55297 -#endif
55298 -
55299 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55300 printk(KERN_WARNING
55301 "vesafb: cannot reserve video memory at 0x%lx\n",
55302 @@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55303 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55304 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55305
55306 +#ifdef __i386__
55307 +
55308 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55309 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
55310 + if (!pmi_code)
55311 +#elif !defined(CONFIG_PAX_KERNEXEC)
55312 + if (0)
55313 +#endif
55314 +
55315 +#endif
55316 + screen_info.vesapm_seg = 0;
55317 +
55318 if (screen_info.vesapm_seg) {
55319 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55320 - screen_info.vesapm_seg,screen_info.vesapm_off);
55321 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55322 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55323 }
55324
55325 if (screen_info.vesapm_seg < 0xc000)
55326 @@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55327
55328 if (ypan || pmi_setpal) {
55329 unsigned short *pmi_base;
55330 +
55331 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55332 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55333 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55334 +
55335 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55336 + pax_open_kernel();
55337 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55338 +#else
55339 + pmi_code = pmi_base;
55340 +#endif
55341 +
55342 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55343 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55344 +
55345 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55346 + pmi_start = ktva_ktla(pmi_start);
55347 + pmi_pal = ktva_ktla(pmi_pal);
55348 + pax_close_kernel();
55349 +#endif
55350 +
55351 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55352 if (pmi_base[3]) {
55353 printk(KERN_INFO "vesafb: pmi: ports = ");
55354 @@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55355 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55356 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55357
55358 - if (!ypan)
55359 - info->fbops->fb_pan_display = NULL;
55360 + if (!ypan) {
55361 + pax_open_kernel();
55362 + *(void **)&info->fbops->fb_pan_display = NULL;
55363 + pax_close_kernel();
55364 + }
55365
55366 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55367 err = -ENOMEM;
55368 @@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55369 fb_info(info, "%s frame buffer device\n", info->fix.id);
55370 return 0;
55371 err:
55372 +
55373 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55374 + module_free_exec(NULL, pmi_code);
55375 +#endif
55376 +
55377 if (info->screen_base)
55378 iounmap(info->screen_base);
55379 framebuffer_release(info);
55380 diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55381 index 88714ae..16c2e11 100644
55382 --- a/drivers/video/fbdev/via/via_clock.h
55383 +++ b/drivers/video/fbdev/via/via_clock.h
55384 @@ -56,7 +56,7 @@ struct via_clock {
55385
55386 void (*set_engine_pll_state)(u8 state);
55387 void (*set_engine_pll)(struct via_pll_config config);
55388 -};
55389 +} __no_const;
55390
55391
55392 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55393 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55394 index 3c14e43..2630570 100644
55395 --- a/drivers/video/logo/logo_linux_clut224.ppm
55396 +++ b/drivers/video/logo/logo_linux_clut224.ppm
55397 @@ -2,1603 +2,1123 @@ P3
55398 # Standard 224-color Linux logo
55399 80 80
55400 255
55401 - 0 0 0 0 0 0 0 0 0 0 0 0
55402 - 0 0 0 0 0 0 0 0 0 0 0 0
55403 - 0 0 0 0 0 0 0 0 0 0 0 0
55404 - 0 0 0 0 0 0 0 0 0 0 0 0
55405 - 0 0 0 0 0 0 0 0 0 0 0 0
55406 - 0 0 0 0 0 0 0 0 0 0 0 0
55407 - 0 0 0 0 0 0 0 0 0 0 0 0
55408 - 0 0 0 0 0 0 0 0 0 0 0 0
55409 - 0 0 0 0 0 0 0 0 0 0 0 0
55410 - 6 6 6 6 6 6 10 10 10 10 10 10
55411 - 10 10 10 6 6 6 6 6 6 6 6 6
55412 - 0 0 0 0 0 0 0 0 0 0 0 0
55413 - 0 0 0 0 0 0 0 0 0 0 0 0
55414 - 0 0 0 0 0 0 0 0 0 0 0 0
55415 - 0 0 0 0 0 0 0 0 0 0 0 0
55416 - 0 0 0 0 0 0 0 0 0 0 0 0
55417 - 0 0 0 0 0 0 0 0 0 0 0 0
55418 - 0 0 0 0 0 0 0 0 0 0 0 0
55419 - 0 0 0 0 0 0 0 0 0 0 0 0
55420 - 0 0 0 0 0 0 0 0 0 0 0 0
55421 - 0 0 0 0 0 0 0 0 0 0 0 0
55422 - 0 0 0 0 0 0 0 0 0 0 0 0
55423 - 0 0 0 0 0 0 0 0 0 0 0 0
55424 - 0 0 0 0 0 0 0 0 0 0 0 0
55425 - 0 0 0 0 0 0 0 0 0 0 0 0
55426 - 0 0 0 0 0 0 0 0 0 0 0 0
55427 - 0 0 0 0 0 0 0 0 0 0 0 0
55428 - 0 0 0 0 0 0 0 0 0 0 0 0
55429 - 0 0 0 6 6 6 10 10 10 14 14 14
55430 - 22 22 22 26 26 26 30 30 30 34 34 34
55431 - 30 30 30 30 30 30 26 26 26 18 18 18
55432 - 14 14 14 10 10 10 6 6 6 0 0 0
55433 - 0 0 0 0 0 0 0 0 0 0 0 0
55434 - 0 0 0 0 0 0 0 0 0 0 0 0
55435 - 0 0 0 0 0 0 0 0 0 0 0 0
55436 - 0 0 0 0 0 0 0 0 0 0 0 0
55437 - 0 0 0 0 0 0 0 0 0 0 0 0
55438 - 0 0 0 0 0 0 0 0 0 0 0 0
55439 - 0 0 0 0 0 0 0 0 0 0 0 0
55440 - 0 0 0 0 0 0 0 0 0 0 0 0
55441 - 0 0 0 0 0 0 0 0 0 0 0 0
55442 - 0 0 0 0 0 1 0 0 1 0 0 0
55443 - 0 0 0 0 0 0 0 0 0 0 0 0
55444 - 0 0 0 0 0 0 0 0 0 0 0 0
55445 - 0 0 0 0 0 0 0 0 0 0 0 0
55446 - 0 0 0 0 0 0 0 0 0 0 0 0
55447 - 0 0 0 0 0 0 0 0 0 0 0 0
55448 - 0 0 0 0 0 0 0 0 0 0 0 0
55449 - 6 6 6 14 14 14 26 26 26 42 42 42
55450 - 54 54 54 66 66 66 78 78 78 78 78 78
55451 - 78 78 78 74 74 74 66 66 66 54 54 54
55452 - 42 42 42 26 26 26 18 18 18 10 10 10
55453 - 6 6 6 0 0 0 0 0 0 0 0 0
55454 - 0 0 0 0 0 0 0 0 0 0 0 0
55455 - 0 0 0 0 0 0 0 0 0 0 0 0
55456 - 0 0 0 0 0 0 0 0 0 0 0 0
55457 - 0 0 0 0 0 0 0 0 0 0 0 0
55458 - 0 0 0 0 0 0 0 0 0 0 0 0
55459 - 0 0 0 0 0 0 0 0 0 0 0 0
55460 - 0 0 0 0 0 0 0 0 0 0 0 0
55461 - 0 0 0 0 0 0 0 0 0 0 0 0
55462 - 0 0 1 0 0 0 0 0 0 0 0 0
55463 - 0 0 0 0 0 0 0 0 0 0 0 0
55464 - 0 0 0 0 0 0 0 0 0 0 0 0
55465 - 0 0 0 0 0 0 0 0 0 0 0 0
55466 - 0 0 0 0 0 0 0 0 0 0 0 0
55467 - 0 0 0 0 0 0 0 0 0 0 0 0
55468 - 0 0 0 0 0 0 0 0 0 10 10 10
55469 - 22 22 22 42 42 42 66 66 66 86 86 86
55470 - 66 66 66 38 38 38 38 38 38 22 22 22
55471 - 26 26 26 34 34 34 54 54 54 66 66 66
55472 - 86 86 86 70 70 70 46 46 46 26 26 26
55473 - 14 14 14 6 6 6 0 0 0 0 0 0
55474 - 0 0 0 0 0 0 0 0 0 0 0 0
55475 - 0 0 0 0 0 0 0 0 0 0 0 0
55476 - 0 0 0 0 0 0 0 0 0 0 0 0
55477 - 0 0 0 0 0 0 0 0 0 0 0 0
55478 - 0 0 0 0 0 0 0 0 0 0 0 0
55479 - 0 0 0 0 0 0 0 0 0 0 0 0
55480 - 0 0 0 0 0 0 0 0 0 0 0 0
55481 - 0 0 0 0 0 0 0 0 0 0 0 0
55482 - 0 0 1 0 0 1 0 0 1 0 0 0
55483 - 0 0 0 0 0 0 0 0 0 0 0 0
55484 - 0 0 0 0 0 0 0 0 0 0 0 0
55485 - 0 0 0 0 0 0 0 0 0 0 0 0
55486 - 0 0 0 0 0 0 0 0 0 0 0 0
55487 - 0 0 0 0 0 0 0 0 0 0 0 0
55488 - 0 0 0 0 0 0 10 10 10 26 26 26
55489 - 50 50 50 82 82 82 58 58 58 6 6 6
55490 - 2 2 6 2 2 6 2 2 6 2 2 6
55491 - 2 2 6 2 2 6 2 2 6 2 2 6
55492 - 6 6 6 54 54 54 86 86 86 66 66 66
55493 - 38 38 38 18 18 18 6 6 6 0 0 0
55494 - 0 0 0 0 0 0 0 0 0 0 0 0
55495 - 0 0 0 0 0 0 0 0 0 0 0 0
55496 - 0 0 0 0 0 0 0 0 0 0 0 0
55497 - 0 0 0 0 0 0 0 0 0 0 0 0
55498 - 0 0 0 0 0 0 0 0 0 0 0 0
55499 - 0 0 0 0 0 0 0 0 0 0 0 0
55500 - 0 0 0 0 0 0 0 0 0 0 0 0
55501 - 0 0 0 0 0 0 0 0 0 0 0 0
55502 - 0 0 0 0 0 0 0 0 0 0 0 0
55503 - 0 0 0 0 0 0 0 0 0 0 0 0
55504 - 0 0 0 0 0 0 0 0 0 0 0 0
55505 - 0 0 0 0 0 0 0 0 0 0 0 0
55506 - 0 0 0 0 0 0 0 0 0 0 0 0
55507 - 0 0 0 0 0 0 0 0 0 0 0 0
55508 - 0 0 0 6 6 6 22 22 22 50 50 50
55509 - 78 78 78 34 34 34 2 2 6 2 2 6
55510 - 2 2 6 2 2 6 2 2 6 2 2 6
55511 - 2 2 6 2 2 6 2 2 6 2 2 6
55512 - 2 2 6 2 2 6 6 6 6 70 70 70
55513 - 78 78 78 46 46 46 22 22 22 6 6 6
55514 - 0 0 0 0 0 0 0 0 0 0 0 0
55515 - 0 0 0 0 0 0 0 0 0 0 0 0
55516 - 0 0 0 0 0 0 0 0 0 0 0 0
55517 - 0 0 0 0 0 0 0 0 0 0 0 0
55518 - 0 0 0 0 0 0 0 0 0 0 0 0
55519 - 0 0 0 0 0 0 0 0 0 0 0 0
55520 - 0 0 0 0 0 0 0 0 0 0 0 0
55521 - 0 0 0 0 0 0 0 0 0 0 0 0
55522 - 0 0 1 0 0 1 0 0 1 0 0 0
55523 - 0 0 0 0 0 0 0 0 0 0 0 0
55524 - 0 0 0 0 0 0 0 0 0 0 0 0
55525 - 0 0 0 0 0 0 0 0 0 0 0 0
55526 - 0 0 0 0 0 0 0 0 0 0 0 0
55527 - 0 0 0 0 0 0 0 0 0 0 0 0
55528 - 6 6 6 18 18 18 42 42 42 82 82 82
55529 - 26 26 26 2 2 6 2 2 6 2 2 6
55530 - 2 2 6 2 2 6 2 2 6 2 2 6
55531 - 2 2 6 2 2 6 2 2 6 14 14 14
55532 - 46 46 46 34 34 34 6 6 6 2 2 6
55533 - 42 42 42 78 78 78 42 42 42 18 18 18
55534 - 6 6 6 0 0 0 0 0 0 0 0 0
55535 - 0 0 0 0 0 0 0 0 0 0 0 0
55536 - 0 0 0 0 0 0 0 0 0 0 0 0
55537 - 0 0 0 0 0 0 0 0 0 0 0 0
55538 - 0 0 0 0 0 0 0 0 0 0 0 0
55539 - 0 0 0 0 0 0 0 0 0 0 0 0
55540 - 0 0 0 0 0 0 0 0 0 0 0 0
55541 - 0 0 0 0 0 0 0 0 0 0 0 0
55542 - 0 0 1 0 0 0 0 0 1 0 0 0
55543 - 0 0 0 0 0 0 0 0 0 0 0 0
55544 - 0 0 0 0 0 0 0 0 0 0 0 0
55545 - 0 0 0 0 0 0 0 0 0 0 0 0
55546 - 0 0 0 0 0 0 0 0 0 0 0 0
55547 - 0 0 0 0 0 0 0 0 0 0 0 0
55548 - 10 10 10 30 30 30 66 66 66 58 58 58
55549 - 2 2 6 2 2 6 2 2 6 2 2 6
55550 - 2 2 6 2 2 6 2 2 6 2 2 6
55551 - 2 2 6 2 2 6 2 2 6 26 26 26
55552 - 86 86 86 101 101 101 46 46 46 10 10 10
55553 - 2 2 6 58 58 58 70 70 70 34 34 34
55554 - 10 10 10 0 0 0 0 0 0 0 0 0
55555 - 0 0 0 0 0 0 0 0 0 0 0 0
55556 - 0 0 0 0 0 0 0 0 0 0 0 0
55557 - 0 0 0 0 0 0 0 0 0 0 0 0
55558 - 0 0 0 0 0 0 0 0 0 0 0 0
55559 - 0 0 0 0 0 0 0 0 0 0 0 0
55560 - 0 0 0 0 0 0 0 0 0 0 0 0
55561 - 0 0 0 0 0 0 0 0 0 0 0 0
55562 - 0 0 1 0 0 1 0 0 1 0 0 0
55563 - 0 0 0 0 0 0 0 0 0 0 0 0
55564 - 0 0 0 0 0 0 0 0 0 0 0 0
55565 - 0 0 0 0 0 0 0 0 0 0 0 0
55566 - 0 0 0 0 0 0 0 0 0 0 0 0
55567 - 0 0 0 0 0 0 0 0 0 0 0 0
55568 - 14 14 14 42 42 42 86 86 86 10 10 10
55569 - 2 2 6 2 2 6 2 2 6 2 2 6
55570 - 2 2 6 2 2 6 2 2 6 2 2 6
55571 - 2 2 6 2 2 6 2 2 6 30 30 30
55572 - 94 94 94 94 94 94 58 58 58 26 26 26
55573 - 2 2 6 6 6 6 78 78 78 54 54 54
55574 - 22 22 22 6 6 6 0 0 0 0 0 0
55575 - 0 0 0 0 0 0 0 0 0 0 0 0
55576 - 0 0 0 0 0 0 0 0 0 0 0 0
55577 - 0 0 0 0 0 0 0 0 0 0 0 0
55578 - 0 0 0 0 0 0 0 0 0 0 0 0
55579 - 0 0 0 0 0 0 0 0 0 0 0 0
55580 - 0 0 0 0 0 0 0 0 0 0 0 0
55581 - 0 0 0 0 0 0 0 0 0 0 0 0
55582 - 0 0 0 0 0 0 0 0 0 0 0 0
55583 - 0 0 0 0 0 0 0 0 0 0 0 0
55584 - 0 0 0 0 0 0 0 0 0 0 0 0
55585 - 0 0 0 0 0 0 0 0 0 0 0 0
55586 - 0 0 0 0 0 0 0 0 0 0 0 0
55587 - 0 0 0 0 0 0 0 0 0 6 6 6
55588 - 22 22 22 62 62 62 62 62 62 2 2 6
55589 - 2 2 6 2 2 6 2 2 6 2 2 6
55590 - 2 2 6 2 2 6 2 2 6 2 2 6
55591 - 2 2 6 2 2 6 2 2 6 26 26 26
55592 - 54 54 54 38 38 38 18 18 18 10 10 10
55593 - 2 2 6 2 2 6 34 34 34 82 82 82
55594 - 38 38 38 14 14 14 0 0 0 0 0 0
55595 - 0 0 0 0 0 0 0 0 0 0 0 0
55596 - 0 0 0 0 0 0 0 0 0 0 0 0
55597 - 0 0 0 0 0 0 0 0 0 0 0 0
55598 - 0 0 0 0 0 0 0 0 0 0 0 0
55599 - 0 0 0 0 0 0 0 0 0 0 0 0
55600 - 0 0 0 0 0 0 0 0 0 0 0 0
55601 - 0 0 0 0 0 0 0 0 0 0 0 0
55602 - 0 0 0 0 0 1 0 0 1 0 0 0
55603 - 0 0 0 0 0 0 0 0 0 0 0 0
55604 - 0 0 0 0 0 0 0 0 0 0 0 0
55605 - 0 0 0 0 0 0 0 0 0 0 0 0
55606 - 0 0 0 0 0 0 0 0 0 0 0 0
55607 - 0 0 0 0 0 0 0 0 0 6 6 6
55608 - 30 30 30 78 78 78 30 30 30 2 2 6
55609 - 2 2 6 2 2 6 2 2 6 2 2 6
55610 - 2 2 6 2 2 6 2 2 6 2 2 6
55611 - 2 2 6 2 2 6 2 2 6 10 10 10
55612 - 10 10 10 2 2 6 2 2 6 2 2 6
55613 - 2 2 6 2 2 6 2 2 6 78 78 78
55614 - 50 50 50 18 18 18 6 6 6 0 0 0
55615 - 0 0 0 0 0 0 0 0 0 0 0 0
55616 - 0 0 0 0 0 0 0 0 0 0 0 0
55617 - 0 0 0 0 0 0 0 0 0 0 0 0
55618 - 0 0 0 0 0 0 0 0 0 0 0 0
55619 - 0 0 0 0 0 0 0 0 0 0 0 0
55620 - 0 0 0 0 0 0 0 0 0 0 0 0
55621 - 0 0 0 0 0 0 0 0 0 0 0 0
55622 - 0 0 1 0 0 0 0 0 0 0 0 0
55623 - 0 0 0 0 0 0 0 0 0 0 0 0
55624 - 0 0 0 0 0 0 0 0 0 0 0 0
55625 - 0 0 0 0 0 0 0 0 0 0 0 0
55626 - 0 0 0 0 0 0 0 0 0 0 0 0
55627 - 0 0 0 0 0 0 0 0 0 10 10 10
55628 - 38 38 38 86 86 86 14 14 14 2 2 6
55629 - 2 2 6 2 2 6 2 2 6 2 2 6
55630 - 2 2 6 2 2 6 2 2 6 2 2 6
55631 - 2 2 6 2 2 6 2 2 6 2 2 6
55632 - 2 2 6 2 2 6 2 2 6 2 2 6
55633 - 2 2 6 2 2 6 2 2 6 54 54 54
55634 - 66 66 66 26 26 26 6 6 6 0 0 0
55635 - 0 0 0 0 0 0 0 0 0 0 0 0
55636 - 0 0 0 0 0 0 0 0 0 0 0 0
55637 - 0 0 0 0 0 0 0 0 0 0 0 0
55638 - 0 0 0 0 0 0 0 0 0 0 0 0
55639 - 0 0 0 0 0 0 0 0 0 0 0 0
55640 - 0 0 0 0 0 0 0 0 0 0 0 0
55641 - 0 0 0 0 0 0 0 0 0 0 0 0
55642 - 0 0 0 0 0 1 0 0 1 0 0 0
55643 - 0 0 0 0 0 0 0 0 0 0 0 0
55644 - 0 0 0 0 0 0 0 0 0 0 0 0
55645 - 0 0 0 0 0 0 0 0 0 0 0 0
55646 - 0 0 0 0 0 0 0 0 0 0 0 0
55647 - 0 0 0 0 0 0 0 0 0 14 14 14
55648 - 42 42 42 82 82 82 2 2 6 2 2 6
55649 - 2 2 6 6 6 6 10 10 10 2 2 6
55650 - 2 2 6 2 2 6 2 2 6 2 2 6
55651 - 2 2 6 2 2 6 2 2 6 6 6 6
55652 - 14 14 14 10 10 10 2 2 6 2 2 6
55653 - 2 2 6 2 2 6 2 2 6 18 18 18
55654 - 82 82 82 34 34 34 10 10 10 0 0 0
55655 - 0 0 0 0 0 0 0 0 0 0 0 0
55656 - 0 0 0 0 0 0 0 0 0 0 0 0
55657 - 0 0 0 0 0 0 0 0 0 0 0 0
55658 - 0 0 0 0 0 0 0 0 0 0 0 0
55659 - 0 0 0 0 0 0 0 0 0 0 0 0
55660 - 0 0 0 0 0 0 0 0 0 0 0 0
55661 - 0 0 0 0 0 0 0 0 0 0 0 0
55662 - 0 0 1 0 0 0 0 0 0 0 0 0
55663 - 0 0 0 0 0 0 0 0 0 0 0 0
55664 - 0 0 0 0 0 0 0 0 0 0 0 0
55665 - 0 0 0 0 0 0 0 0 0 0 0 0
55666 - 0 0 0 0 0 0 0 0 0 0 0 0
55667 - 0 0 0 0 0 0 0 0 0 14 14 14
55668 - 46 46 46 86 86 86 2 2 6 2 2 6
55669 - 6 6 6 6 6 6 22 22 22 34 34 34
55670 - 6 6 6 2 2 6 2 2 6 2 2 6
55671 - 2 2 6 2 2 6 18 18 18 34 34 34
55672 - 10 10 10 50 50 50 22 22 22 2 2 6
55673 - 2 2 6 2 2 6 2 2 6 10 10 10
55674 - 86 86 86 42 42 42 14 14 14 0 0 0
55675 - 0 0 0 0 0 0 0 0 0 0 0 0
55676 - 0 0 0 0 0 0 0 0 0 0 0 0
55677 - 0 0 0 0 0 0 0 0 0 0 0 0
55678 - 0 0 0 0 0 0 0 0 0 0 0 0
55679 - 0 0 0 0 0 0 0 0 0 0 0 0
55680 - 0 0 0 0 0 0 0 0 0 0 0 0
55681 - 0 0 0 0 0 0 0 0 0 0 0 0
55682 - 0 0 1 0 0 1 0 0 1 0 0 0
55683 - 0 0 0 0 0 0 0 0 0 0 0 0
55684 - 0 0 0 0 0 0 0 0 0 0 0 0
55685 - 0 0 0 0 0 0 0 0 0 0 0 0
55686 - 0 0 0 0 0 0 0 0 0 0 0 0
55687 - 0 0 0 0 0 0 0 0 0 14 14 14
55688 - 46 46 46 86 86 86 2 2 6 2 2 6
55689 - 38 38 38 116 116 116 94 94 94 22 22 22
55690 - 22 22 22 2 2 6 2 2 6 2 2 6
55691 - 14 14 14 86 86 86 138 138 138 162 162 162
55692 -154 154 154 38 38 38 26 26 26 6 6 6
55693 - 2 2 6 2 2 6 2 2 6 2 2 6
55694 - 86 86 86 46 46 46 14 14 14 0 0 0
55695 - 0 0 0 0 0 0 0 0 0 0 0 0
55696 - 0 0 0 0 0 0 0 0 0 0 0 0
55697 - 0 0 0 0 0 0 0 0 0 0 0 0
55698 - 0 0 0 0 0 0 0 0 0 0 0 0
55699 - 0 0 0 0 0 0 0 0 0 0 0 0
55700 - 0 0 0 0 0 0 0 0 0 0 0 0
55701 - 0 0 0 0 0 0 0 0 0 0 0 0
55702 - 0 0 0 0 0 0 0 0 0 0 0 0
55703 - 0 0 0 0 0 0 0 0 0 0 0 0
55704 - 0 0 0 0 0 0 0 0 0 0 0 0
55705 - 0 0 0 0 0 0 0 0 0 0 0 0
55706 - 0 0 0 0 0 0 0 0 0 0 0 0
55707 - 0 0 0 0 0 0 0 0 0 14 14 14
55708 - 46 46 46 86 86 86 2 2 6 14 14 14
55709 -134 134 134 198 198 198 195 195 195 116 116 116
55710 - 10 10 10 2 2 6 2 2 6 6 6 6
55711 -101 98 89 187 187 187 210 210 210 218 218 218
55712 -214 214 214 134 134 134 14 14 14 6 6 6
55713 - 2 2 6 2 2 6 2 2 6 2 2 6
55714 - 86 86 86 50 50 50 18 18 18 6 6 6
55715 - 0 0 0 0 0 0 0 0 0 0 0 0
55716 - 0 0 0 0 0 0 0 0 0 0 0 0
55717 - 0 0 0 0 0 0 0 0 0 0 0 0
55718 - 0 0 0 0 0 0 0 0 0 0 0 0
55719 - 0 0 0 0 0 0 0 0 0 0 0 0
55720 - 0 0 0 0 0 0 0 0 0 0 0 0
55721 - 0 0 0 0 0 0 0 0 1 0 0 0
55722 - 0 0 1 0 0 1 0 0 1 0 0 0
55723 - 0 0 0 0 0 0 0 0 0 0 0 0
55724 - 0 0 0 0 0 0 0 0 0 0 0 0
55725 - 0 0 0 0 0 0 0 0 0 0 0 0
55726 - 0 0 0 0 0 0 0 0 0 0 0 0
55727 - 0 0 0 0 0 0 0 0 0 14 14 14
55728 - 46 46 46 86 86 86 2 2 6 54 54 54
55729 -218 218 218 195 195 195 226 226 226 246 246 246
55730 - 58 58 58 2 2 6 2 2 6 30 30 30
55731 -210 210 210 253 253 253 174 174 174 123 123 123
55732 -221 221 221 234 234 234 74 74 74 2 2 6
55733 - 2 2 6 2 2 6 2 2 6 2 2 6
55734 - 70 70 70 58 58 58 22 22 22 6 6 6
55735 - 0 0 0 0 0 0 0 0 0 0 0 0
55736 - 0 0 0 0 0 0 0 0 0 0 0 0
55737 - 0 0 0 0 0 0 0 0 0 0 0 0
55738 - 0 0 0 0 0 0 0 0 0 0 0 0
55739 - 0 0 0 0 0 0 0 0 0 0 0 0
55740 - 0 0 0 0 0 0 0 0 0 0 0 0
55741 - 0 0 0 0 0 0 0 0 0 0 0 0
55742 - 0 0 0 0 0 0 0 0 0 0 0 0
55743 - 0 0 0 0 0 0 0 0 0 0 0 0
55744 - 0 0 0 0 0 0 0 0 0 0 0 0
55745 - 0 0 0 0 0 0 0 0 0 0 0 0
55746 - 0 0 0 0 0 0 0 0 0 0 0 0
55747 - 0 0 0 0 0 0 0 0 0 14 14 14
55748 - 46 46 46 82 82 82 2 2 6 106 106 106
55749 -170 170 170 26 26 26 86 86 86 226 226 226
55750 -123 123 123 10 10 10 14 14 14 46 46 46
55751 -231 231 231 190 190 190 6 6 6 70 70 70
55752 - 90 90 90 238 238 238 158 158 158 2 2 6
55753 - 2 2 6 2 2 6 2 2 6 2 2 6
55754 - 70 70 70 58 58 58 22 22 22 6 6 6
55755 - 0 0 0 0 0 0 0 0 0 0 0 0
55756 - 0 0 0 0 0 0 0 0 0 0 0 0
55757 - 0 0 0 0 0 0 0 0 0 0 0 0
55758 - 0 0 0 0 0 0 0 0 0 0 0 0
55759 - 0 0 0 0 0 0 0 0 0 0 0 0
55760 - 0 0 0 0 0 0 0 0 0 0 0 0
55761 - 0 0 0 0 0 0 0 0 1 0 0 0
55762 - 0 0 1 0 0 1 0 0 1 0 0 0
55763 - 0 0 0 0 0 0 0 0 0 0 0 0
55764 - 0 0 0 0 0 0 0 0 0 0 0 0
55765 - 0 0 0 0 0 0 0 0 0 0 0 0
55766 - 0 0 0 0 0 0 0 0 0 0 0 0
55767 - 0 0 0 0 0 0 0 0 0 14 14 14
55768 - 42 42 42 86 86 86 6 6 6 116 116 116
55769 -106 106 106 6 6 6 70 70 70 149 149 149
55770 -128 128 128 18 18 18 38 38 38 54 54 54
55771 -221 221 221 106 106 106 2 2 6 14 14 14
55772 - 46 46 46 190 190 190 198 198 198 2 2 6
55773 - 2 2 6 2 2 6 2 2 6 2 2 6
55774 - 74 74 74 62 62 62 22 22 22 6 6 6
55775 - 0 0 0 0 0 0 0 0 0 0 0 0
55776 - 0 0 0 0 0 0 0 0 0 0 0 0
55777 - 0 0 0 0 0 0 0 0 0 0 0 0
55778 - 0 0 0 0 0 0 0 0 0 0 0 0
55779 - 0 0 0 0 0 0 0 0 0 0 0 0
55780 - 0 0 0 0 0 0 0 0 0 0 0 0
55781 - 0 0 0 0 0 0 0 0 1 0 0 0
55782 - 0 0 1 0 0 0 0 0 1 0 0 0
55783 - 0 0 0 0 0 0 0 0 0 0 0 0
55784 - 0 0 0 0 0 0 0 0 0 0 0 0
55785 - 0 0 0 0 0 0 0 0 0 0 0 0
55786 - 0 0 0 0 0 0 0 0 0 0 0 0
55787 - 0 0 0 0 0 0 0 0 0 14 14 14
55788 - 42 42 42 94 94 94 14 14 14 101 101 101
55789 -128 128 128 2 2 6 18 18 18 116 116 116
55790 -118 98 46 121 92 8 121 92 8 98 78 10
55791 -162 162 162 106 106 106 2 2 6 2 2 6
55792 - 2 2 6 195 195 195 195 195 195 6 6 6
55793 - 2 2 6 2 2 6 2 2 6 2 2 6
55794 - 74 74 74 62 62 62 22 22 22 6 6 6
55795 - 0 0 0 0 0 0 0 0 0 0 0 0
55796 - 0 0 0 0 0 0 0 0 0 0 0 0
55797 - 0 0 0 0 0 0 0 0 0 0 0 0
55798 - 0 0 0 0 0 0 0 0 0 0 0 0
55799 - 0 0 0 0 0 0 0 0 0 0 0 0
55800 - 0 0 0 0 0 0 0 0 0 0 0 0
55801 - 0 0 0 0 0 0 0 0 1 0 0 1
55802 - 0 0 1 0 0 0 0 0 1 0 0 0
55803 - 0 0 0 0 0 0 0 0 0 0 0 0
55804 - 0 0 0 0 0 0 0 0 0 0 0 0
55805 - 0 0 0 0 0 0 0 0 0 0 0 0
55806 - 0 0 0 0 0 0 0 0 0 0 0 0
55807 - 0 0 0 0 0 0 0 0 0 10 10 10
55808 - 38 38 38 90 90 90 14 14 14 58 58 58
55809 -210 210 210 26 26 26 54 38 6 154 114 10
55810 -226 170 11 236 186 11 225 175 15 184 144 12
55811 -215 174 15 175 146 61 37 26 9 2 2 6
55812 - 70 70 70 246 246 246 138 138 138 2 2 6
55813 - 2 2 6 2 2 6 2 2 6 2 2 6
55814 - 70 70 70 66 66 66 26 26 26 6 6 6
55815 - 0 0 0 0 0 0 0 0 0 0 0 0
55816 - 0 0 0 0 0 0 0 0 0 0 0 0
55817 - 0 0 0 0 0 0 0 0 0 0 0 0
55818 - 0 0 0 0 0 0 0 0 0 0 0 0
55819 - 0 0 0 0 0 0 0 0 0 0 0 0
55820 - 0 0 0 0 0 0 0 0 0 0 0 0
55821 - 0 0 0 0 0 0 0 0 0 0 0 0
55822 - 0 0 0 0 0 0 0 0 0 0 0 0
55823 - 0 0 0 0 0 0 0 0 0 0 0 0
55824 - 0 0 0 0 0 0 0 0 0 0 0 0
55825 - 0 0 0 0 0 0 0 0 0 0 0 0
55826 - 0 0 0 0 0 0 0 0 0 0 0 0
55827 - 0 0 0 0 0 0 0 0 0 10 10 10
55828 - 38 38 38 86 86 86 14 14 14 10 10 10
55829 -195 195 195 188 164 115 192 133 9 225 175 15
55830 -239 182 13 234 190 10 232 195 16 232 200 30
55831 -245 207 45 241 208 19 232 195 16 184 144 12
55832 -218 194 134 211 206 186 42 42 42 2 2 6
55833 - 2 2 6 2 2 6 2 2 6 2 2 6
55834 - 50 50 50 74 74 74 30 30 30 6 6 6
55835 - 0 0 0 0 0 0 0 0 0 0 0 0
55836 - 0 0 0 0 0 0 0 0 0 0 0 0
55837 - 0 0 0 0 0 0 0 0 0 0 0 0
55838 - 0 0 0 0 0 0 0 0 0 0 0 0
55839 - 0 0 0 0 0 0 0 0 0 0 0 0
55840 - 0 0 0 0 0 0 0 0 0 0 0 0
55841 - 0 0 0 0 0 0 0 0 0 0 0 0
55842 - 0 0 0 0 0 0 0 0 0 0 0 0
55843 - 0 0 0 0 0 0 0 0 0 0 0 0
55844 - 0 0 0 0 0 0 0 0 0 0 0 0
55845 - 0 0 0 0 0 0 0 0 0 0 0 0
55846 - 0 0 0 0 0 0 0 0 0 0 0 0
55847 - 0 0 0 0 0 0 0 0 0 10 10 10
55848 - 34 34 34 86 86 86 14 14 14 2 2 6
55849 -121 87 25 192 133 9 219 162 10 239 182 13
55850 -236 186 11 232 195 16 241 208 19 244 214 54
55851 -246 218 60 246 218 38 246 215 20 241 208 19
55852 -241 208 19 226 184 13 121 87 25 2 2 6
55853 - 2 2 6 2 2 6 2 2 6 2 2 6
55854 - 50 50 50 82 82 82 34 34 34 10 10 10
55855 - 0 0 0 0 0 0 0 0 0 0 0 0
55856 - 0 0 0 0 0 0 0 0 0 0 0 0
55857 - 0 0 0 0 0 0 0 0 0 0 0 0
55858 - 0 0 0 0 0 0 0 0 0 0 0 0
55859 - 0 0 0 0 0 0 0 0 0 0 0 0
55860 - 0 0 0 0 0 0 0 0 0 0 0 0
55861 - 0 0 0 0 0 0 0 0 0 0 0 0
55862 - 0 0 0 0 0 0 0 0 0 0 0 0
55863 - 0 0 0 0 0 0 0 0 0 0 0 0
55864 - 0 0 0 0 0 0 0 0 0 0 0 0
55865 - 0 0 0 0 0 0 0 0 0 0 0 0
55866 - 0 0 0 0 0 0 0 0 0 0 0 0
55867 - 0 0 0 0 0 0 0 0 0 10 10 10
55868 - 34 34 34 82 82 82 30 30 30 61 42 6
55869 -180 123 7 206 145 10 230 174 11 239 182 13
55870 -234 190 10 238 202 15 241 208 19 246 218 74
55871 -246 218 38 246 215 20 246 215 20 246 215 20
55872 -226 184 13 215 174 15 184 144 12 6 6 6
55873 - 2 2 6 2 2 6 2 2 6 2 2 6
55874 - 26 26 26 94 94 94 42 42 42 14 14 14
55875 - 0 0 0 0 0 0 0 0 0 0 0 0
55876 - 0 0 0 0 0 0 0 0 0 0 0 0
55877 - 0 0 0 0 0 0 0 0 0 0 0 0
55878 - 0 0 0 0 0 0 0 0 0 0 0 0
55879 - 0 0 0 0 0 0 0 0 0 0 0 0
55880 - 0 0 0 0 0 0 0 0 0 0 0 0
55881 - 0 0 0 0 0 0 0 0 0 0 0 0
55882 - 0 0 0 0 0 0 0 0 0 0 0 0
55883 - 0 0 0 0 0 0 0 0 0 0 0 0
55884 - 0 0 0 0 0 0 0 0 0 0 0 0
55885 - 0 0 0 0 0 0 0 0 0 0 0 0
55886 - 0 0 0 0 0 0 0 0 0 0 0 0
55887 - 0 0 0 0 0 0 0 0 0 10 10 10
55888 - 30 30 30 78 78 78 50 50 50 104 69 6
55889 -192 133 9 216 158 10 236 178 12 236 186 11
55890 -232 195 16 241 208 19 244 214 54 245 215 43
55891 -246 215 20 246 215 20 241 208 19 198 155 10
55892 -200 144 11 216 158 10 156 118 10 2 2 6
55893 - 2 2 6 2 2 6 2 2 6 2 2 6
55894 - 6 6 6 90 90 90 54 54 54 18 18 18
55895 - 6 6 6 0 0 0 0 0 0 0 0 0
55896 - 0 0 0 0 0 0 0 0 0 0 0 0
55897 - 0 0 0 0 0 0 0 0 0 0 0 0
55898 - 0 0 0 0 0 0 0 0 0 0 0 0
55899 - 0 0 0 0 0 0 0 0 0 0 0 0
55900 - 0 0 0 0 0 0 0 0 0 0 0 0
55901 - 0 0 0 0 0 0 0 0 0 0 0 0
55902 - 0 0 0 0 0 0 0 0 0 0 0 0
55903 - 0 0 0 0 0 0 0 0 0 0 0 0
55904 - 0 0 0 0 0 0 0 0 0 0 0 0
55905 - 0 0 0 0 0 0 0 0 0 0 0 0
55906 - 0 0 0 0 0 0 0 0 0 0 0 0
55907 - 0 0 0 0 0 0 0 0 0 10 10 10
55908 - 30 30 30 78 78 78 46 46 46 22 22 22
55909 -137 92 6 210 162 10 239 182 13 238 190 10
55910 -238 202 15 241 208 19 246 215 20 246 215 20
55911 -241 208 19 203 166 17 185 133 11 210 150 10
55912 -216 158 10 210 150 10 102 78 10 2 2 6
55913 - 6 6 6 54 54 54 14 14 14 2 2 6
55914 - 2 2 6 62 62 62 74 74 74 30 30 30
55915 - 10 10 10 0 0 0 0 0 0 0 0 0
55916 - 0 0 0 0 0 0 0 0 0 0 0 0
55917 - 0 0 0 0 0 0 0 0 0 0 0 0
55918 - 0 0 0 0 0 0 0 0 0 0 0 0
55919 - 0 0 0 0 0 0 0 0 0 0 0 0
55920 - 0 0 0 0 0 0 0 0 0 0 0 0
55921 - 0 0 0 0 0 0 0 0 0 0 0 0
55922 - 0 0 0 0 0 0 0 0 0 0 0 0
55923 - 0 0 0 0 0 0 0 0 0 0 0 0
55924 - 0 0 0 0 0 0 0 0 0 0 0 0
55925 - 0 0 0 0 0 0 0 0 0 0 0 0
55926 - 0 0 0 0 0 0 0 0 0 0 0 0
55927 - 0 0 0 0 0 0 0 0 0 10 10 10
55928 - 34 34 34 78 78 78 50 50 50 6 6 6
55929 - 94 70 30 139 102 15 190 146 13 226 184 13
55930 -232 200 30 232 195 16 215 174 15 190 146 13
55931 -168 122 10 192 133 9 210 150 10 213 154 11
55932 -202 150 34 182 157 106 101 98 89 2 2 6
55933 - 2 2 6 78 78 78 116 116 116 58 58 58
55934 - 2 2 6 22 22 22 90 90 90 46 46 46
55935 - 18 18 18 6 6 6 0 0 0 0 0 0
55936 - 0 0 0 0 0 0 0 0 0 0 0 0
55937 - 0 0 0 0 0 0 0 0 0 0 0 0
55938 - 0 0 0 0 0 0 0 0 0 0 0 0
55939 - 0 0 0 0 0 0 0 0 0 0 0 0
55940 - 0 0 0 0 0 0 0 0 0 0 0 0
55941 - 0 0 0 0 0 0 0 0 0 0 0 0
55942 - 0 0 0 0 0 0 0 0 0 0 0 0
55943 - 0 0 0 0 0 0 0 0 0 0 0 0
55944 - 0 0 0 0 0 0 0 0 0 0 0 0
55945 - 0 0 0 0 0 0 0 0 0 0 0 0
55946 - 0 0 0 0 0 0 0 0 0 0 0 0
55947 - 0 0 0 0 0 0 0 0 0 10 10 10
55948 - 38 38 38 86 86 86 50 50 50 6 6 6
55949 -128 128 128 174 154 114 156 107 11 168 122 10
55950 -198 155 10 184 144 12 197 138 11 200 144 11
55951 -206 145 10 206 145 10 197 138 11 188 164 115
55952 -195 195 195 198 198 198 174 174 174 14 14 14
55953 - 2 2 6 22 22 22 116 116 116 116 116 116
55954 - 22 22 22 2 2 6 74 74 74 70 70 70
55955 - 30 30 30 10 10 10 0 0 0 0 0 0
55956 - 0 0 0 0 0 0 0 0 0 0 0 0
55957 - 0 0 0 0 0 0 0 0 0 0 0 0
55958 - 0 0 0 0 0 0 0 0 0 0 0 0
55959 - 0 0 0 0 0 0 0 0 0 0 0 0
55960 - 0 0 0 0 0 0 0 0 0 0 0 0
55961 - 0 0 0 0 0 0 0 0 0 0 0 0
55962 - 0 0 0 0 0 0 0 0 0 0 0 0
55963 - 0 0 0 0 0 0 0 0 0 0 0 0
55964 - 0 0 0 0 0 0 0 0 0 0 0 0
55965 - 0 0 0 0 0 0 0 0 0 0 0 0
55966 - 0 0 0 0 0 0 0 0 0 0 0 0
55967 - 0 0 0 0 0 0 6 6 6 18 18 18
55968 - 50 50 50 101 101 101 26 26 26 10 10 10
55969 -138 138 138 190 190 190 174 154 114 156 107 11
55970 -197 138 11 200 144 11 197 138 11 192 133 9
55971 -180 123 7 190 142 34 190 178 144 187 187 187
55972 -202 202 202 221 221 221 214 214 214 66 66 66
55973 - 2 2 6 2 2 6 50 50 50 62 62 62
55974 - 6 6 6 2 2 6 10 10 10 90 90 90
55975 - 50 50 50 18 18 18 6 6 6 0 0 0
55976 - 0 0 0 0 0 0 0 0 0 0 0 0
55977 - 0 0 0 0 0 0 0 0 0 0 0 0
55978 - 0 0 0 0 0 0 0 0 0 0 0 0
55979 - 0 0 0 0 0 0 0 0 0 0 0 0
55980 - 0 0 0 0 0 0 0 0 0 0 0 0
55981 - 0 0 0 0 0 0 0 0 0 0 0 0
55982 - 0 0 0 0 0 0 0 0 0 0 0 0
55983 - 0 0 0 0 0 0 0 0 0 0 0 0
55984 - 0 0 0 0 0 0 0 0 0 0 0 0
55985 - 0 0 0 0 0 0 0 0 0 0 0 0
55986 - 0 0 0 0 0 0 0 0 0 0 0 0
55987 - 0 0 0 0 0 0 10 10 10 34 34 34
55988 - 74 74 74 74 74 74 2 2 6 6 6 6
55989 -144 144 144 198 198 198 190 190 190 178 166 146
55990 -154 121 60 156 107 11 156 107 11 168 124 44
55991 -174 154 114 187 187 187 190 190 190 210 210 210
55992 -246 246 246 253 253 253 253 253 253 182 182 182
55993 - 6 6 6 2 2 6 2 2 6 2 2 6
55994 - 2 2 6 2 2 6 2 2 6 62 62 62
55995 - 74 74 74 34 34 34 14 14 14 0 0 0
55996 - 0 0 0 0 0 0 0 0 0 0 0 0
55997 - 0 0 0 0 0 0 0 0 0 0 0 0
55998 - 0 0 0 0 0 0 0 0 0 0 0 0
55999 - 0 0 0 0 0 0 0 0 0 0 0 0
56000 - 0 0 0 0 0 0 0 0 0 0 0 0
56001 - 0 0 0 0 0 0 0 0 0 0 0 0
56002 - 0 0 0 0 0 0 0 0 0 0 0 0
56003 - 0 0 0 0 0 0 0 0 0 0 0 0
56004 - 0 0 0 0 0 0 0 0 0 0 0 0
56005 - 0 0 0 0 0 0 0 0 0 0 0 0
56006 - 0 0 0 0 0 0 0 0 0 0 0 0
56007 - 0 0 0 10 10 10 22 22 22 54 54 54
56008 - 94 94 94 18 18 18 2 2 6 46 46 46
56009 -234 234 234 221 221 221 190 190 190 190 190 190
56010 -190 190 190 187 187 187 187 187 187 190 190 190
56011 -190 190 190 195 195 195 214 214 214 242 242 242
56012 -253 253 253 253 253 253 253 253 253 253 253 253
56013 - 82 82 82 2 2 6 2 2 6 2 2 6
56014 - 2 2 6 2 2 6 2 2 6 14 14 14
56015 - 86 86 86 54 54 54 22 22 22 6 6 6
56016 - 0 0 0 0 0 0 0 0 0 0 0 0
56017 - 0 0 0 0 0 0 0 0 0 0 0 0
56018 - 0 0 0 0 0 0 0 0 0 0 0 0
56019 - 0 0 0 0 0 0 0 0 0 0 0 0
56020 - 0 0 0 0 0 0 0 0 0 0 0 0
56021 - 0 0 0 0 0 0 0 0 0 0 0 0
56022 - 0 0 0 0 0 0 0 0 0 0 0 0
56023 - 0 0 0 0 0 0 0 0 0 0 0 0
56024 - 0 0 0 0 0 0 0 0 0 0 0 0
56025 - 0 0 0 0 0 0 0 0 0 0 0 0
56026 - 0 0 0 0 0 0 0 0 0 0 0 0
56027 - 6 6 6 18 18 18 46 46 46 90 90 90
56028 - 46 46 46 18 18 18 6 6 6 182 182 182
56029 -253 253 253 246 246 246 206 206 206 190 190 190
56030 -190 190 190 190 190 190 190 190 190 190 190 190
56031 -206 206 206 231 231 231 250 250 250 253 253 253
56032 -253 253 253 253 253 253 253 253 253 253 253 253
56033 -202 202 202 14 14 14 2 2 6 2 2 6
56034 - 2 2 6 2 2 6 2 2 6 2 2 6
56035 - 42 42 42 86 86 86 42 42 42 18 18 18
56036 - 6 6 6 0 0 0 0 0 0 0 0 0
56037 - 0 0 0 0 0 0 0 0 0 0 0 0
56038 - 0 0 0 0 0 0 0 0 0 0 0 0
56039 - 0 0 0 0 0 0 0 0 0 0 0 0
56040 - 0 0 0 0 0 0 0 0 0 0 0 0
56041 - 0 0 0 0 0 0 0 0 0 0 0 0
56042 - 0 0 0 0 0 0 0 0 0 0 0 0
56043 - 0 0 0 0 0 0 0 0 0 0 0 0
56044 - 0 0 0 0 0 0 0 0 0 0 0 0
56045 - 0 0 0 0 0 0 0 0 0 0 0 0
56046 - 0 0 0 0 0 0 0 0 0 6 6 6
56047 - 14 14 14 38 38 38 74 74 74 66 66 66
56048 - 2 2 6 6 6 6 90 90 90 250 250 250
56049 -253 253 253 253 253 253 238 238 238 198 198 198
56050 -190 190 190 190 190 190 195 195 195 221 221 221
56051 -246 246 246 253 253 253 253 253 253 253 253 253
56052 -253 253 253 253 253 253 253 253 253 253 253 253
56053 -253 253 253 82 82 82 2 2 6 2 2 6
56054 - 2 2 6 2 2 6 2 2 6 2 2 6
56055 - 2 2 6 78 78 78 70 70 70 34 34 34
56056 - 14 14 14 6 6 6 0 0 0 0 0 0
56057 - 0 0 0 0 0 0 0 0 0 0 0 0
56058 - 0 0 0 0 0 0 0 0 0 0 0 0
56059 - 0 0 0 0 0 0 0 0 0 0 0 0
56060 - 0 0 0 0 0 0 0 0 0 0 0 0
56061 - 0 0 0 0 0 0 0 0 0 0 0 0
56062 - 0 0 0 0 0 0 0 0 0 0 0 0
56063 - 0 0 0 0 0 0 0 0 0 0 0 0
56064 - 0 0 0 0 0 0 0 0 0 0 0 0
56065 - 0 0 0 0 0 0 0 0 0 0 0 0
56066 - 0 0 0 0 0 0 0 0 0 14 14 14
56067 - 34 34 34 66 66 66 78 78 78 6 6 6
56068 - 2 2 6 18 18 18 218 218 218 253 253 253
56069 -253 253 253 253 253 253 253 253 253 246 246 246
56070 -226 226 226 231 231 231 246 246 246 253 253 253
56071 -253 253 253 253 253 253 253 253 253 253 253 253
56072 -253 253 253 253 253 253 253 253 253 253 253 253
56073 -253 253 253 178 178 178 2 2 6 2 2 6
56074 - 2 2 6 2 2 6 2 2 6 2 2 6
56075 - 2 2 6 18 18 18 90 90 90 62 62 62
56076 - 30 30 30 10 10 10 0 0 0 0 0 0
56077 - 0 0 0 0 0 0 0 0 0 0 0 0
56078 - 0 0 0 0 0 0 0 0 0 0 0 0
56079 - 0 0 0 0 0 0 0 0 0 0 0 0
56080 - 0 0 0 0 0 0 0 0 0 0 0 0
56081 - 0 0 0 0 0 0 0 0 0 0 0 0
56082 - 0 0 0 0 0 0 0 0 0 0 0 0
56083 - 0 0 0 0 0 0 0 0 0 0 0 0
56084 - 0 0 0 0 0 0 0 0 0 0 0 0
56085 - 0 0 0 0 0 0 0 0 0 0 0 0
56086 - 0 0 0 0 0 0 10 10 10 26 26 26
56087 - 58 58 58 90 90 90 18 18 18 2 2 6
56088 - 2 2 6 110 110 110 253 253 253 253 253 253
56089 -253 253 253 253 253 253 253 253 253 253 253 253
56090 -250 250 250 253 253 253 253 253 253 253 253 253
56091 -253 253 253 253 253 253 253 253 253 253 253 253
56092 -253 253 253 253 253 253 253 253 253 253 253 253
56093 -253 253 253 231 231 231 18 18 18 2 2 6
56094 - 2 2 6 2 2 6 2 2 6 2 2 6
56095 - 2 2 6 2 2 6 18 18 18 94 94 94
56096 - 54 54 54 26 26 26 10 10 10 0 0 0
56097 - 0 0 0 0 0 0 0 0 0 0 0 0
56098 - 0 0 0 0 0 0 0 0 0 0 0 0
56099 - 0 0 0 0 0 0 0 0 0 0 0 0
56100 - 0 0 0 0 0 0 0 0 0 0 0 0
56101 - 0 0 0 0 0 0 0 0 0 0 0 0
56102 - 0 0 0 0 0 0 0 0 0 0 0 0
56103 - 0 0 0 0 0 0 0 0 0 0 0 0
56104 - 0 0 0 0 0 0 0 0 0 0 0 0
56105 - 0 0 0 0 0 0 0 0 0 0 0 0
56106 - 0 0 0 6 6 6 22 22 22 50 50 50
56107 - 90 90 90 26 26 26 2 2 6 2 2 6
56108 - 14 14 14 195 195 195 250 250 250 253 253 253
56109 -253 253 253 253 253 253 253 253 253 253 253 253
56110 -253 253 253 253 253 253 253 253 253 253 253 253
56111 -253 253 253 253 253 253 253 253 253 253 253 253
56112 -253 253 253 253 253 253 253 253 253 253 253 253
56113 -250 250 250 242 242 242 54 54 54 2 2 6
56114 - 2 2 6 2 2 6 2 2 6 2 2 6
56115 - 2 2 6 2 2 6 2 2 6 38 38 38
56116 - 86 86 86 50 50 50 22 22 22 6 6 6
56117 - 0 0 0 0 0 0 0 0 0 0 0 0
56118 - 0 0 0 0 0 0 0 0 0 0 0 0
56119 - 0 0 0 0 0 0 0 0 0 0 0 0
56120 - 0 0 0 0 0 0 0 0 0 0 0 0
56121 - 0 0 0 0 0 0 0 0 0 0 0 0
56122 - 0 0 0 0 0 0 0 0 0 0 0 0
56123 - 0 0 0 0 0 0 0 0 0 0 0 0
56124 - 0 0 0 0 0 0 0 0 0 0 0 0
56125 - 0 0 0 0 0 0 0 0 0 0 0 0
56126 - 6 6 6 14 14 14 38 38 38 82 82 82
56127 - 34 34 34 2 2 6 2 2 6 2 2 6
56128 - 42 42 42 195 195 195 246 246 246 253 253 253
56129 -253 253 253 253 253 253 253 253 253 250 250 250
56130 -242 242 242 242 242 242 250 250 250 253 253 253
56131 -253 253 253 253 253 253 253 253 253 253 253 253
56132 -253 253 253 250 250 250 246 246 246 238 238 238
56133 -226 226 226 231 231 231 101 101 101 6 6 6
56134 - 2 2 6 2 2 6 2 2 6 2 2 6
56135 - 2 2 6 2 2 6 2 2 6 2 2 6
56136 - 38 38 38 82 82 82 42 42 42 14 14 14
56137 - 6 6 6 0 0 0 0 0 0 0 0 0
56138 - 0 0 0 0 0 0 0 0 0 0 0 0
56139 - 0 0 0 0 0 0 0 0 0 0 0 0
56140 - 0 0 0 0 0 0 0 0 0 0 0 0
56141 - 0 0 0 0 0 0 0 0 0 0 0 0
56142 - 0 0 0 0 0 0 0 0 0 0 0 0
56143 - 0 0 0 0 0 0 0 0 0 0 0 0
56144 - 0 0 0 0 0 0 0 0 0 0 0 0
56145 - 0 0 0 0 0 0 0 0 0 0 0 0
56146 - 10 10 10 26 26 26 62 62 62 66 66 66
56147 - 2 2 6 2 2 6 2 2 6 6 6 6
56148 - 70 70 70 170 170 170 206 206 206 234 234 234
56149 -246 246 246 250 250 250 250 250 250 238 238 238
56150 -226 226 226 231 231 231 238 238 238 250 250 250
56151 -250 250 250 250 250 250 246 246 246 231 231 231
56152 -214 214 214 206 206 206 202 202 202 202 202 202
56153 -198 198 198 202 202 202 182 182 182 18 18 18
56154 - 2 2 6 2 2 6 2 2 6 2 2 6
56155 - 2 2 6 2 2 6 2 2 6 2 2 6
56156 - 2 2 6 62 62 62 66 66 66 30 30 30
56157 - 10 10 10 0 0 0 0 0 0 0 0 0
56158 - 0 0 0 0 0 0 0 0 0 0 0 0
56159 - 0 0 0 0 0 0 0 0 0 0 0 0
56160 - 0 0 0 0 0 0 0 0 0 0 0 0
56161 - 0 0 0 0 0 0 0 0 0 0 0 0
56162 - 0 0 0 0 0 0 0 0 0 0 0 0
56163 - 0 0 0 0 0 0 0 0 0 0 0 0
56164 - 0 0 0 0 0 0 0 0 0 0 0 0
56165 - 0 0 0 0 0 0 0 0 0 0 0 0
56166 - 14 14 14 42 42 42 82 82 82 18 18 18
56167 - 2 2 6 2 2 6 2 2 6 10 10 10
56168 - 94 94 94 182 182 182 218 218 218 242 242 242
56169 -250 250 250 253 253 253 253 253 253 250 250 250
56170 -234 234 234 253 253 253 253 253 253 253 253 253
56171 -253 253 253 253 253 253 253 253 253 246 246 246
56172 -238 238 238 226 226 226 210 210 210 202 202 202
56173 -195 195 195 195 195 195 210 210 210 158 158 158
56174 - 6 6 6 14 14 14 50 50 50 14 14 14
56175 - 2 2 6 2 2 6 2 2 6 2 2 6
56176 - 2 2 6 6 6 6 86 86 86 46 46 46
56177 - 18 18 18 6 6 6 0 0 0 0 0 0
56178 - 0 0 0 0 0 0 0 0 0 0 0 0
56179 - 0 0 0 0 0 0 0 0 0 0 0 0
56180 - 0 0 0 0 0 0 0 0 0 0 0 0
56181 - 0 0 0 0 0 0 0 0 0 0 0 0
56182 - 0 0 0 0 0 0 0 0 0 0 0 0
56183 - 0 0 0 0 0 0 0 0 0 0 0 0
56184 - 0 0 0 0 0 0 0 0 0 0 0 0
56185 - 0 0 0 0 0 0 0 0 0 6 6 6
56186 - 22 22 22 54 54 54 70 70 70 2 2 6
56187 - 2 2 6 10 10 10 2 2 6 22 22 22
56188 -166 166 166 231 231 231 250 250 250 253 253 253
56189 -253 253 253 253 253 253 253 253 253 250 250 250
56190 -242 242 242 253 253 253 253 253 253 253 253 253
56191 -253 253 253 253 253 253 253 253 253 253 253 253
56192 -253 253 253 253 253 253 253 253 253 246 246 246
56193 -231 231 231 206 206 206 198 198 198 226 226 226
56194 - 94 94 94 2 2 6 6 6 6 38 38 38
56195 - 30 30 30 2 2 6 2 2 6 2 2 6
56196 - 2 2 6 2 2 6 62 62 62 66 66 66
56197 - 26 26 26 10 10 10 0 0 0 0 0 0
56198 - 0 0 0 0 0 0 0 0 0 0 0 0
56199 - 0 0 0 0 0 0 0 0 0 0 0 0
56200 - 0 0 0 0 0 0 0 0 0 0 0 0
56201 - 0 0 0 0 0 0 0 0 0 0 0 0
56202 - 0 0 0 0 0 0 0 0 0 0 0 0
56203 - 0 0 0 0 0 0 0 0 0 0 0 0
56204 - 0 0 0 0 0 0 0 0 0 0 0 0
56205 - 0 0 0 0 0 0 0 0 0 10 10 10
56206 - 30 30 30 74 74 74 50 50 50 2 2 6
56207 - 26 26 26 26 26 26 2 2 6 106 106 106
56208 -238 238 238 253 253 253 253 253 253 253 253 253
56209 -253 253 253 253 253 253 253 253 253 253 253 253
56210 -253 253 253 253 253 253 253 253 253 253 253 253
56211 -253 253 253 253 253 253 253 253 253 253 253 253
56212 -253 253 253 253 253 253 253 253 253 253 253 253
56213 -253 253 253 246 246 246 218 218 218 202 202 202
56214 -210 210 210 14 14 14 2 2 6 2 2 6
56215 - 30 30 30 22 22 22 2 2 6 2 2 6
56216 - 2 2 6 2 2 6 18 18 18 86 86 86
56217 - 42 42 42 14 14 14 0 0 0 0 0 0
56218 - 0 0 0 0 0 0 0 0 0 0 0 0
56219 - 0 0 0 0 0 0 0 0 0 0 0 0
56220 - 0 0 0 0 0 0 0 0 0 0 0 0
56221 - 0 0 0 0 0 0 0 0 0 0 0 0
56222 - 0 0 0 0 0 0 0 0 0 0 0 0
56223 - 0 0 0 0 0 0 0 0 0 0 0 0
56224 - 0 0 0 0 0 0 0 0 0 0 0 0
56225 - 0 0 0 0 0 0 0 0 0 14 14 14
56226 - 42 42 42 90 90 90 22 22 22 2 2 6
56227 - 42 42 42 2 2 6 18 18 18 218 218 218
56228 -253 253 253 253 253 253 253 253 253 253 253 253
56229 -253 253 253 253 253 253 253 253 253 253 253 253
56230 -253 253 253 253 253 253 253 253 253 253 253 253
56231 -253 253 253 253 253 253 253 253 253 253 253 253
56232 -253 253 253 253 253 253 253 253 253 253 253 253
56233 -253 253 253 253 253 253 250 250 250 221 221 221
56234 -218 218 218 101 101 101 2 2 6 14 14 14
56235 - 18 18 18 38 38 38 10 10 10 2 2 6
56236 - 2 2 6 2 2 6 2 2 6 78 78 78
56237 - 58 58 58 22 22 22 6 6 6 0 0 0
56238 - 0 0 0 0 0 0 0 0 0 0 0 0
56239 - 0 0 0 0 0 0 0 0 0 0 0 0
56240 - 0 0 0 0 0 0 0 0 0 0 0 0
56241 - 0 0 0 0 0 0 0 0 0 0 0 0
56242 - 0 0 0 0 0 0 0 0 0 0 0 0
56243 - 0 0 0 0 0 0 0 0 0 0 0 0
56244 - 0 0 0 0 0 0 0 0 0 0 0 0
56245 - 0 0 0 0 0 0 6 6 6 18 18 18
56246 - 54 54 54 82 82 82 2 2 6 26 26 26
56247 - 22 22 22 2 2 6 123 123 123 253 253 253
56248 -253 253 253 253 253 253 253 253 253 253 253 253
56249 -253 253 253 253 253 253 253 253 253 253 253 253
56250 -253 253 253 253 253 253 253 253 253 253 253 253
56251 -253 253 253 253 253 253 253 253 253 253 253 253
56252 -253 253 253 253 253 253 253 253 253 253 253 253
56253 -253 253 253 253 253 253 253 253 253 250 250 250
56254 -238 238 238 198 198 198 6 6 6 38 38 38
56255 - 58 58 58 26 26 26 38 38 38 2 2 6
56256 - 2 2 6 2 2 6 2 2 6 46 46 46
56257 - 78 78 78 30 30 30 10 10 10 0 0 0
56258 - 0 0 0 0 0 0 0 0 0 0 0 0
56259 - 0 0 0 0 0 0 0 0 0 0 0 0
56260 - 0 0 0 0 0 0 0 0 0 0 0 0
56261 - 0 0 0 0 0 0 0 0 0 0 0 0
56262 - 0 0 0 0 0 0 0 0 0 0 0 0
56263 - 0 0 0 0 0 0 0 0 0 0 0 0
56264 - 0 0 0 0 0 0 0 0 0 0 0 0
56265 - 0 0 0 0 0 0 10 10 10 30 30 30
56266 - 74 74 74 58 58 58 2 2 6 42 42 42
56267 - 2 2 6 22 22 22 231 231 231 253 253 253
56268 -253 253 253 253 253 253 253 253 253 253 253 253
56269 -253 253 253 253 253 253 253 253 253 250 250 250
56270 -253 253 253 253 253 253 253 253 253 253 253 253
56271 -253 253 253 253 253 253 253 253 253 253 253 253
56272 -253 253 253 253 253 253 253 253 253 253 253 253
56273 -253 253 253 253 253 253 253 253 253 253 253 253
56274 -253 253 253 246 246 246 46 46 46 38 38 38
56275 - 42 42 42 14 14 14 38 38 38 14 14 14
56276 - 2 2 6 2 2 6 2 2 6 6 6 6
56277 - 86 86 86 46 46 46 14 14 14 0 0 0
56278 - 0 0 0 0 0 0 0 0 0 0 0 0
56279 - 0 0 0 0 0 0 0 0 0 0 0 0
56280 - 0 0 0 0 0 0 0 0 0 0 0 0
56281 - 0 0 0 0 0 0 0 0 0 0 0 0
56282 - 0 0 0 0 0 0 0 0 0 0 0 0
56283 - 0 0 0 0 0 0 0 0 0 0 0 0
56284 - 0 0 0 0 0 0 0 0 0 0 0 0
56285 - 0 0 0 6 6 6 14 14 14 42 42 42
56286 - 90 90 90 18 18 18 18 18 18 26 26 26
56287 - 2 2 6 116 116 116 253 253 253 253 253 253
56288 -253 253 253 253 253 253 253 253 253 253 253 253
56289 -253 253 253 253 253 253 250 250 250 238 238 238
56290 -253 253 253 253 253 253 253 253 253 253 253 253
56291 -253 253 253 253 253 253 253 253 253 253 253 253
56292 -253 253 253 253 253 253 253 253 253 253 253 253
56293 -253 253 253 253 253 253 253 253 253 253 253 253
56294 -253 253 253 253 253 253 94 94 94 6 6 6
56295 - 2 2 6 2 2 6 10 10 10 34 34 34
56296 - 2 2 6 2 2 6 2 2 6 2 2 6
56297 - 74 74 74 58 58 58 22 22 22 6 6 6
56298 - 0 0 0 0 0 0 0 0 0 0 0 0
56299 - 0 0 0 0 0 0 0 0 0 0 0 0
56300 - 0 0 0 0 0 0 0 0 0 0 0 0
56301 - 0 0 0 0 0 0 0 0 0 0 0 0
56302 - 0 0 0 0 0 0 0 0 0 0 0 0
56303 - 0 0 0 0 0 0 0 0 0 0 0 0
56304 - 0 0 0 0 0 0 0 0 0 0 0 0
56305 - 0 0 0 10 10 10 26 26 26 66 66 66
56306 - 82 82 82 2 2 6 38 38 38 6 6 6
56307 - 14 14 14 210 210 210 253 253 253 253 253 253
56308 -253 253 253 253 253 253 253 253 253 253 253 253
56309 -253 253 253 253 253 253 246 246 246 242 242 242
56310 -253 253 253 253 253 253 253 253 253 253 253 253
56311 -253 253 253 253 253 253 253 253 253 253 253 253
56312 -253 253 253 253 253 253 253 253 253 253 253 253
56313 -253 253 253 253 253 253 253 253 253 253 253 253
56314 -253 253 253 253 253 253 144 144 144 2 2 6
56315 - 2 2 6 2 2 6 2 2 6 46 46 46
56316 - 2 2 6 2 2 6 2 2 6 2 2 6
56317 - 42 42 42 74 74 74 30 30 30 10 10 10
56318 - 0 0 0 0 0 0 0 0 0 0 0 0
56319 - 0 0 0 0 0 0 0 0 0 0 0 0
56320 - 0 0 0 0 0 0 0 0 0 0 0 0
56321 - 0 0 0 0 0 0 0 0 0 0 0 0
56322 - 0 0 0 0 0 0 0 0 0 0 0 0
56323 - 0 0 0 0 0 0 0 0 0 0 0 0
56324 - 0 0 0 0 0 0 0 0 0 0 0 0
56325 - 6 6 6 14 14 14 42 42 42 90 90 90
56326 - 26 26 26 6 6 6 42 42 42 2 2 6
56327 - 74 74 74 250 250 250 253 253 253 253 253 253
56328 -253 253 253 253 253 253 253 253 253 253 253 253
56329 -253 253 253 253 253 253 242 242 242 242 242 242
56330 -253 253 253 253 253 253 253 253 253 253 253 253
56331 -253 253 253 253 253 253 253 253 253 253 253 253
56332 -253 253 253 253 253 253 253 253 253 253 253 253
56333 -253 253 253 253 253 253 253 253 253 253 253 253
56334 -253 253 253 253 253 253 182 182 182 2 2 6
56335 - 2 2 6 2 2 6 2 2 6 46 46 46
56336 - 2 2 6 2 2 6 2 2 6 2 2 6
56337 - 10 10 10 86 86 86 38 38 38 10 10 10
56338 - 0 0 0 0 0 0 0 0 0 0 0 0
56339 - 0 0 0 0 0 0 0 0 0 0 0 0
56340 - 0 0 0 0 0 0 0 0 0 0 0 0
56341 - 0 0 0 0 0 0 0 0 0 0 0 0
56342 - 0 0 0 0 0 0 0 0 0 0 0 0
56343 - 0 0 0 0 0 0 0 0 0 0 0 0
56344 - 0 0 0 0 0 0 0 0 0 0 0 0
56345 - 10 10 10 26 26 26 66 66 66 82 82 82
56346 - 2 2 6 22 22 22 18 18 18 2 2 6
56347 -149 149 149 253 253 253 253 253 253 253 253 253
56348 -253 253 253 253 253 253 253 253 253 253 253 253
56349 -253 253 253 253 253 253 234 234 234 242 242 242
56350 -253 253 253 253 253 253 253 253 253 253 253 253
56351 -253 253 253 253 253 253 253 253 253 253 253 253
56352 -253 253 253 253 253 253 253 253 253 253 253 253
56353 -253 253 253 253 253 253 253 253 253 253 253 253
56354 -253 253 253 253 253 253 206 206 206 2 2 6
56355 - 2 2 6 2 2 6 2 2 6 38 38 38
56356 - 2 2 6 2 2 6 2 2 6 2 2 6
56357 - 6 6 6 86 86 86 46 46 46 14 14 14
56358 - 0 0 0 0 0 0 0 0 0 0 0 0
56359 - 0 0 0 0 0 0 0 0 0 0 0 0
56360 - 0 0 0 0 0 0 0 0 0 0 0 0
56361 - 0 0 0 0 0 0 0 0 0 0 0 0
56362 - 0 0 0 0 0 0 0 0 0 0 0 0
56363 - 0 0 0 0 0 0 0 0 0 0 0 0
56364 - 0 0 0 0 0 0 0 0 0 6 6 6
56365 - 18 18 18 46 46 46 86 86 86 18 18 18
56366 - 2 2 6 34 34 34 10 10 10 6 6 6
56367 -210 210 210 253 253 253 253 253 253 253 253 253
56368 -253 253 253 253 253 253 253 253 253 253 253 253
56369 -253 253 253 253 253 253 234 234 234 242 242 242
56370 -253 253 253 253 253 253 253 253 253 253 253 253
56371 -253 253 253 253 253 253 253 253 253 253 253 253
56372 -253 253 253 253 253 253 253 253 253 253 253 253
56373 -253 253 253 253 253 253 253 253 253 253 253 253
56374 -253 253 253 253 253 253 221 221 221 6 6 6
56375 - 2 2 6 2 2 6 6 6 6 30 30 30
56376 - 2 2 6 2 2 6 2 2 6 2 2 6
56377 - 2 2 6 82 82 82 54 54 54 18 18 18
56378 - 6 6 6 0 0 0 0 0 0 0 0 0
56379 - 0 0 0 0 0 0 0 0 0 0 0 0
56380 - 0 0 0 0 0 0 0 0 0 0 0 0
56381 - 0 0 0 0 0 0 0 0 0 0 0 0
56382 - 0 0 0 0 0 0 0 0 0 0 0 0
56383 - 0 0 0 0 0 0 0 0 0 0 0 0
56384 - 0 0 0 0 0 0 0 0 0 10 10 10
56385 - 26 26 26 66 66 66 62 62 62 2 2 6
56386 - 2 2 6 38 38 38 10 10 10 26 26 26
56387 -238 238 238 253 253 253 253 253 253 253 253 253
56388 -253 253 253 253 253 253 253 253 253 253 253 253
56389 -253 253 253 253 253 253 231 231 231 238 238 238
56390 -253 253 253 253 253 253 253 253 253 253 253 253
56391 -253 253 253 253 253 253 253 253 253 253 253 253
56392 -253 253 253 253 253 253 253 253 253 253 253 253
56393 -253 253 253 253 253 253 253 253 253 253 253 253
56394 -253 253 253 253 253 253 231 231 231 6 6 6
56395 - 2 2 6 2 2 6 10 10 10 30 30 30
56396 - 2 2 6 2 2 6 2 2 6 2 2 6
56397 - 2 2 6 66 66 66 58 58 58 22 22 22
56398 - 6 6 6 0 0 0 0 0 0 0 0 0
56399 - 0 0 0 0 0 0 0 0 0 0 0 0
56400 - 0 0 0 0 0 0 0 0 0 0 0 0
56401 - 0 0 0 0 0 0 0 0 0 0 0 0
56402 - 0 0 0 0 0 0 0 0 0 0 0 0
56403 - 0 0 0 0 0 0 0 0 0 0 0 0
56404 - 0 0 0 0 0 0 0 0 0 10 10 10
56405 - 38 38 38 78 78 78 6 6 6 2 2 6
56406 - 2 2 6 46 46 46 14 14 14 42 42 42
56407 -246 246 246 253 253 253 253 253 253 253 253 253
56408 -253 253 253 253 253 253 253 253 253 253 253 253
56409 -253 253 253 253 253 253 231 231 231 242 242 242
56410 -253 253 253 253 253 253 253 253 253 253 253 253
56411 -253 253 253 253 253 253 253 253 253 253 253 253
56412 -253 253 253 253 253 253 253 253 253 253 253 253
56413 -253 253 253 253 253 253 253 253 253 253 253 253
56414 -253 253 253 253 253 253 234 234 234 10 10 10
56415 - 2 2 6 2 2 6 22 22 22 14 14 14
56416 - 2 2 6 2 2 6 2 2 6 2 2 6
56417 - 2 2 6 66 66 66 62 62 62 22 22 22
56418 - 6 6 6 0 0 0 0 0 0 0 0 0
56419 - 0 0 0 0 0 0 0 0 0 0 0 0
56420 - 0 0 0 0 0 0 0 0 0 0 0 0
56421 - 0 0 0 0 0 0 0 0 0 0 0 0
56422 - 0 0 0 0 0 0 0 0 0 0 0 0
56423 - 0 0 0 0 0 0 0 0 0 0 0 0
56424 - 0 0 0 0 0 0 6 6 6 18 18 18
56425 - 50 50 50 74 74 74 2 2 6 2 2 6
56426 - 14 14 14 70 70 70 34 34 34 62 62 62
56427 -250 250 250 253 253 253 253 253 253 253 253 253
56428 -253 253 253 253 253 253 253 253 253 253 253 253
56429 -253 253 253 253 253 253 231 231 231 246 246 246
56430 -253 253 253 253 253 253 253 253 253 253 253 253
56431 -253 253 253 253 253 253 253 253 253 253 253 253
56432 -253 253 253 253 253 253 253 253 253 253 253 253
56433 -253 253 253 253 253 253 253 253 253 253 253 253
56434 -253 253 253 253 253 253 234 234 234 14 14 14
56435 - 2 2 6 2 2 6 30 30 30 2 2 6
56436 - 2 2 6 2 2 6 2 2 6 2 2 6
56437 - 2 2 6 66 66 66 62 62 62 22 22 22
56438 - 6 6 6 0 0 0 0 0 0 0 0 0
56439 - 0 0 0 0 0 0 0 0 0 0 0 0
56440 - 0 0 0 0 0 0 0 0 0 0 0 0
56441 - 0 0 0 0 0 0 0 0 0 0 0 0
56442 - 0 0 0 0 0 0 0 0 0 0 0 0
56443 - 0 0 0 0 0 0 0 0 0 0 0 0
56444 - 0 0 0 0 0 0 6 6 6 18 18 18
56445 - 54 54 54 62 62 62 2 2 6 2 2 6
56446 - 2 2 6 30 30 30 46 46 46 70 70 70
56447 -250 250 250 253 253 253 253 253 253 253 253 253
56448 -253 253 253 253 253 253 253 253 253 253 253 253
56449 -253 253 253 253 253 253 231 231 231 246 246 246
56450 -253 253 253 253 253 253 253 253 253 253 253 253
56451 -253 253 253 253 253 253 253 253 253 253 253 253
56452 -253 253 253 253 253 253 253 253 253 253 253 253
56453 -253 253 253 253 253 253 253 253 253 253 253 253
56454 -253 253 253 253 253 253 226 226 226 10 10 10
56455 - 2 2 6 6 6 6 30 30 30 2 2 6
56456 - 2 2 6 2 2 6 2 2 6 2 2 6
56457 - 2 2 6 66 66 66 58 58 58 22 22 22
56458 - 6 6 6 0 0 0 0 0 0 0 0 0
56459 - 0 0 0 0 0 0 0 0 0 0 0 0
56460 - 0 0 0 0 0 0 0 0 0 0 0 0
56461 - 0 0 0 0 0 0 0 0 0 0 0 0
56462 - 0 0 0 0 0 0 0 0 0 0 0 0
56463 - 0 0 0 0 0 0 0 0 0 0 0 0
56464 - 0 0 0 0 0 0 6 6 6 22 22 22
56465 - 58 58 58 62 62 62 2 2 6 2 2 6
56466 - 2 2 6 2 2 6 30 30 30 78 78 78
56467 -250 250 250 253 253 253 253 253 253 253 253 253
56468 -253 253 253 253 253 253 253 253 253 253 253 253
56469 -253 253 253 253 253 253 231 231 231 246 246 246
56470 -253 253 253 253 253 253 253 253 253 253 253 253
56471 -253 253 253 253 253 253 253 253 253 253 253 253
56472 -253 253 253 253 253 253 253 253 253 253 253 253
56473 -253 253 253 253 253 253 253 253 253 253 253 253
56474 -253 253 253 253 253 253 206 206 206 2 2 6
56475 - 22 22 22 34 34 34 18 14 6 22 22 22
56476 - 26 26 26 18 18 18 6 6 6 2 2 6
56477 - 2 2 6 82 82 82 54 54 54 18 18 18
56478 - 6 6 6 0 0 0 0 0 0 0 0 0
56479 - 0 0 0 0 0 0 0 0 0 0 0 0
56480 - 0 0 0 0 0 0 0 0 0 0 0 0
56481 - 0 0 0 0 0 0 0 0 0 0 0 0
56482 - 0 0 0 0 0 0 0 0 0 0 0 0
56483 - 0 0 0 0 0 0 0 0 0 0 0 0
56484 - 0 0 0 0 0 0 6 6 6 26 26 26
56485 - 62 62 62 106 106 106 74 54 14 185 133 11
56486 -210 162 10 121 92 8 6 6 6 62 62 62
56487 -238 238 238 253 253 253 253 253 253 253 253 253
56488 -253 253 253 253 253 253 253 253 253 253 253 253
56489 -253 253 253 253 253 253 231 231 231 246 246 246
56490 -253 253 253 253 253 253 253 253 253 253 253 253
56491 -253 253 253 253 253 253 253 253 253 253 253 253
56492 -253 253 253 253 253 253 253 253 253 253 253 253
56493 -253 253 253 253 253 253 253 253 253 253 253 253
56494 -253 253 253 253 253 253 158 158 158 18 18 18
56495 - 14 14 14 2 2 6 2 2 6 2 2 6
56496 - 6 6 6 18 18 18 66 66 66 38 38 38
56497 - 6 6 6 94 94 94 50 50 50 18 18 18
56498 - 6 6 6 0 0 0 0 0 0 0 0 0
56499 - 0 0 0 0 0 0 0 0 0 0 0 0
56500 - 0 0 0 0 0 0 0 0 0 0 0 0
56501 - 0 0 0 0 0 0 0 0 0 0 0 0
56502 - 0 0 0 0 0 0 0 0 0 0 0 0
56503 - 0 0 0 0 0 0 0 0 0 6 6 6
56504 - 10 10 10 10 10 10 18 18 18 38 38 38
56505 - 78 78 78 142 134 106 216 158 10 242 186 14
56506 -246 190 14 246 190 14 156 118 10 10 10 10
56507 - 90 90 90 238 238 238 253 253 253 253 253 253
56508 -253 253 253 253 253 253 253 253 253 253 253 253
56509 -253 253 253 253 253 253 231 231 231 250 250 250
56510 -253 253 253 253 253 253 253 253 253 253 253 253
56511 -253 253 253 253 253 253 253 253 253 253 253 253
56512 -253 253 253 253 253 253 253 253 253 253 253 253
56513 -253 253 253 253 253 253 253 253 253 246 230 190
56514 -238 204 91 238 204 91 181 142 44 37 26 9
56515 - 2 2 6 2 2 6 2 2 6 2 2 6
56516 - 2 2 6 2 2 6 38 38 38 46 46 46
56517 - 26 26 26 106 106 106 54 54 54 18 18 18
56518 - 6 6 6 0 0 0 0 0 0 0 0 0
56519 - 0 0 0 0 0 0 0 0 0 0 0 0
56520 - 0 0 0 0 0 0 0 0 0 0 0 0
56521 - 0 0 0 0 0 0 0 0 0 0 0 0
56522 - 0 0 0 0 0 0 0 0 0 0 0 0
56523 - 0 0 0 6 6 6 14 14 14 22 22 22
56524 - 30 30 30 38 38 38 50 50 50 70 70 70
56525 -106 106 106 190 142 34 226 170 11 242 186 14
56526 -246 190 14 246 190 14 246 190 14 154 114 10
56527 - 6 6 6 74 74 74 226 226 226 253 253 253
56528 -253 253 253 253 253 253 253 253 253 253 253 253
56529 -253 253 253 253 253 253 231 231 231 250 250 250
56530 -253 253 253 253 253 253 253 253 253 253 253 253
56531 -253 253 253 253 253 253 253 253 253 253 253 253
56532 -253 253 253 253 253 253 253 253 253 253 253 253
56533 -253 253 253 253 253 253 253 253 253 228 184 62
56534 -241 196 14 241 208 19 232 195 16 38 30 10
56535 - 2 2 6 2 2 6 2 2 6 2 2 6
56536 - 2 2 6 6 6 6 30 30 30 26 26 26
56537 -203 166 17 154 142 90 66 66 66 26 26 26
56538 - 6 6 6 0 0 0 0 0 0 0 0 0
56539 - 0 0 0 0 0 0 0 0 0 0 0 0
56540 - 0 0 0 0 0 0 0 0 0 0 0 0
56541 - 0 0 0 0 0 0 0 0 0 0 0 0
56542 - 0 0 0 0 0 0 0 0 0 0 0 0
56543 - 6 6 6 18 18 18 38 38 38 58 58 58
56544 - 78 78 78 86 86 86 101 101 101 123 123 123
56545 -175 146 61 210 150 10 234 174 13 246 186 14
56546 -246 190 14 246 190 14 246 190 14 238 190 10
56547 -102 78 10 2 2 6 46 46 46 198 198 198
56548 -253 253 253 253 253 253 253 253 253 253 253 253
56549 -253 253 253 253 253 253 234 234 234 242 242 242
56550 -253 253 253 253 253 253 253 253 253 253 253 253
56551 -253 253 253 253 253 253 253 253 253 253 253 253
56552 -253 253 253 253 253 253 253 253 253 253 253 253
56553 -253 253 253 253 253 253 253 253 253 224 178 62
56554 -242 186 14 241 196 14 210 166 10 22 18 6
56555 - 2 2 6 2 2 6 2 2 6 2 2 6
56556 - 2 2 6 2 2 6 6 6 6 121 92 8
56557 -238 202 15 232 195 16 82 82 82 34 34 34
56558 - 10 10 10 0 0 0 0 0 0 0 0 0
56559 - 0 0 0 0 0 0 0 0 0 0 0 0
56560 - 0 0 0 0 0 0 0 0 0 0 0 0
56561 - 0 0 0 0 0 0 0 0 0 0 0 0
56562 - 0 0 0 0 0 0 0 0 0 0 0 0
56563 - 14 14 14 38 38 38 70 70 70 154 122 46
56564 -190 142 34 200 144 11 197 138 11 197 138 11
56565 -213 154 11 226 170 11 242 186 14 246 190 14
56566 -246 190 14 246 190 14 246 190 14 246 190 14
56567 -225 175 15 46 32 6 2 2 6 22 22 22
56568 -158 158 158 250 250 250 253 253 253 253 253 253
56569 -253 253 253 253 253 253 253 253 253 253 253 253
56570 -253 253 253 253 253 253 253 253 253 253 253 253
56571 -253 253 253 253 253 253 253 253 253 253 253 253
56572 -253 253 253 253 253 253 253 253 253 253 253 253
56573 -253 253 253 250 250 250 242 242 242 224 178 62
56574 -239 182 13 236 186 11 213 154 11 46 32 6
56575 - 2 2 6 2 2 6 2 2 6 2 2 6
56576 - 2 2 6 2 2 6 61 42 6 225 175 15
56577 -238 190 10 236 186 11 112 100 78 42 42 42
56578 - 14 14 14 0 0 0 0 0 0 0 0 0
56579 - 0 0 0 0 0 0 0 0 0 0 0 0
56580 - 0 0 0 0 0 0 0 0 0 0 0 0
56581 - 0 0 0 0 0 0 0 0 0 0 0 0
56582 - 0 0 0 0 0 0 0 0 0 6 6 6
56583 - 22 22 22 54 54 54 154 122 46 213 154 11
56584 -226 170 11 230 174 11 226 170 11 226 170 11
56585 -236 178 12 242 186 14 246 190 14 246 190 14
56586 -246 190 14 246 190 14 246 190 14 246 190 14
56587 -241 196 14 184 144 12 10 10 10 2 2 6
56588 - 6 6 6 116 116 116 242 242 242 253 253 253
56589 -253 253 253 253 253 253 253 253 253 253 253 253
56590 -253 253 253 253 253 253 253 253 253 253 253 253
56591 -253 253 253 253 253 253 253 253 253 253 253 253
56592 -253 253 253 253 253 253 253 253 253 253 253 253
56593 -253 253 253 231 231 231 198 198 198 214 170 54
56594 -236 178 12 236 178 12 210 150 10 137 92 6
56595 - 18 14 6 2 2 6 2 2 6 2 2 6
56596 - 6 6 6 70 47 6 200 144 11 236 178 12
56597 -239 182 13 239 182 13 124 112 88 58 58 58
56598 - 22 22 22 6 6 6 0 0 0 0 0 0
56599 - 0 0 0 0 0 0 0 0 0 0 0 0
56600 - 0 0 0 0 0 0 0 0 0 0 0 0
56601 - 0 0 0 0 0 0 0 0 0 0 0 0
56602 - 0 0 0 0 0 0 0 0 0 10 10 10
56603 - 30 30 30 70 70 70 180 133 36 226 170 11
56604 -239 182 13 242 186 14 242 186 14 246 186 14
56605 -246 190 14 246 190 14 246 190 14 246 190 14
56606 -246 190 14 246 190 14 246 190 14 246 190 14
56607 -246 190 14 232 195 16 98 70 6 2 2 6
56608 - 2 2 6 2 2 6 66 66 66 221 221 221
56609 -253 253 253 253 253 253 253 253 253 253 253 253
56610 -253 253 253 253 253 253 253 253 253 253 253 253
56611 -253 253 253 253 253 253 253 253 253 253 253 253
56612 -253 253 253 253 253 253 253 253 253 253 253 253
56613 -253 253 253 206 206 206 198 198 198 214 166 58
56614 -230 174 11 230 174 11 216 158 10 192 133 9
56615 -163 110 8 116 81 8 102 78 10 116 81 8
56616 -167 114 7 197 138 11 226 170 11 239 182 13
56617 -242 186 14 242 186 14 162 146 94 78 78 78
56618 - 34 34 34 14 14 14 6 6 6 0 0 0
56619 - 0 0 0 0 0 0 0 0 0 0 0 0
56620 - 0 0 0 0 0 0 0 0 0 0 0 0
56621 - 0 0 0 0 0 0 0 0 0 0 0 0
56622 - 0 0 0 0 0 0 0 0 0 6 6 6
56623 - 30 30 30 78 78 78 190 142 34 226 170 11
56624 -239 182 13 246 190 14 246 190 14 246 190 14
56625 -246 190 14 246 190 14 246 190 14 246 190 14
56626 -246 190 14 246 190 14 246 190 14 246 190 14
56627 -246 190 14 241 196 14 203 166 17 22 18 6
56628 - 2 2 6 2 2 6 2 2 6 38 38 38
56629 -218 218 218 253 253 253 253 253 253 253 253 253
56630 -253 253 253 253 253 253 253 253 253 253 253 253
56631 -253 253 253 253 253 253 253 253 253 253 253 253
56632 -253 253 253 253 253 253 253 253 253 253 253 253
56633 -250 250 250 206 206 206 198 198 198 202 162 69
56634 -226 170 11 236 178 12 224 166 10 210 150 10
56635 -200 144 11 197 138 11 192 133 9 197 138 11
56636 -210 150 10 226 170 11 242 186 14 246 190 14
56637 -246 190 14 246 186 14 225 175 15 124 112 88
56638 - 62 62 62 30 30 30 14 14 14 6 6 6
56639 - 0 0 0 0 0 0 0 0 0 0 0 0
56640 - 0 0 0 0 0 0 0 0 0 0 0 0
56641 - 0 0 0 0 0 0 0 0 0 0 0 0
56642 - 0 0 0 0 0 0 0 0 0 10 10 10
56643 - 30 30 30 78 78 78 174 135 50 224 166 10
56644 -239 182 13 246 190 14 246 190 14 246 190 14
56645 -246 190 14 246 190 14 246 190 14 246 190 14
56646 -246 190 14 246 190 14 246 190 14 246 190 14
56647 -246 190 14 246 190 14 241 196 14 139 102 15
56648 - 2 2 6 2 2 6 2 2 6 2 2 6
56649 - 78 78 78 250 250 250 253 253 253 253 253 253
56650 -253 253 253 253 253 253 253 253 253 253 253 253
56651 -253 253 253 253 253 253 253 253 253 253 253 253
56652 -253 253 253 253 253 253 253 253 253 253 253 253
56653 -250 250 250 214 214 214 198 198 198 190 150 46
56654 -219 162 10 236 178 12 234 174 13 224 166 10
56655 -216 158 10 213 154 11 213 154 11 216 158 10
56656 -226 170 11 239 182 13 246 190 14 246 190 14
56657 -246 190 14 246 190 14 242 186 14 206 162 42
56658 -101 101 101 58 58 58 30 30 30 14 14 14
56659 - 6 6 6 0 0 0 0 0 0 0 0 0
56660 - 0 0 0 0 0 0 0 0 0 0 0 0
56661 - 0 0 0 0 0 0 0 0 0 0 0 0
56662 - 0 0 0 0 0 0 0 0 0 10 10 10
56663 - 30 30 30 74 74 74 174 135 50 216 158 10
56664 -236 178 12 246 190 14 246 190 14 246 190 14
56665 -246 190 14 246 190 14 246 190 14 246 190 14
56666 -246 190 14 246 190 14 246 190 14 246 190 14
56667 -246 190 14 246 190 14 241 196 14 226 184 13
56668 - 61 42 6 2 2 6 2 2 6 2 2 6
56669 - 22 22 22 238 238 238 253 253 253 253 253 253
56670 -253 253 253 253 253 253 253 253 253 253 253 253
56671 -253 253 253 253 253 253 253 253 253 253 253 253
56672 -253 253 253 253 253 253 253 253 253 253 253 253
56673 -253 253 253 226 226 226 187 187 187 180 133 36
56674 -216 158 10 236 178 12 239 182 13 236 178 12
56675 -230 174 11 226 170 11 226 170 11 230 174 11
56676 -236 178 12 242 186 14 246 190 14 246 190 14
56677 -246 190 14 246 190 14 246 186 14 239 182 13
56678 -206 162 42 106 106 106 66 66 66 34 34 34
56679 - 14 14 14 6 6 6 0 0 0 0 0 0
56680 - 0 0 0 0 0 0 0 0 0 0 0 0
56681 - 0 0 0 0 0 0 0 0 0 0 0 0
56682 - 0 0 0 0 0 0 0 0 0 6 6 6
56683 - 26 26 26 70 70 70 163 133 67 213 154 11
56684 -236 178 12 246 190 14 246 190 14 246 190 14
56685 -246 190 14 246 190 14 246 190 14 246 190 14
56686 -246 190 14 246 190 14 246 190 14 246 190 14
56687 -246 190 14 246 190 14 246 190 14 241 196 14
56688 -190 146 13 18 14 6 2 2 6 2 2 6
56689 - 46 46 46 246 246 246 253 253 253 253 253 253
56690 -253 253 253 253 253 253 253 253 253 253 253 253
56691 -253 253 253 253 253 253 253 253 253 253 253 253
56692 -253 253 253 253 253 253 253 253 253 253 253 253
56693 -253 253 253 221 221 221 86 86 86 156 107 11
56694 -216 158 10 236 178 12 242 186 14 246 186 14
56695 -242 186 14 239 182 13 239 182 13 242 186 14
56696 -242 186 14 246 186 14 246 190 14 246 190 14
56697 -246 190 14 246 190 14 246 190 14 246 190 14
56698 -242 186 14 225 175 15 142 122 72 66 66 66
56699 - 30 30 30 10 10 10 0 0 0 0 0 0
56700 - 0 0 0 0 0 0 0 0 0 0 0 0
56701 - 0 0 0 0 0 0 0 0 0 0 0 0
56702 - 0 0 0 0 0 0 0 0 0 6 6 6
56703 - 26 26 26 70 70 70 163 133 67 210 150 10
56704 -236 178 12 246 190 14 246 190 14 246 190 14
56705 -246 190 14 246 190 14 246 190 14 246 190 14
56706 -246 190 14 246 190 14 246 190 14 246 190 14
56707 -246 190 14 246 190 14 246 190 14 246 190 14
56708 -232 195 16 121 92 8 34 34 34 106 106 106
56709 -221 221 221 253 253 253 253 253 253 253 253 253
56710 -253 253 253 253 253 253 253 253 253 253 253 253
56711 -253 253 253 253 253 253 253 253 253 253 253 253
56712 -253 253 253 253 253 253 253 253 253 253 253 253
56713 -242 242 242 82 82 82 18 14 6 163 110 8
56714 -216 158 10 236 178 12 242 186 14 246 190 14
56715 -246 190 14 246 190 14 246 190 14 246 190 14
56716 -246 190 14 246 190 14 246 190 14 246 190 14
56717 -246 190 14 246 190 14 246 190 14 246 190 14
56718 -246 190 14 246 190 14 242 186 14 163 133 67
56719 - 46 46 46 18 18 18 6 6 6 0 0 0
56720 - 0 0 0 0 0 0 0 0 0 0 0 0
56721 - 0 0 0 0 0 0 0 0 0 0 0 0
56722 - 0 0 0 0 0 0 0 0 0 10 10 10
56723 - 30 30 30 78 78 78 163 133 67 210 150 10
56724 -236 178 12 246 186 14 246 190 14 246 190 14
56725 -246 190 14 246 190 14 246 190 14 246 190 14
56726 -246 190 14 246 190 14 246 190 14 246 190 14
56727 -246 190 14 246 190 14 246 190 14 246 190 14
56728 -241 196 14 215 174 15 190 178 144 253 253 253
56729 -253 253 253 253 253 253 253 253 253 253 253 253
56730 -253 253 253 253 253 253 253 253 253 253 253 253
56731 -253 253 253 253 253 253 253 253 253 253 253 253
56732 -253 253 253 253 253 253 253 253 253 218 218 218
56733 - 58 58 58 2 2 6 22 18 6 167 114 7
56734 -216 158 10 236 178 12 246 186 14 246 190 14
56735 -246 190 14 246 190 14 246 190 14 246 190 14
56736 -246 190 14 246 190 14 246 190 14 246 190 14
56737 -246 190 14 246 190 14 246 190 14 246 190 14
56738 -246 190 14 246 186 14 242 186 14 190 150 46
56739 - 54 54 54 22 22 22 6 6 6 0 0 0
56740 - 0 0 0 0 0 0 0 0 0 0 0 0
56741 - 0 0 0 0 0 0 0 0 0 0 0 0
56742 - 0 0 0 0 0 0 0 0 0 14 14 14
56743 - 38 38 38 86 86 86 180 133 36 213 154 11
56744 -236 178 12 246 186 14 246 190 14 246 190 14
56745 -246 190 14 246 190 14 246 190 14 246 190 14
56746 -246 190 14 246 190 14 246 190 14 246 190 14
56747 -246 190 14 246 190 14 246 190 14 246 190 14
56748 -246 190 14 232 195 16 190 146 13 214 214 214
56749 -253 253 253 253 253 253 253 253 253 253 253 253
56750 -253 253 253 253 253 253 253 253 253 253 253 253
56751 -253 253 253 253 253 253 253 253 253 253 253 253
56752 -253 253 253 250 250 250 170 170 170 26 26 26
56753 - 2 2 6 2 2 6 37 26 9 163 110 8
56754 -219 162 10 239 182 13 246 186 14 246 190 14
56755 -246 190 14 246 190 14 246 190 14 246 190 14
56756 -246 190 14 246 190 14 246 190 14 246 190 14
56757 -246 190 14 246 190 14 246 190 14 246 190 14
56758 -246 186 14 236 178 12 224 166 10 142 122 72
56759 - 46 46 46 18 18 18 6 6 6 0 0 0
56760 - 0 0 0 0 0 0 0 0 0 0 0 0
56761 - 0 0 0 0 0 0 0 0 0 0 0 0
56762 - 0 0 0 0 0 0 6 6 6 18 18 18
56763 - 50 50 50 109 106 95 192 133 9 224 166 10
56764 -242 186 14 246 190 14 246 190 14 246 190 14
56765 -246 190 14 246 190 14 246 190 14 246 190 14
56766 -246 190 14 246 190 14 246 190 14 246 190 14
56767 -246 190 14 246 190 14 246 190 14 246 190 14
56768 -242 186 14 226 184 13 210 162 10 142 110 46
56769 -226 226 226 253 253 253 253 253 253 253 253 253
56770 -253 253 253 253 253 253 253 253 253 253 253 253
56771 -253 253 253 253 253 253 253 253 253 253 253 253
56772 -198 198 198 66 66 66 2 2 6 2 2 6
56773 - 2 2 6 2 2 6 50 34 6 156 107 11
56774 -219 162 10 239 182 13 246 186 14 246 190 14
56775 -246 190 14 246 190 14 246 190 14 246 190 14
56776 -246 190 14 246 190 14 246 190 14 246 190 14
56777 -246 190 14 246 190 14 246 190 14 242 186 14
56778 -234 174 13 213 154 11 154 122 46 66 66 66
56779 - 30 30 30 10 10 10 0 0 0 0 0 0
56780 - 0 0 0 0 0 0 0 0 0 0 0 0
56781 - 0 0 0 0 0 0 0 0 0 0 0 0
56782 - 0 0 0 0 0 0 6 6 6 22 22 22
56783 - 58 58 58 154 121 60 206 145 10 234 174 13
56784 -242 186 14 246 186 14 246 190 14 246 190 14
56785 -246 190 14 246 190 14 246 190 14 246 190 14
56786 -246 190 14 246 190 14 246 190 14 246 190 14
56787 -246 190 14 246 190 14 246 190 14 246 190 14
56788 -246 186 14 236 178 12 210 162 10 163 110 8
56789 - 61 42 6 138 138 138 218 218 218 250 250 250
56790 -253 253 253 253 253 253 253 253 253 250 250 250
56791 -242 242 242 210 210 210 144 144 144 66 66 66
56792 - 6 6 6 2 2 6 2 2 6 2 2 6
56793 - 2 2 6 2 2 6 61 42 6 163 110 8
56794 -216 158 10 236 178 12 246 190 14 246 190 14
56795 -246 190 14 246 190 14 246 190 14 246 190 14
56796 -246 190 14 246 190 14 246 190 14 246 190 14
56797 -246 190 14 239 182 13 230 174 11 216 158 10
56798 -190 142 34 124 112 88 70 70 70 38 38 38
56799 - 18 18 18 6 6 6 0 0 0 0 0 0
56800 - 0 0 0 0 0 0 0 0 0 0 0 0
56801 - 0 0 0 0 0 0 0 0 0 0 0 0
56802 - 0 0 0 0 0 0 6 6 6 22 22 22
56803 - 62 62 62 168 124 44 206 145 10 224 166 10
56804 -236 178 12 239 182 13 242 186 14 242 186 14
56805 -246 186 14 246 190 14 246 190 14 246 190 14
56806 -246 190 14 246 190 14 246 190 14 246 190 14
56807 -246 190 14 246 190 14 246 190 14 246 190 14
56808 -246 190 14 236 178 12 216 158 10 175 118 6
56809 - 80 54 7 2 2 6 6 6 6 30 30 30
56810 - 54 54 54 62 62 62 50 50 50 38 38 38
56811 - 14 14 14 2 2 6 2 2 6 2 2 6
56812 - 2 2 6 2 2 6 2 2 6 2 2 6
56813 - 2 2 6 6 6 6 80 54 7 167 114 7
56814 -213 154 11 236 178 12 246 190 14 246 190 14
56815 -246 190 14 246 190 14 246 190 14 246 190 14
56816 -246 190 14 242 186 14 239 182 13 239 182 13
56817 -230 174 11 210 150 10 174 135 50 124 112 88
56818 - 82 82 82 54 54 54 34 34 34 18 18 18
56819 - 6 6 6 0 0 0 0 0 0 0 0 0
56820 - 0 0 0 0 0 0 0 0 0 0 0 0
56821 - 0 0 0 0 0 0 0 0 0 0 0 0
56822 - 0 0 0 0 0 0 6 6 6 18 18 18
56823 - 50 50 50 158 118 36 192 133 9 200 144 11
56824 -216 158 10 219 162 10 224 166 10 226 170 11
56825 -230 174 11 236 178 12 239 182 13 239 182 13
56826 -242 186 14 246 186 14 246 190 14 246 190 14
56827 -246 190 14 246 190 14 246 190 14 246 190 14
56828 -246 186 14 230 174 11 210 150 10 163 110 8
56829 -104 69 6 10 10 10 2 2 6 2 2 6
56830 - 2 2 6 2 2 6 2 2 6 2 2 6
56831 - 2 2 6 2 2 6 2 2 6 2 2 6
56832 - 2 2 6 2 2 6 2 2 6 2 2 6
56833 - 2 2 6 6 6 6 91 60 6 167 114 7
56834 -206 145 10 230 174 11 242 186 14 246 190 14
56835 -246 190 14 246 190 14 246 186 14 242 186 14
56836 -239 182 13 230 174 11 224 166 10 213 154 11
56837 -180 133 36 124 112 88 86 86 86 58 58 58
56838 - 38 38 38 22 22 22 10 10 10 6 6 6
56839 - 0 0 0 0 0 0 0 0 0 0 0 0
56840 - 0 0 0 0 0 0 0 0 0 0 0 0
56841 - 0 0 0 0 0 0 0 0 0 0 0 0
56842 - 0 0 0 0 0 0 0 0 0 14 14 14
56843 - 34 34 34 70 70 70 138 110 50 158 118 36
56844 -167 114 7 180 123 7 192 133 9 197 138 11
56845 -200 144 11 206 145 10 213 154 11 219 162 10
56846 -224 166 10 230 174 11 239 182 13 242 186 14
56847 -246 186 14 246 186 14 246 186 14 246 186 14
56848 -239 182 13 216 158 10 185 133 11 152 99 6
56849 -104 69 6 18 14 6 2 2 6 2 2 6
56850 - 2 2 6 2 2 6 2 2 6 2 2 6
56851 - 2 2 6 2 2 6 2 2 6 2 2 6
56852 - 2 2 6 2 2 6 2 2 6 2 2 6
56853 - 2 2 6 6 6 6 80 54 7 152 99 6
56854 -192 133 9 219 162 10 236 178 12 239 182 13
56855 -246 186 14 242 186 14 239 182 13 236 178 12
56856 -224 166 10 206 145 10 192 133 9 154 121 60
56857 - 94 94 94 62 62 62 42 42 42 22 22 22
56858 - 14 14 14 6 6 6 0 0 0 0 0 0
56859 - 0 0 0 0 0 0 0 0 0 0 0 0
56860 - 0 0 0 0 0 0 0 0 0 0 0 0
56861 - 0 0 0 0 0 0 0 0 0 0 0 0
56862 - 0 0 0 0 0 0 0 0 0 6 6 6
56863 - 18 18 18 34 34 34 58 58 58 78 78 78
56864 -101 98 89 124 112 88 142 110 46 156 107 11
56865 -163 110 8 167 114 7 175 118 6 180 123 7
56866 -185 133 11 197 138 11 210 150 10 219 162 10
56867 -226 170 11 236 178 12 236 178 12 234 174 13
56868 -219 162 10 197 138 11 163 110 8 130 83 6
56869 - 91 60 6 10 10 10 2 2 6 2 2 6
56870 - 18 18 18 38 38 38 38 38 38 38 38 38
56871 - 38 38 38 38 38 38 38 38 38 38 38 38
56872 - 38 38 38 38 38 38 26 26 26 2 2 6
56873 - 2 2 6 6 6 6 70 47 6 137 92 6
56874 -175 118 6 200 144 11 219 162 10 230 174 11
56875 -234 174 13 230 174 11 219 162 10 210 150 10
56876 -192 133 9 163 110 8 124 112 88 82 82 82
56877 - 50 50 50 30 30 30 14 14 14 6 6 6
56878 - 0 0 0 0 0 0 0 0 0 0 0 0
56879 - 0 0 0 0 0 0 0 0 0 0 0 0
56880 - 0 0 0 0 0 0 0 0 0 0 0 0
56881 - 0 0 0 0 0 0 0 0 0 0 0 0
56882 - 0 0 0 0 0 0 0 0 0 0 0 0
56883 - 6 6 6 14 14 14 22 22 22 34 34 34
56884 - 42 42 42 58 58 58 74 74 74 86 86 86
56885 -101 98 89 122 102 70 130 98 46 121 87 25
56886 -137 92 6 152 99 6 163 110 8 180 123 7
56887 -185 133 11 197 138 11 206 145 10 200 144 11
56888 -180 123 7 156 107 11 130 83 6 104 69 6
56889 - 50 34 6 54 54 54 110 110 110 101 98 89
56890 - 86 86 86 82 82 82 78 78 78 78 78 78
56891 - 78 78 78 78 78 78 78 78 78 78 78 78
56892 - 78 78 78 82 82 82 86 86 86 94 94 94
56893 -106 106 106 101 101 101 86 66 34 124 80 6
56894 -156 107 11 180 123 7 192 133 9 200 144 11
56895 -206 145 10 200 144 11 192 133 9 175 118 6
56896 -139 102 15 109 106 95 70 70 70 42 42 42
56897 - 22 22 22 10 10 10 0 0 0 0 0 0
56898 - 0 0 0 0 0 0 0 0 0 0 0 0
56899 - 0 0 0 0 0 0 0 0 0 0 0 0
56900 - 0 0 0 0 0 0 0 0 0 0 0 0
56901 - 0 0 0 0 0 0 0 0 0 0 0 0
56902 - 0 0 0 0 0 0 0 0 0 0 0 0
56903 - 0 0 0 0 0 0 6 6 6 10 10 10
56904 - 14 14 14 22 22 22 30 30 30 38 38 38
56905 - 50 50 50 62 62 62 74 74 74 90 90 90
56906 -101 98 89 112 100 78 121 87 25 124 80 6
56907 -137 92 6 152 99 6 152 99 6 152 99 6
56908 -138 86 6 124 80 6 98 70 6 86 66 30
56909 -101 98 89 82 82 82 58 58 58 46 46 46
56910 - 38 38 38 34 34 34 34 34 34 34 34 34
56911 - 34 34 34 34 34 34 34 34 34 34 34 34
56912 - 34 34 34 34 34 34 38 38 38 42 42 42
56913 - 54 54 54 82 82 82 94 86 76 91 60 6
56914 -134 86 6 156 107 11 167 114 7 175 118 6
56915 -175 118 6 167 114 7 152 99 6 121 87 25
56916 -101 98 89 62 62 62 34 34 34 18 18 18
56917 - 6 6 6 0 0 0 0 0 0 0 0 0
56918 - 0 0 0 0 0 0 0 0 0 0 0 0
56919 - 0 0 0 0 0 0 0 0 0 0 0 0
56920 - 0 0 0 0 0 0 0 0 0 0 0 0
56921 - 0 0 0 0 0 0 0 0 0 0 0 0
56922 - 0 0 0 0 0 0 0 0 0 0 0 0
56923 - 0 0 0 0 0 0 0 0 0 0 0 0
56924 - 0 0 0 6 6 6 6 6 6 10 10 10
56925 - 18 18 18 22 22 22 30 30 30 42 42 42
56926 - 50 50 50 66 66 66 86 86 86 101 98 89
56927 -106 86 58 98 70 6 104 69 6 104 69 6
56928 -104 69 6 91 60 6 82 62 34 90 90 90
56929 - 62 62 62 38 38 38 22 22 22 14 14 14
56930 - 10 10 10 10 10 10 10 10 10 10 10 10
56931 - 10 10 10 10 10 10 6 6 6 10 10 10
56932 - 10 10 10 10 10 10 10 10 10 14 14 14
56933 - 22 22 22 42 42 42 70 70 70 89 81 66
56934 - 80 54 7 104 69 6 124 80 6 137 92 6
56935 -134 86 6 116 81 8 100 82 52 86 86 86
56936 - 58 58 58 30 30 30 14 14 14 6 6 6
56937 - 0 0 0 0 0 0 0 0 0 0 0 0
56938 - 0 0 0 0 0 0 0 0 0 0 0 0
56939 - 0 0 0 0 0 0 0 0 0 0 0 0
56940 - 0 0 0 0 0 0 0 0 0 0 0 0
56941 - 0 0 0 0 0 0 0 0 0 0 0 0
56942 - 0 0 0 0 0 0 0 0 0 0 0 0
56943 - 0 0 0 0 0 0 0 0 0 0 0 0
56944 - 0 0 0 0 0 0 0 0 0 0 0 0
56945 - 0 0 0 6 6 6 10 10 10 14 14 14
56946 - 18 18 18 26 26 26 38 38 38 54 54 54
56947 - 70 70 70 86 86 86 94 86 76 89 81 66
56948 - 89 81 66 86 86 86 74 74 74 50 50 50
56949 - 30 30 30 14 14 14 6 6 6 0 0 0
56950 - 0 0 0 0 0 0 0 0 0 0 0 0
56951 - 0 0 0 0 0 0 0 0 0 0 0 0
56952 - 0 0 0 0 0 0 0 0 0 0 0 0
56953 - 6 6 6 18 18 18 34 34 34 58 58 58
56954 - 82 82 82 89 81 66 89 81 66 89 81 66
56955 - 94 86 66 94 86 76 74 74 74 50 50 50
56956 - 26 26 26 14 14 14 6 6 6 0 0 0
56957 - 0 0 0 0 0 0 0 0 0 0 0 0
56958 - 0 0 0 0 0 0 0 0 0 0 0 0
56959 - 0 0 0 0 0 0 0 0 0 0 0 0
56960 - 0 0 0 0 0 0 0 0 0 0 0 0
56961 - 0 0 0 0 0 0 0 0 0 0 0 0
56962 - 0 0 0 0 0 0 0 0 0 0 0 0
56963 - 0 0 0 0 0 0 0 0 0 0 0 0
56964 - 0 0 0 0 0 0 0 0 0 0 0 0
56965 - 0 0 0 0 0 0 0 0 0 0 0 0
56966 - 6 6 6 6 6 6 14 14 14 18 18 18
56967 - 30 30 30 38 38 38 46 46 46 54 54 54
56968 - 50 50 50 42 42 42 30 30 30 18 18 18
56969 - 10 10 10 0 0 0 0 0 0 0 0 0
56970 - 0 0 0 0 0 0 0 0 0 0 0 0
56971 - 0 0 0 0 0 0 0 0 0 0 0 0
56972 - 0 0 0 0 0 0 0 0 0 0 0 0
56973 - 0 0 0 6 6 6 14 14 14 26 26 26
56974 - 38 38 38 50 50 50 58 58 58 58 58 58
56975 - 54 54 54 42 42 42 30 30 30 18 18 18
56976 - 10 10 10 0 0 0 0 0 0 0 0 0
56977 - 0 0 0 0 0 0 0 0 0 0 0 0
56978 - 0 0 0 0 0 0 0 0 0 0 0 0
56979 - 0 0 0 0 0 0 0 0 0 0 0 0
56980 - 0 0 0 0 0 0 0 0 0 0 0 0
56981 - 0 0 0 0 0 0 0 0 0 0 0 0
56982 - 0 0 0 0 0 0 0 0 0 0 0 0
56983 - 0 0 0 0 0 0 0 0 0 0 0 0
56984 - 0 0 0 0 0 0 0 0 0 0 0 0
56985 - 0 0 0 0 0 0 0 0 0 0 0 0
56986 - 0 0 0 0 0 0 0 0 0 6 6 6
56987 - 6 6 6 10 10 10 14 14 14 18 18 18
56988 - 18 18 18 14 14 14 10 10 10 6 6 6
56989 - 0 0 0 0 0 0 0 0 0 0 0 0
56990 - 0 0 0 0 0 0 0 0 0 0 0 0
56991 - 0 0 0 0 0 0 0 0 0 0 0 0
56992 - 0 0 0 0 0 0 0 0 0 0 0 0
56993 - 0 0 0 0 0 0 0 0 0 6 6 6
56994 - 14 14 14 18 18 18 22 22 22 22 22 22
56995 - 18 18 18 14 14 14 10 10 10 6 6 6
56996 - 0 0 0 0 0 0 0 0 0 0 0 0
56997 - 0 0 0 0 0 0 0 0 0 0 0 0
56998 - 0 0 0 0 0 0 0 0 0 0 0 0
56999 - 0 0 0 0 0 0 0 0 0 0 0 0
57000 - 0 0 0 0 0 0 0 0 0 0 0 0
57001 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57002 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57003 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57004 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57005 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57006 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57007 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57008 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57009 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57010 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57012 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57013 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57014 +4 4 4 4 4 4
57015 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57016 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57017 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57018 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57019 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57020 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57021 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57022 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57023 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57024 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57025 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57026 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57027 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57028 +4 4 4 4 4 4
57029 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57030 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57031 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57032 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57033 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57034 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57035 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57036 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57037 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57038 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57039 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57040 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57041 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57042 +4 4 4 4 4 4
57043 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57044 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57045 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57046 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57047 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57048 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57049 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57050 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57051 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57052 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57053 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57054 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57055 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57056 +4 4 4 4 4 4
57057 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57058 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57059 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57060 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57061 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57062 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57063 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57064 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57065 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57066 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57067 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57068 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57069 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57070 +4 4 4 4 4 4
57071 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57072 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57073 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57074 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57075 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57076 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57077 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57078 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57079 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57080 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57081 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57082 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57083 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57084 +4 4 4 4 4 4
57085 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57086 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57087 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57088 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57089 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
57090 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
57091 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57092 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57093 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57094 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
57095 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57096 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
57097 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57098 +4 4 4 4 4 4
57099 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57100 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57101 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57102 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57103 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
57104 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57105 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57106 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57107 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57108 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57109 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57110 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57111 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57112 +4 4 4 4 4 4
57113 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57114 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57115 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57116 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57117 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57118 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57119 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57120 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57121 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57122 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57123 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57124 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57125 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57126 +4 4 4 4 4 4
57127 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57128 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57129 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57130 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57131 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57132 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57133 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57134 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57135 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57136 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57137 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57138 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57139 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57140 +4 4 4 4 4 4
57141 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57142 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57143 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57144 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57145 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57146 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57147 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57148 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57149 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57150 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57151 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57152 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57153 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57154 +4 4 4 4 4 4
57155 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57156 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57157 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57158 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57159 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57160 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57161 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57162 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57163 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57164 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57165 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57166 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57167 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57168 +4 4 4 4 4 4
57169 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57170 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57171 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57172 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57173 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57174 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57175 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57176 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57177 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57178 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57179 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57180 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57181 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57182 +4 4 4 4 4 4
57183 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57184 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57185 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57186 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57187 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57188 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57189 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57190 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57191 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57192 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57193 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57194 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57195 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57196 +4 4 4 4 4 4
57197 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57198 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57199 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57200 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57201 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57202 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57203 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57204 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57205 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57206 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57207 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57208 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57209 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57210 +4 4 4 4 4 4
57211 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57212 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57213 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57214 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57215 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57216 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57217 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57218 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57219 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57220 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57221 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57222 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57223 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57224 +4 4 4 4 4 4
57225 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57226 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
57227 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57228 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57229 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57230 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57231 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57232 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57233 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57234 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57235 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57236 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57237 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57238 +4 4 4 4 4 4
57239 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57240 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57241 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57242 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57243 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57244 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57245 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57246 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57247 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57248 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57249 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57250 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57251 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57252 +0 0 0 4 4 4
57253 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57254 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57255 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57256 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57257 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57258 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57259 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57260 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57261 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57262 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57263 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57264 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57265 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57266 +2 0 0 0 0 0
57267 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57268 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57269 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57270 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57271 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57272 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57273 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57274 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57275 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57276 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57277 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57278 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57279 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57280 +37 38 37 0 0 0
57281 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57282 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57283 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57284 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57285 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57286 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57287 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57288 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57289 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57290 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57291 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57292 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57293 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57294 +85 115 134 4 0 0
57295 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57296 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57297 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57298 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57299 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57300 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57301 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57302 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57303 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57304 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57305 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57306 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57307 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57308 +60 73 81 4 0 0
57309 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57310 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57311 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57312 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57313 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57314 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57315 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57316 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57317 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57318 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57319 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57320 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57321 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57322 +16 19 21 4 0 0
57323 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57324 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57325 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57326 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57327 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57328 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57329 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57330 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57331 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57332 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57333 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57334 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57335 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57336 +4 0 0 4 3 3
57337 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57338 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57339 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57340 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57341 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57342 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57343 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57344 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57345 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57346 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57347 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57348 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57349 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57350 +3 2 2 4 4 4
57351 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57352 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57353 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57354 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57355 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57356 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57357 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57358 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57359 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57360 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57361 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57362 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57363 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57364 +4 4 4 4 4 4
57365 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57366 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57367 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57368 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57369 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57370 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57371 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57372 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57373 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57374 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57375 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57376 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57377 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57378 +4 4 4 4 4 4
57379 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57380 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57381 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57382 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57383 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57384 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57385 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57386 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57387 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57388 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57389 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57390 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57391 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57392 +5 5 5 5 5 5
57393 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57394 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57395 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57396 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57397 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57398 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57399 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57400 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57401 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57402 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57403 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57404 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57405 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57406 +5 5 5 4 4 4
57407 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57408 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57409 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57410 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57411 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57412 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57413 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57414 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57415 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57416 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57417 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57418 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57419 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57420 +4 4 4 4 4 4
57421 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57422 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57423 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57424 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57425 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57426 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57427 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57428 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57429 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57430 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57431 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57432 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57433 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57434 +4 4 4 4 4 4
57435 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57436 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57437 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57438 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57439 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57440 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57441 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57442 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57443 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57444 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57445 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57446 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57447 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57448 +4 4 4 4 4 4
57449 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57450 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57451 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57452 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57453 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57454 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57455 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57456 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57457 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57458 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57459 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57460 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57461 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57462 +4 4 4 4 4 4
57463 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57464 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57465 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57466 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57467 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57468 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57469 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57470 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57471 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57472 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57473 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57474 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57475 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57476 +4 4 4 4 4 4
57477 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57478 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57479 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57480 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57481 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57482 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57483 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57484 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57485 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57486 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57487 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
57488 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57489 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57490 +4 4 4 4 4 4
57491 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57492 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57493 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57494 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57495 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57496 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57497 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57498 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57499 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57500 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57501 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
57502 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57503 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57504 +4 4 4 4 4 4
57505 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57506 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57507 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57508 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57509 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57510 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57511 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57512 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57513 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57514 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57515 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57516 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57517 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57518 +4 4 4 4 4 4
57519 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57520 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57521 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57522 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57523 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57524 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57525 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57526 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57527 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57528 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57529 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57530 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57531 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57532 +4 4 4 4 4 4
57533 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57534 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57535 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57536 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57537 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57538 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57539 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57540 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57541 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57542 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57543 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57544 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57545 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57546 +4 4 4 4 4 4
57547 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57548 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57549 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57550 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57551 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57552 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57553 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57554 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57555 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57556 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57557 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57558 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57559 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57560 +4 4 4 4 4 4
57561 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57562 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57563 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57564 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57565 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57566 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57567 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57568 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57569 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57570 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57571 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57572 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57573 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57574 +4 4 4 4 4 4
57575 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57576 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57577 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57578 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57579 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57580 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57581 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57582 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57583 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57584 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57585 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57586 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57587 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57588 +4 4 4 4 4 4
57589 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57590 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57591 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57592 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57593 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57594 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57595 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57596 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57597 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57598 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57599 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57600 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57601 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57602 +4 4 4 4 4 4
57603 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57604 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57605 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57606 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57607 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57608 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57609 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57610 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57611 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57612 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57613 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57614 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57615 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57616 +4 4 4 4 4 4
57617 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57618 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57619 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57620 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57621 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57622 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57623 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57624 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57625 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57626 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57627 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57628 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57629 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57630 +4 4 4 4 4 4
57631 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57632 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57633 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57634 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57635 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57636 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57637 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57638 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57639 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
57640 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57641 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57642 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57643 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57644 +4 4 4 4 4 4
57645 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57646 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57647 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57648 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57649 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57650 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57651 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57652 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57653 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57654 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57655 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57656 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57657 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57658 +4 4 4 4 4 4
57659 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57660 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57661 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57662 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57663 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57664 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57665 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57666 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57667 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57668 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57669 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57670 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57671 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57672 +4 4 4 4 4 4
57673 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57674 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57675 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57676 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57677 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57678 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57679 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57680 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57681 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57682 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57683 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57684 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57685 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57686 +4 4 4 4 4 4
57687 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57688 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57689 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57690 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57691 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57692 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57693 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57694 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57695 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57696 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57697 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57698 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57699 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57700 +4 4 4 4 4 4
57701 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57702 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57703 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57704 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57705 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57706 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57707 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57708 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57709 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
57710 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57711 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57712 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57713 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57714 +4 4 4 4 4 4
57715 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57716 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57717 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57718 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57719 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57720 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57721 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57722 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57723 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
57724 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57725 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57726 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57727 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57728 +4 4 4 4 4 4
57729 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
57730 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57731 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57732 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57733 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57734 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57735 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57736 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57737 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57738 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57739 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57740 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57741 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57742 +4 4 4 4 4 4
57743 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57744 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57745 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57746 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57747 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57748 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57749 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57750 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57751 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57752 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57753 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57754 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57755 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57756 +4 4 4 4 4 4
57757 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57758 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57759 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57760 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57761 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57762 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57763 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57764 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57765 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57766 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
57767 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57768 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57769 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57770 +4 4 4 4 4 4
57771 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57772 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57773 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57774 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57775 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57776 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57777 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57778 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57779 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57780 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57781 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57782 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57783 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57784 +4 4 4 4 4 4
57785 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57786 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57787 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57788 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57789 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57790 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57791 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57792 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57793 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57794 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57795 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57796 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57797 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57798 +4 4 4 4 4 4
57799 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57800 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57801 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57802 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57803 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57804 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57805 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57806 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57807 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57808 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57809 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57810 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57811 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57812 +4 4 4 4 4 4
57813 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57814 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57815 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57816 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57817 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57818 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57819 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57820 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57821 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57822 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
57823 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57824 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57825 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57826 +4 4 4 4 4 4
57827 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57828 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57829 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57830 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57831 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57832 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57833 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57834 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57835 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57836 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57837 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57838 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57839 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57840 +4 4 4 4 4 4
57841 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57842 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57843 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57844 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57845 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57846 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57847 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57848 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57849 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57850 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57851 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57852 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57853 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57854 +4 4 4 4 4 4
57855 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57856 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57857 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57858 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57859 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57860 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57861 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57862 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57863 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57864 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57865 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57866 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57867 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57868 +4 4 4 4 4 4
57869 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57870 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57871 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57872 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57873 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57874 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57875 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57876 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57877 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
57878 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57879 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57880 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57881 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57882 +4 4 4 4 4 4
57883 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57884 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57885 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57886 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57887 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57888 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57889 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57890 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57891 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
57892 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57893 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57894 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57896 +4 4 4 4 4 4
57897 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57898 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57899 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57900 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57901 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57902 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57903 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57904 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57905 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57907 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57908 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57909 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57910 +4 4 4 4 4 4
57911 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57912 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57913 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57914 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57915 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57916 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57917 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57918 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57919 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57921 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57924 +4 4 4 4 4 4
57925 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57926 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57927 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57928 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57929 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57930 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57931 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57932 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57933 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57935 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57938 +4 4 4 4 4 4
57939 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57940 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57941 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57942 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57943 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57944 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57945 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57946 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
57947 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57948 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57949 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57951 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57952 +4 4 4 4 4 4
57953 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57954 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
57955 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
57956 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
57957 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
57958 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
57959 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
57960 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
57961 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57962 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57963 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57964 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57966 +4 4 4 4 4 4
57967 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57968 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57969 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
57970 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57971 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
57972 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
57973 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
57974 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57975 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57976 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57977 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57978 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57979 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57980 +4 4 4 4 4 4
57981 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57982 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57983 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57984 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
57985 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
57986 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
57987 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
57988 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57989 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57990 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57991 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57993 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57994 +4 4 4 4 4 4
57995 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57996 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57997 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57998 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57999 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
58000 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
58001 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
58002 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58003 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58004 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58005 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58006 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58007 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58008 +4 4 4 4 4 4
58009 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58010 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58012 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58013 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58014 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
58015 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
58016 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58017 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58018 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58019 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58020 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58021 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58022 +4 4 4 4 4 4
58023 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58024 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58025 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58026 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58027 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58028 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58029 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
58030 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58031 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58032 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58033 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58034 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58035 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58036 +4 4 4 4 4 4
58037 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58038 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58039 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58040 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
58041 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
58042 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
58043 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
58044 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58045 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58046 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58047 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58048 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58049 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58050 +4 4 4 4 4 4
58051 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58052 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58053 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58054 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58055 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
58056 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58057 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58058 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58059 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58060 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58061 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58062 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58063 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58064 +4 4 4 4 4 4
58065 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58066 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58067 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58068 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58069 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
58070 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
58071 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58072 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58073 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58074 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58075 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58076 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58077 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58078 +4 4 4 4 4 4
58079 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58080 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58081 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58082 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58083 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58084 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58085 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58086 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58087 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58088 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58089 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58090 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58091 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58092 +4 4 4 4 4 4
58093 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58094 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58095 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58096 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58097 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
58098 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58099 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58100 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58101 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58102 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58103 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58104 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58105 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58106 +4 4 4 4 4 4
58107 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58108 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58109 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58110 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58111 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58112 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58113 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58114 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58115 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58116 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58117 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58118 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58119 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58120 +4 4 4 4 4 4
58121 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58122 index fef20db..d28b1ab 100644
58123 --- a/drivers/xen/xenfs/xenstored.c
58124 +++ b/drivers/xen/xenfs/xenstored.c
58125 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58126 static int xsd_kva_open(struct inode *inode, struct file *file)
58127 {
58128 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58129 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58130 + NULL);
58131 +#else
58132 xen_store_interface);
58133 +#endif
58134 +
58135 if (!file->private_data)
58136 return -ENOMEM;
58137 return 0;
58138 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58139 index eb14e05..5156de7 100644
58140 --- a/fs/9p/vfs_addr.c
58141 +++ b/fs/9p/vfs_addr.c
58142 @@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58143
58144 retval = v9fs_file_write_internal(inode,
58145 v9inode->writeback_fid,
58146 - (__force const char __user *)buffer,
58147 + (const char __force_user *)buffer,
58148 len, &offset, 0);
58149 if (retval > 0)
58150 retval = 0;
58151 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58152 index 296482f..183ddc3 100644
58153 --- a/fs/9p/vfs_inode.c
58154 +++ b/fs/9p/vfs_inode.c
58155 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58156 void
58157 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58158 {
58159 - char *s = nd_get_link(nd);
58160 + const char *s = nd_get_link(nd);
58161
58162 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58163 dentry, IS_ERR(s) ? "<error>" : s);
58164 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58165 index 370b24c..ff0be7b 100644
58166 --- a/fs/Kconfig.binfmt
58167 +++ b/fs/Kconfig.binfmt
58168 @@ -103,7 +103,7 @@ config HAVE_AOUT
58169
58170 config BINFMT_AOUT
58171 tristate "Kernel support for a.out and ECOFF binaries"
58172 - depends on HAVE_AOUT
58173 + depends on HAVE_AOUT && BROKEN
58174 ---help---
58175 A.out (Assembler.OUTput) is a set of formats for libraries and
58176 executables used in the earliest versions of UNIX. Linux used
58177 diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58178 index 2946712..f737435 100644
58179 --- a/fs/afs/inode.c
58180 +++ b/fs/afs/inode.c
58181 @@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58182 struct afs_vnode *vnode;
58183 struct super_block *sb;
58184 struct inode *inode;
58185 - static atomic_t afs_autocell_ino;
58186 + static atomic_unchecked_t afs_autocell_ino;
58187
58188 _enter("{%x:%u},%*.*s,",
58189 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58190 @@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58191 data.fid.unique = 0;
58192 data.fid.vnode = 0;
58193
58194 - inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58195 + inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58196 afs_iget5_autocell_test, afs_iget5_set,
58197 &data);
58198 if (!inode) {
58199 diff --git a/fs/aio.c b/fs/aio.c
58200 index 14b9315..365980f 100644
58201 --- a/fs/aio.c
58202 +++ b/fs/aio.c
58203 @@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58204 size += sizeof(struct io_event) * nr_events;
58205
58206 nr_pages = PFN_UP(size);
58207 - if (nr_pages < 0)
58208 + if (nr_pages <= 0)
58209 return -EINVAL;
58210
58211 file = aio_private_file(ctx, nr_pages);
58212 diff --git a/fs/attr.c b/fs/attr.c
58213 index 6530ced..4a827e2 100644
58214 --- a/fs/attr.c
58215 +++ b/fs/attr.c
58216 @@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58217 unsigned long limit;
58218
58219 limit = rlimit(RLIMIT_FSIZE);
58220 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58221 if (limit != RLIM_INFINITY && offset > limit)
58222 goto out_sig;
58223 if (offset > inode->i_sb->s_maxbytes)
58224 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58225 index 116fd38..c04182da 100644
58226 --- a/fs/autofs4/waitq.c
58227 +++ b/fs/autofs4/waitq.c
58228 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58229 {
58230 unsigned long sigpipe, flags;
58231 mm_segment_t fs;
58232 - const char *data = (const char *)addr;
58233 + const char __user *data = (const char __force_user *)addr;
58234 ssize_t wr = 0;
58235
58236 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58237 @@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58238 return 1;
58239 }
58240
58241 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58242 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58243 +#endif
58244 +
58245 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58246 enum autofs_notify notify)
58247 {
58248 @@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58249
58250 /* If this is a direct mount request create a dummy name */
58251 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58252 +#ifdef CONFIG_GRKERNSEC_HIDESYM
58253 + /* this name does get written to userland via autofs4_write() */
58254 + qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58255 +#else
58256 qstr.len = sprintf(name, "%p", dentry);
58257 +#endif
58258 else {
58259 qstr.len = autofs4_getpath(sbi, dentry, &name);
58260 if (!qstr.len) {
58261 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58262 index 2722387..56059b5 100644
58263 --- a/fs/befs/endian.h
58264 +++ b/fs/befs/endian.h
58265 @@ -11,7 +11,7 @@
58266
58267 #include <asm/byteorder.h>
58268
58269 -static inline u64
58270 +static inline u64 __intentional_overflow(-1)
58271 fs64_to_cpu(const struct super_block *sb, fs64 n)
58272 {
58273 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58274 @@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58275 return (__force fs64)cpu_to_be64(n);
58276 }
58277
58278 -static inline u32
58279 +static inline u32 __intentional_overflow(-1)
58280 fs32_to_cpu(const struct super_block *sb, fs32 n)
58281 {
58282 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58283 @@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58284 return (__force fs32)cpu_to_be32(n);
58285 }
58286
58287 -static inline u16
58288 +static inline u16 __intentional_overflow(-1)
58289 fs16_to_cpu(const struct super_block *sb, fs16 n)
58290 {
58291 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58292 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58293 index 929dec0..84bd914 100644
58294 --- a/fs/binfmt_aout.c
58295 +++ b/fs/binfmt_aout.c
58296 @@ -16,6 +16,7 @@
58297 #include <linux/string.h>
58298 #include <linux/fs.h>
58299 #include <linux/file.h>
58300 +#include <linux/security.h>
58301 #include <linux/stat.h>
58302 #include <linux/fcntl.h>
58303 #include <linux/ptrace.h>
58304 @@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58305 #endif
58306 # define START_STACK(u) ((void __user *)u.start_stack)
58307
58308 + memset(&dump, 0, sizeof(dump));
58309 +
58310 fs = get_fs();
58311 set_fs(KERNEL_DS);
58312 has_dumped = 1;
58313 @@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58314
58315 /* If the size of the dump file exceeds the rlimit, then see what would happen
58316 if we wrote the stack, but not the data area. */
58317 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58318 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58319 dump.u_dsize = 0;
58320
58321 /* Make sure we have enough room to write the stack and data areas. */
58322 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58323 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58324 dump.u_ssize = 0;
58325
58326 @@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58327 rlim = rlimit(RLIMIT_DATA);
58328 if (rlim >= RLIM_INFINITY)
58329 rlim = ~0;
58330 +
58331 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58332 if (ex.a_data + ex.a_bss > rlim)
58333 return -ENOMEM;
58334
58335 @@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58336
58337 install_exec_creds(bprm);
58338
58339 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58340 + current->mm->pax_flags = 0UL;
58341 +#endif
58342 +
58343 +#ifdef CONFIG_PAX_PAGEEXEC
58344 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58345 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58346 +
58347 +#ifdef CONFIG_PAX_EMUTRAMP
58348 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58349 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58350 +#endif
58351 +
58352 +#ifdef CONFIG_PAX_MPROTECT
58353 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58354 + current->mm->pax_flags |= MF_PAX_MPROTECT;
58355 +#endif
58356 +
58357 + }
58358 +#endif
58359 +
58360 if (N_MAGIC(ex) == OMAGIC) {
58361 unsigned long text_addr, map_size;
58362 loff_t pos;
58363 @@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58364 return error;
58365
58366 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58367 - PROT_READ | PROT_WRITE | PROT_EXEC,
58368 + PROT_READ | PROT_WRITE,
58369 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58370 fd_offset + ex.a_text);
58371 if (error != N_DATADDR(ex))
58372 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58373 index d8fc060..cbd44d5 100644
58374 --- a/fs/binfmt_elf.c
58375 +++ b/fs/binfmt_elf.c
58376 @@ -34,6 +34,7 @@
58377 #include <linux/utsname.h>
58378 #include <linux/coredump.h>
58379 #include <linux/sched.h>
58380 +#include <linux/xattr.h>
58381 #include <asm/uaccess.h>
58382 #include <asm/param.h>
58383 #include <asm/page.h>
58384 @@ -47,7 +48,7 @@
58385
58386 static int load_elf_binary(struct linux_binprm *bprm);
58387 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58388 - int, int, unsigned long);
58389 + int, int, unsigned long) __intentional_overflow(-1);
58390
58391 #ifdef CONFIG_USELIB
58392 static int load_elf_library(struct file *);
58393 @@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58394 #define elf_core_dump NULL
58395 #endif
58396
58397 +#ifdef CONFIG_PAX_MPROTECT
58398 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58399 +#endif
58400 +
58401 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58402 +static void elf_handle_mmap(struct file *file);
58403 +#endif
58404 +
58405 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58406 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58407 #else
58408 @@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58409 .load_binary = load_elf_binary,
58410 .load_shlib = load_elf_library,
58411 .core_dump = elf_core_dump,
58412 +
58413 +#ifdef CONFIG_PAX_MPROTECT
58414 + .handle_mprotect= elf_handle_mprotect,
58415 +#endif
58416 +
58417 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58418 + .handle_mmap = elf_handle_mmap,
58419 +#endif
58420 +
58421 .min_coredump = ELF_EXEC_PAGESIZE,
58422 };
58423
58424 @@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58425
58426 static int set_brk(unsigned long start, unsigned long end)
58427 {
58428 + unsigned long e = end;
58429 +
58430 start = ELF_PAGEALIGN(start);
58431 end = ELF_PAGEALIGN(end);
58432 if (end > start) {
58433 @@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58434 if (BAD_ADDR(addr))
58435 return addr;
58436 }
58437 - current->mm->start_brk = current->mm->brk = end;
58438 + current->mm->start_brk = current->mm->brk = e;
58439 return 0;
58440 }
58441
58442 @@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58443 elf_addr_t __user *u_rand_bytes;
58444 const char *k_platform = ELF_PLATFORM;
58445 const char *k_base_platform = ELF_BASE_PLATFORM;
58446 - unsigned char k_rand_bytes[16];
58447 + u32 k_rand_bytes[4];
58448 int items;
58449 elf_addr_t *elf_info;
58450 int ei_index = 0;
58451 const struct cred *cred = current_cred();
58452 struct vm_area_struct *vma;
58453 + unsigned long saved_auxv[AT_VECTOR_SIZE];
58454
58455 /*
58456 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58457 @@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58458 * Generate 16 random bytes for userspace PRNG seeding.
58459 */
58460 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58461 - u_rand_bytes = (elf_addr_t __user *)
58462 - STACK_ALLOC(p, sizeof(k_rand_bytes));
58463 + prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58464 + prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58465 + prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58466 + prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58467 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
58468 + u_rand_bytes = (elf_addr_t __user *) p;
58469 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58470 return -EFAULT;
58471
58472 @@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58473 return -EFAULT;
58474 current->mm->env_end = p;
58475
58476 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58477 +
58478 /* Put the elf_info on the stack in the right place. */
58479 sp = (elf_addr_t __user *)envp + 1;
58480 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58481 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58482 return -EFAULT;
58483 return 0;
58484 }
58485 @@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58486 an ELF header */
58487
58488 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58489 - struct file *interpreter, unsigned long *interp_map_addr,
58490 - unsigned long no_base)
58491 + struct file *interpreter, unsigned long no_base)
58492 {
58493 struct elf_phdr *elf_phdata;
58494 struct elf_phdr *eppnt;
58495 - unsigned long load_addr = 0;
58496 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58497 int load_addr_set = 0;
58498 unsigned long last_bss = 0, elf_bss = 0;
58499 - unsigned long error = ~0UL;
58500 + unsigned long error = -EINVAL;
58501 unsigned long total_size;
58502 int retval, i, size;
58503
58504 @@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58505 goto out_close;
58506 }
58507
58508 +#ifdef CONFIG_PAX_SEGMEXEC
58509 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58510 + pax_task_size = SEGMEXEC_TASK_SIZE;
58511 +#endif
58512 +
58513 eppnt = elf_phdata;
58514 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58515 if (eppnt->p_type == PT_LOAD) {
58516 @@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58517 map_addr = elf_map(interpreter, load_addr + vaddr,
58518 eppnt, elf_prot, elf_type, total_size);
58519 total_size = 0;
58520 - if (!*interp_map_addr)
58521 - *interp_map_addr = map_addr;
58522 error = map_addr;
58523 if (BAD_ADDR(map_addr))
58524 goto out_close;
58525 @@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58526 k = load_addr + eppnt->p_vaddr;
58527 if (BAD_ADDR(k) ||
58528 eppnt->p_filesz > eppnt->p_memsz ||
58529 - eppnt->p_memsz > TASK_SIZE ||
58530 - TASK_SIZE - eppnt->p_memsz < k) {
58531 + eppnt->p_memsz > pax_task_size ||
58532 + pax_task_size - eppnt->p_memsz < k) {
58533 error = -ENOMEM;
58534 goto out_close;
58535 }
58536 @@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58537 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58538
58539 /* Map the last of the bss segment */
58540 - error = vm_brk(elf_bss, last_bss - elf_bss);
58541 - if (BAD_ADDR(error))
58542 - goto out_close;
58543 + if (last_bss > elf_bss) {
58544 + error = vm_brk(elf_bss, last_bss - elf_bss);
58545 + if (BAD_ADDR(error))
58546 + goto out_close;
58547 + }
58548 }
58549
58550 error = load_addr;
58551 @@ -543,6 +574,336 @@ out:
58552 return error;
58553 }
58554
58555 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58556 +#ifdef CONFIG_PAX_SOFTMODE
58557 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58558 +{
58559 + unsigned long pax_flags = 0UL;
58560 +
58561 +#ifdef CONFIG_PAX_PAGEEXEC
58562 + if (elf_phdata->p_flags & PF_PAGEEXEC)
58563 + pax_flags |= MF_PAX_PAGEEXEC;
58564 +#endif
58565 +
58566 +#ifdef CONFIG_PAX_SEGMEXEC
58567 + if (elf_phdata->p_flags & PF_SEGMEXEC)
58568 + pax_flags |= MF_PAX_SEGMEXEC;
58569 +#endif
58570 +
58571 +#ifdef CONFIG_PAX_EMUTRAMP
58572 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58573 + pax_flags |= MF_PAX_EMUTRAMP;
58574 +#endif
58575 +
58576 +#ifdef CONFIG_PAX_MPROTECT
58577 + if (elf_phdata->p_flags & PF_MPROTECT)
58578 + pax_flags |= MF_PAX_MPROTECT;
58579 +#endif
58580 +
58581 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58582 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58583 + pax_flags |= MF_PAX_RANDMMAP;
58584 +#endif
58585 +
58586 + return pax_flags;
58587 +}
58588 +#endif
58589 +
58590 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58591 +{
58592 + unsigned long pax_flags = 0UL;
58593 +
58594 +#ifdef CONFIG_PAX_PAGEEXEC
58595 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58596 + pax_flags |= MF_PAX_PAGEEXEC;
58597 +#endif
58598 +
58599 +#ifdef CONFIG_PAX_SEGMEXEC
58600 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58601 + pax_flags |= MF_PAX_SEGMEXEC;
58602 +#endif
58603 +
58604 +#ifdef CONFIG_PAX_EMUTRAMP
58605 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58606 + pax_flags |= MF_PAX_EMUTRAMP;
58607 +#endif
58608 +
58609 +#ifdef CONFIG_PAX_MPROTECT
58610 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58611 + pax_flags |= MF_PAX_MPROTECT;
58612 +#endif
58613 +
58614 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58615 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58616 + pax_flags |= MF_PAX_RANDMMAP;
58617 +#endif
58618 +
58619 + return pax_flags;
58620 +}
58621 +#endif
58622 +
58623 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58624 +#ifdef CONFIG_PAX_SOFTMODE
58625 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58626 +{
58627 + unsigned long pax_flags = 0UL;
58628 +
58629 +#ifdef CONFIG_PAX_PAGEEXEC
58630 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58631 + pax_flags |= MF_PAX_PAGEEXEC;
58632 +#endif
58633 +
58634 +#ifdef CONFIG_PAX_SEGMEXEC
58635 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58636 + pax_flags |= MF_PAX_SEGMEXEC;
58637 +#endif
58638 +
58639 +#ifdef CONFIG_PAX_EMUTRAMP
58640 + if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58641 + pax_flags |= MF_PAX_EMUTRAMP;
58642 +#endif
58643 +
58644 +#ifdef CONFIG_PAX_MPROTECT
58645 + if (pax_flags_softmode & MF_PAX_MPROTECT)
58646 + pax_flags |= MF_PAX_MPROTECT;
58647 +#endif
58648 +
58649 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58650 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58651 + pax_flags |= MF_PAX_RANDMMAP;
58652 +#endif
58653 +
58654 + return pax_flags;
58655 +}
58656 +#endif
58657 +
58658 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58659 +{
58660 + unsigned long pax_flags = 0UL;
58661 +
58662 +#ifdef CONFIG_PAX_PAGEEXEC
58663 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58664 + pax_flags |= MF_PAX_PAGEEXEC;
58665 +#endif
58666 +
58667 +#ifdef CONFIG_PAX_SEGMEXEC
58668 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58669 + pax_flags |= MF_PAX_SEGMEXEC;
58670 +#endif
58671 +
58672 +#ifdef CONFIG_PAX_EMUTRAMP
58673 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58674 + pax_flags |= MF_PAX_EMUTRAMP;
58675 +#endif
58676 +
58677 +#ifdef CONFIG_PAX_MPROTECT
58678 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58679 + pax_flags |= MF_PAX_MPROTECT;
58680 +#endif
58681 +
58682 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58683 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58684 + pax_flags |= MF_PAX_RANDMMAP;
58685 +#endif
58686 +
58687 + return pax_flags;
58688 +}
58689 +#endif
58690 +
58691 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58692 +static unsigned long pax_parse_defaults(void)
58693 +{
58694 + unsigned long pax_flags = 0UL;
58695 +
58696 +#ifdef CONFIG_PAX_SOFTMODE
58697 + if (pax_softmode)
58698 + return pax_flags;
58699 +#endif
58700 +
58701 +#ifdef CONFIG_PAX_PAGEEXEC
58702 + pax_flags |= MF_PAX_PAGEEXEC;
58703 +#endif
58704 +
58705 +#ifdef CONFIG_PAX_SEGMEXEC
58706 + pax_flags |= MF_PAX_SEGMEXEC;
58707 +#endif
58708 +
58709 +#ifdef CONFIG_PAX_MPROTECT
58710 + pax_flags |= MF_PAX_MPROTECT;
58711 +#endif
58712 +
58713 +#ifdef CONFIG_PAX_RANDMMAP
58714 + if (randomize_va_space)
58715 + pax_flags |= MF_PAX_RANDMMAP;
58716 +#endif
58717 +
58718 + return pax_flags;
58719 +}
58720 +
58721 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58722 +{
58723 + unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58724 +
58725 +#ifdef CONFIG_PAX_EI_PAX
58726 +
58727 +#ifdef CONFIG_PAX_SOFTMODE
58728 + if (pax_softmode)
58729 + return pax_flags;
58730 +#endif
58731 +
58732 + pax_flags = 0UL;
58733 +
58734 +#ifdef CONFIG_PAX_PAGEEXEC
58735 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58736 + pax_flags |= MF_PAX_PAGEEXEC;
58737 +#endif
58738 +
58739 +#ifdef CONFIG_PAX_SEGMEXEC
58740 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58741 + pax_flags |= MF_PAX_SEGMEXEC;
58742 +#endif
58743 +
58744 +#ifdef CONFIG_PAX_EMUTRAMP
58745 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58746 + pax_flags |= MF_PAX_EMUTRAMP;
58747 +#endif
58748 +
58749 +#ifdef CONFIG_PAX_MPROTECT
58750 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58751 + pax_flags |= MF_PAX_MPROTECT;
58752 +#endif
58753 +
58754 +#ifdef CONFIG_PAX_ASLR
58755 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58756 + pax_flags |= MF_PAX_RANDMMAP;
58757 +#endif
58758 +
58759 +#endif
58760 +
58761 + return pax_flags;
58762 +
58763 +}
58764 +
58765 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58766 +{
58767 +
58768 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
58769 + unsigned long i;
58770 +
58771 + for (i = 0UL; i < elf_ex->e_phnum; i++)
58772 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58773 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58774 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58775 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58776 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58777 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58778 + return PAX_PARSE_FLAGS_FALLBACK;
58779 +
58780 +#ifdef CONFIG_PAX_SOFTMODE
58781 + if (pax_softmode)
58782 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58783 + else
58784 +#endif
58785 +
58786 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58787 + break;
58788 + }
58789 +#endif
58790 +
58791 + return PAX_PARSE_FLAGS_FALLBACK;
58792 +}
58793 +
58794 +static unsigned long pax_parse_xattr_pax(struct file * const file)
58795 +{
58796 +
58797 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58798 + ssize_t xattr_size, i;
58799 + unsigned char xattr_value[sizeof("pemrs") - 1];
58800 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58801 +
58802 + xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58803 + if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58804 + return PAX_PARSE_FLAGS_FALLBACK;
58805 +
58806 + for (i = 0; i < xattr_size; i++)
58807 + switch (xattr_value[i]) {
58808 + default:
58809 + return PAX_PARSE_FLAGS_FALLBACK;
58810 +
58811 +#define parse_flag(option1, option2, flag) \
58812 + case option1: \
58813 + if (pax_flags_hardmode & MF_PAX_##flag) \
58814 + return PAX_PARSE_FLAGS_FALLBACK;\
58815 + pax_flags_hardmode |= MF_PAX_##flag; \
58816 + break; \
58817 + case option2: \
58818 + if (pax_flags_softmode & MF_PAX_##flag) \
58819 + return PAX_PARSE_FLAGS_FALLBACK;\
58820 + pax_flags_softmode |= MF_PAX_##flag; \
58821 + break;
58822 +
58823 + parse_flag('p', 'P', PAGEEXEC);
58824 + parse_flag('e', 'E', EMUTRAMP);
58825 + parse_flag('m', 'M', MPROTECT);
58826 + parse_flag('r', 'R', RANDMMAP);
58827 + parse_flag('s', 'S', SEGMEXEC);
58828 +
58829 +#undef parse_flag
58830 + }
58831 +
58832 + if (pax_flags_hardmode & pax_flags_softmode)
58833 + return PAX_PARSE_FLAGS_FALLBACK;
58834 +
58835 +#ifdef CONFIG_PAX_SOFTMODE
58836 + if (pax_softmode)
58837 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58838 + else
58839 +#endif
58840 +
58841 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58842 +#else
58843 + return PAX_PARSE_FLAGS_FALLBACK;
58844 +#endif
58845 +
58846 +}
58847 +
58848 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58849 +{
58850 + unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58851 +
58852 + pax_flags = pax_parse_defaults();
58853 + ei_pax_flags = pax_parse_ei_pax(elf_ex);
58854 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58855 + xattr_pax_flags = pax_parse_xattr_pax(file);
58856 +
58857 + if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58858 + xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58859 + pt_pax_flags != xattr_pax_flags)
58860 + return -EINVAL;
58861 + if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58862 + pax_flags = xattr_pax_flags;
58863 + else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58864 + pax_flags = pt_pax_flags;
58865 + else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58866 + pax_flags = ei_pax_flags;
58867 +
58868 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58869 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58870 + if ((__supported_pte_mask & _PAGE_NX))
58871 + pax_flags &= ~MF_PAX_SEGMEXEC;
58872 + else
58873 + pax_flags &= ~MF_PAX_PAGEEXEC;
58874 + }
58875 +#endif
58876 +
58877 + if (0 > pax_check_flags(&pax_flags))
58878 + return -EINVAL;
58879 +
58880 + current->mm->pax_flags = pax_flags;
58881 + return 0;
58882 +}
58883 +#endif
58884 +
58885 /*
58886 * These are the functions used to load ELF style executables and shared
58887 * libraries. There is no binary dependent code anywhere else.
58888 @@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58889 {
58890 unsigned int random_variable = 0;
58891
58892 +#ifdef CONFIG_PAX_RANDUSTACK
58893 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58894 + return stack_top - current->mm->delta_stack;
58895 +#endif
58896 +
58897 if ((current->flags & PF_RANDOMIZE) &&
58898 !(current->personality & ADDR_NO_RANDOMIZE)) {
58899 random_variable = get_random_int() & STACK_RND_MASK;
58900 @@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58901 unsigned long load_addr = 0, load_bias = 0;
58902 int load_addr_set = 0;
58903 char * elf_interpreter = NULL;
58904 - unsigned long error;
58905 + unsigned long error = 0;
58906 struct elf_phdr *elf_ppnt, *elf_phdata;
58907 unsigned long elf_bss, elf_brk;
58908 int retval, i;
58909 @@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58910 struct elfhdr elf_ex;
58911 struct elfhdr interp_elf_ex;
58912 } *loc;
58913 + unsigned long pax_task_size;
58914
58915 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58916 if (!loc) {
58917 @@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58918 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58919 may depend on the personality. */
58920 SET_PERSONALITY(loc->elf_ex);
58921 +
58922 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58923 + current->mm->pax_flags = 0UL;
58924 +#endif
58925 +
58926 +#ifdef CONFIG_PAX_DLRESOLVE
58927 + current->mm->call_dl_resolve = 0UL;
58928 +#endif
58929 +
58930 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58931 + current->mm->call_syscall = 0UL;
58932 +#endif
58933 +
58934 +#ifdef CONFIG_PAX_ASLR
58935 + current->mm->delta_mmap = 0UL;
58936 + current->mm->delta_stack = 0UL;
58937 +#endif
58938 +
58939 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58940 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58941 + send_sig(SIGKILL, current, 0);
58942 + goto out_free_dentry;
58943 + }
58944 +#endif
58945 +
58946 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58947 + pax_set_initial_flags(bprm);
58948 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
58949 + if (pax_set_initial_flags_func)
58950 + (pax_set_initial_flags_func)(bprm);
58951 +#endif
58952 +
58953 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58954 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
58955 + current->mm->context.user_cs_limit = PAGE_SIZE;
58956 + current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
58957 + }
58958 +#endif
58959 +
58960 +#ifdef CONFIG_PAX_SEGMEXEC
58961 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
58962 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
58963 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
58964 + pax_task_size = SEGMEXEC_TASK_SIZE;
58965 + current->mm->def_flags |= VM_NOHUGEPAGE;
58966 + } else
58967 +#endif
58968 +
58969 + pax_task_size = TASK_SIZE;
58970 +
58971 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
58972 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58973 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
58974 + put_cpu();
58975 + }
58976 +#endif
58977 +
58978 +#ifdef CONFIG_PAX_ASLR
58979 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58980 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
58981 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
58982 + }
58983 +#endif
58984 +
58985 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58986 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58987 + executable_stack = EXSTACK_DISABLE_X;
58988 + current->personality &= ~READ_IMPLIES_EXEC;
58989 + } else
58990 +#endif
58991 +
58992 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
58993 current->personality |= READ_IMPLIES_EXEC;
58994
58995 @@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
58996 #else
58997 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
58998 #endif
58999 +
59000 +#ifdef CONFIG_PAX_RANDMMAP
59001 + /* PaX: randomize base address at the default exe base if requested */
59002 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
59003 +#ifdef CONFIG_SPARC64
59004 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
59005 +#else
59006 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
59007 +#endif
59008 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
59009 + elf_flags |= MAP_FIXED;
59010 + }
59011 +#endif
59012 +
59013 }
59014
59015 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
59016 @@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
59017 * allowed task size. Note that p_filesz must always be
59018 * <= p_memsz so it is only necessary to check p_memsz.
59019 */
59020 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59021 - elf_ppnt->p_memsz > TASK_SIZE ||
59022 - TASK_SIZE - elf_ppnt->p_memsz < k) {
59023 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59024 + elf_ppnt->p_memsz > pax_task_size ||
59025 + pax_task_size - elf_ppnt->p_memsz < k) {
59026 /* set_brk can never work. Avoid overflows. */
59027 retval = -EINVAL;
59028 goto out_free_dentry;
59029 @@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
59030 if (retval)
59031 goto out_free_dentry;
59032 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
59033 - retval = -EFAULT; /* Nobody gets to see this, but.. */
59034 - goto out_free_dentry;
59035 + /*
59036 + * This bss-zeroing can fail if the ELF
59037 + * file specifies odd protections. So
59038 + * we don't check the return value
59039 + */
59040 }
59041
59042 +#ifdef CONFIG_PAX_RANDMMAP
59043 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59044 + unsigned long start, size, flags;
59045 + vm_flags_t vm_flags;
59046 +
59047 + start = ELF_PAGEALIGN(elf_brk);
59048 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
59049 + flags = MAP_FIXED | MAP_PRIVATE;
59050 + vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
59051 +
59052 + down_write(&current->mm->mmap_sem);
59053 + start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
59054 + retval = -ENOMEM;
59055 + if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
59056 +// if (current->personality & ADDR_NO_RANDOMIZE)
59057 +// vm_flags |= VM_READ | VM_MAYREAD;
59058 + start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
59059 + retval = IS_ERR_VALUE(start) ? start : 0;
59060 + }
59061 + up_write(&current->mm->mmap_sem);
59062 + if (retval == 0)
59063 + retval = set_brk(start + size, start + size + PAGE_SIZE);
59064 + if (retval < 0)
59065 + goto out_free_dentry;
59066 + }
59067 +#endif
59068 +
59069 if (elf_interpreter) {
59070 - unsigned long interp_map_addr = 0;
59071 -
59072 elf_entry = load_elf_interp(&loc->interp_elf_ex,
59073 interpreter,
59074 - &interp_map_addr,
59075 load_bias);
59076 if (!IS_ERR((void *)elf_entry)) {
59077 /*
59078 @@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59079 * Decide what to dump of a segment, part, all or none.
59080 */
59081 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59082 - unsigned long mm_flags)
59083 + unsigned long mm_flags, long signr)
59084 {
59085 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59086
59087 @@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59088 if (vma->vm_file == NULL)
59089 return 0;
59090
59091 - if (FILTER(MAPPED_PRIVATE))
59092 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59093 goto whole;
59094
59095 /*
59096 @@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59097 {
59098 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59099 int i = 0;
59100 - do
59101 + do {
59102 i += 2;
59103 - while (auxv[i - 2] != AT_NULL);
59104 + } while (auxv[i - 2] != AT_NULL);
59105 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59106 }
59107
59108 @@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59109 {
59110 mm_segment_t old_fs = get_fs();
59111 set_fs(KERNEL_DS);
59112 - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59113 + copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59114 set_fs(old_fs);
59115 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59116 }
59117 @@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
59118 }
59119
59120 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
59121 - unsigned long mm_flags)
59122 + struct coredump_params *cprm)
59123 {
59124 struct vm_area_struct *vma;
59125 size_t size = 0;
59126
59127 for (vma = first_vma(current, gate_vma); vma != NULL;
59128 vma = next_vma(vma, gate_vma))
59129 - size += vma_dump_size(vma, mm_flags);
59130 + size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59131 return size;
59132 }
59133
59134 @@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59135
59136 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
59137
59138 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
59139 + offset += elf_core_vma_data_size(gate_vma, cprm);
59140 offset += elf_core_extra_data_size();
59141 e_shoff = offset;
59142
59143 @@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59144 phdr.p_offset = offset;
59145 phdr.p_vaddr = vma->vm_start;
59146 phdr.p_paddr = 0;
59147 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
59148 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59149 phdr.p_memsz = vma->vm_end - vma->vm_start;
59150 offset += phdr.p_filesz;
59151 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
59152 @@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59153 unsigned long addr;
59154 unsigned long end;
59155
59156 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
59157 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59158
59159 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
59160 struct page *page;
59161 @@ -2195,6 +2674,167 @@ out:
59162
59163 #endif /* CONFIG_ELF_CORE */
59164
59165 +#ifdef CONFIG_PAX_MPROTECT
59166 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
59167 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59168 + * we'll remove VM_MAYWRITE for good on RELRO segments.
59169 + *
59170 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59171 + * basis because we want to allow the common case and not the special ones.
59172 + */
59173 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59174 +{
59175 + struct elfhdr elf_h;
59176 + struct elf_phdr elf_p;
59177 + unsigned long i;
59178 + unsigned long oldflags;
59179 + bool is_textrel_rw, is_textrel_rx, is_relro;
59180 +
59181 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59182 + return;
59183 +
59184 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59185 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59186 +
59187 +#ifdef CONFIG_PAX_ELFRELOCS
59188 + /* possible TEXTREL */
59189 + is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59190 + is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59191 +#else
59192 + is_textrel_rw = false;
59193 + is_textrel_rx = false;
59194 +#endif
59195 +
59196 + /* possible RELRO */
59197 + is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59198 +
59199 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59200 + return;
59201 +
59202 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59203 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59204 +
59205 +#ifdef CONFIG_PAX_ETEXECRELOCS
59206 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59207 +#else
59208 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59209 +#endif
59210 +
59211 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59212 + !elf_check_arch(&elf_h) ||
59213 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59214 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59215 + return;
59216 +
59217 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59218 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59219 + return;
59220 + switch (elf_p.p_type) {
59221 + case PT_DYNAMIC:
59222 + if (!is_textrel_rw && !is_textrel_rx)
59223 + continue;
59224 + i = 0UL;
59225 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59226 + elf_dyn dyn;
59227 +
59228 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59229 + break;
59230 + if (dyn.d_tag == DT_NULL)
59231 + break;
59232 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59233 + gr_log_textrel(vma);
59234 + if (is_textrel_rw)
59235 + vma->vm_flags |= VM_MAYWRITE;
59236 + else
59237 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59238 + vma->vm_flags &= ~VM_MAYWRITE;
59239 + break;
59240 + }
59241 + i++;
59242 + }
59243 + is_textrel_rw = false;
59244 + is_textrel_rx = false;
59245 + continue;
59246 +
59247 + case PT_GNU_RELRO:
59248 + if (!is_relro)
59249 + continue;
59250 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59251 + vma->vm_flags &= ~VM_MAYWRITE;
59252 + is_relro = false;
59253 + continue;
59254 +
59255 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
59256 + case PT_PAX_FLAGS: {
59257 + const char *msg_mprotect = "", *msg_emutramp = "";
59258 + char *buffer_lib, *buffer_exe;
59259 +
59260 + if (elf_p.p_flags & PF_NOMPROTECT)
59261 + msg_mprotect = "MPROTECT disabled";
59262 +
59263 +#ifdef CONFIG_PAX_EMUTRAMP
59264 + if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59265 + msg_emutramp = "EMUTRAMP enabled";
59266 +#endif
59267 +
59268 + if (!msg_mprotect[0] && !msg_emutramp[0])
59269 + continue;
59270 +
59271 + if (!printk_ratelimit())
59272 + continue;
59273 +
59274 + buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59275 + buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59276 + if (buffer_lib && buffer_exe) {
59277 + char *path_lib, *path_exe;
59278 +
59279 + path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59280 + path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59281 +
59282 + pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59283 + (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59284 +
59285 + }
59286 + free_page((unsigned long)buffer_exe);
59287 + free_page((unsigned long)buffer_lib);
59288 + continue;
59289 + }
59290 +#endif
59291 +
59292 + }
59293 + }
59294 +}
59295 +#endif
59296 +
59297 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59298 +
59299 +extern int grsec_enable_log_rwxmaps;
59300 +
59301 +static void elf_handle_mmap(struct file *file)
59302 +{
59303 + struct elfhdr elf_h;
59304 + struct elf_phdr elf_p;
59305 + unsigned long i;
59306 +
59307 + if (!grsec_enable_log_rwxmaps)
59308 + return;
59309 +
59310 + if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59311 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59312 + (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59313 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59314 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59315 + return;
59316 +
59317 + for (i = 0UL; i < elf_h.e_phnum; i++) {
59318 + if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59319 + return;
59320 + if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59321 + gr_log_ptgnustack(file);
59322 + }
59323 +}
59324 +#endif
59325 +
59326 static int __init init_elf_binfmt(void)
59327 {
59328 register_binfmt(&elf_format);
59329 diff --git a/fs/block_dev.c b/fs/block_dev.c
59330 index 1d9c9f3..2905786 100644
59331 --- a/fs/block_dev.c
59332 +++ b/fs/block_dev.c
59333 @@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59334 else if (bdev->bd_contains == bdev)
59335 return true; /* is a whole device which isn't held */
59336
59337 - else if (whole->bd_holder == bd_may_claim)
59338 + else if (whole->bd_holder == (void *)bd_may_claim)
59339 return true; /* is a partition of a device that is being partitioned */
59340 else if (whole->bd_holder != NULL)
59341 return false; /* is a partition of a held device */
59342 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59343 index 150822e..75bb326 100644
59344 --- a/fs/btrfs/ctree.c
59345 +++ b/fs/btrfs/ctree.c
59346 @@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59347 free_extent_buffer(buf);
59348 add_root_to_dirty_list(root);
59349 } else {
59350 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59351 - parent_start = parent->start;
59352 - else
59353 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59354 + if (parent)
59355 + parent_start = parent->start;
59356 + else
59357 + parent_start = 0;
59358 + } else
59359 parent_start = 0;
59360
59361 WARN_ON(trans->transid != btrfs_header_generation(parent));
59362 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59363 index de4e70f..b41dc45 100644
59364 --- a/fs/btrfs/delayed-inode.c
59365 +++ b/fs/btrfs/delayed-inode.c
59366 @@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59367
59368 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59369 {
59370 - int seq = atomic_inc_return(&delayed_root->items_seq);
59371 + int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59372 if ((atomic_dec_return(&delayed_root->items) <
59373 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59374 waitqueue_active(&delayed_root->wait))
59375 @@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59376
59377 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59378 {
59379 - int val = atomic_read(&delayed_root->items_seq);
59380 + int val = atomic_read_unchecked(&delayed_root->items_seq);
59381
59382 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59383 return 1;
59384 @@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59385 int seq;
59386 int ret;
59387
59388 - seq = atomic_read(&delayed_root->items_seq);
59389 + seq = atomic_read_unchecked(&delayed_root->items_seq);
59390
59391 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59392 if (ret)
59393 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59394 index f70119f..ab5894d 100644
59395 --- a/fs/btrfs/delayed-inode.h
59396 +++ b/fs/btrfs/delayed-inode.h
59397 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59398 */
59399 struct list_head prepare_list;
59400 atomic_t items; /* for delayed items */
59401 - atomic_t items_seq; /* for delayed items */
59402 + atomic_unchecked_t items_seq; /* for delayed items */
59403 int nodes; /* for delayed nodes */
59404 wait_queue_head_t wait;
59405 };
59406 @@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59407 struct btrfs_delayed_root *delayed_root)
59408 {
59409 atomic_set(&delayed_root->items, 0);
59410 - atomic_set(&delayed_root->items_seq, 0);
59411 + atomic_set_unchecked(&delayed_root->items_seq, 0);
59412 delayed_root->nodes = 0;
59413 spin_lock_init(&delayed_root->lock);
59414 init_waitqueue_head(&delayed_root->wait);
59415 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59416 index 4399f0c..a34d8b4 100644
59417 --- a/fs/btrfs/ioctl.c
59418 +++ b/fs/btrfs/ioctl.c
59419 @@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59420 for (i = 0; i < num_types; i++) {
59421 struct btrfs_space_info *tmp;
59422
59423 + /* Don't copy in more than we allocated */
59424 if (!slot_count)
59425 break;
59426
59427 + slot_count--;
59428 +
59429 info = NULL;
59430 rcu_read_lock();
59431 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59432 @@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59433 memcpy(dest, &space, sizeof(space));
59434 dest++;
59435 space_args.total_spaces++;
59436 - slot_count--;
59437 }
59438 - if (!slot_count)
59439 - break;
59440 }
59441 up_read(&info->groups_sem);
59442 }
59443 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59444 index cde9c03..ad4d4db 100644
59445 --- a/fs/btrfs/super.c
59446 +++ b/fs/btrfs/super.c
59447 @@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59448 function, line, errstr);
59449 return;
59450 }
59451 - ACCESS_ONCE(trans->transaction->aborted) = errno;
59452 + ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59453 /* Wake up anybody who may be waiting on this transaction */
59454 wake_up(&root->fs_info->transaction_wait);
59455 wake_up(&root->fs_info->transaction_blocked_wait);
59456 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59457 index b2e7bb4..3719201 100644
59458 --- a/fs/btrfs/sysfs.c
59459 +++ b/fs/btrfs/sysfs.c
59460 @@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59461 for (set = 0; set < FEAT_MAX; set++) {
59462 int i;
59463 struct attribute *attrs[2];
59464 - struct attribute_group agroup = {
59465 + attribute_group_no_const agroup = {
59466 .name = "features",
59467 .attrs = attrs,
59468 };
59469 diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59470 index 2299bfd..4098e72 100644
59471 --- a/fs/btrfs/tests/free-space-tests.c
59472 +++ b/fs/btrfs/tests/free-space-tests.c
59473 @@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59474 * extent entry.
59475 */
59476 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59477 - cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59478 + pax_open_kernel();
59479 + *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59480 + pax_close_kernel();
59481
59482 /*
59483 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59484 @@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59485 if (ret)
59486 return ret;
59487
59488 - cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59489 + pax_open_kernel();
59490 + *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59491 + pax_close_kernel();
59492 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59493
59494 return 0;
59495 diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59496 index 154990c..d0cf699 100644
59497 --- a/fs/btrfs/tree-log.h
59498 +++ b/fs/btrfs/tree-log.h
59499 @@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59500 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59501 struct btrfs_trans_handle *trans)
59502 {
59503 - ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59504 + ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59505 }
59506
59507 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59508 diff --git a/fs/buffer.c b/fs/buffer.c
59509 index 20805db..2e8fc69 100644
59510 --- a/fs/buffer.c
59511 +++ b/fs/buffer.c
59512 @@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59513 bh_cachep = kmem_cache_create("buffer_head",
59514 sizeof(struct buffer_head), 0,
59515 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59516 - SLAB_MEM_SPREAD),
59517 + SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59518 NULL);
59519
59520 /*
59521 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59522 index fbb08e9..0fda764 100644
59523 --- a/fs/cachefiles/bind.c
59524 +++ b/fs/cachefiles/bind.c
59525 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59526 args);
59527
59528 /* start by checking things over */
59529 - ASSERT(cache->fstop_percent >= 0 &&
59530 - cache->fstop_percent < cache->fcull_percent &&
59531 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
59532 cache->fcull_percent < cache->frun_percent &&
59533 cache->frun_percent < 100);
59534
59535 - ASSERT(cache->bstop_percent >= 0 &&
59536 - cache->bstop_percent < cache->bcull_percent &&
59537 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
59538 cache->bcull_percent < cache->brun_percent &&
59539 cache->brun_percent < 100);
59540
59541 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59542 index ce1b115..4a6852c 100644
59543 --- a/fs/cachefiles/daemon.c
59544 +++ b/fs/cachefiles/daemon.c
59545 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59546 if (n > buflen)
59547 return -EMSGSIZE;
59548
59549 - if (copy_to_user(_buffer, buffer, n) != 0)
59550 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59551 return -EFAULT;
59552
59553 return n;
59554 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59555 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59556 return -EIO;
59557
59558 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
59559 + if (datalen > PAGE_SIZE - 1)
59560 return -EOPNOTSUPP;
59561
59562 /* drag the command string into the kernel so we can parse it */
59563 @@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59564 if (args[0] != '%' || args[1] != '\0')
59565 return -EINVAL;
59566
59567 - if (fstop < 0 || fstop >= cache->fcull_percent)
59568 + if (fstop >= cache->fcull_percent)
59569 return cachefiles_daemon_range_error(cache, args);
59570
59571 cache->fstop_percent = fstop;
59572 @@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59573 if (args[0] != '%' || args[1] != '\0')
59574 return -EINVAL;
59575
59576 - if (bstop < 0 || bstop >= cache->bcull_percent)
59577 + if (bstop >= cache->bcull_percent)
59578 return cachefiles_daemon_range_error(cache, args);
59579
59580 cache->bstop_percent = bstop;
59581 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59582 index 8c52472..c4e3a69 100644
59583 --- a/fs/cachefiles/internal.h
59584 +++ b/fs/cachefiles/internal.h
59585 @@ -66,7 +66,7 @@ struct cachefiles_cache {
59586 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59587 struct rb_root active_nodes; /* active nodes (can't be culled) */
59588 rwlock_t active_lock; /* lock for active_nodes */
59589 - atomic_t gravecounter; /* graveyard uniquifier */
59590 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59591 unsigned frun_percent; /* when to stop culling (% files) */
59592 unsigned fcull_percent; /* when to start culling (% files) */
59593 unsigned fstop_percent; /* when to stop allocating (% files) */
59594 @@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59595 * proc.c
59596 */
59597 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59598 -extern atomic_t cachefiles_lookup_histogram[HZ];
59599 -extern atomic_t cachefiles_mkdir_histogram[HZ];
59600 -extern atomic_t cachefiles_create_histogram[HZ];
59601 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59602 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59603 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59604
59605 extern int __init cachefiles_proc_init(void);
59606 extern void cachefiles_proc_cleanup(void);
59607 static inline
59608 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59609 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59610 {
59611 unsigned long jif = jiffies - start_jif;
59612 if (jif >= HZ)
59613 jif = HZ - 1;
59614 - atomic_inc(&histogram[jif]);
59615 + atomic_inc_unchecked(&histogram[jif]);
59616 }
59617
59618 #else
59619 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59620 index e12f189..ed17244 100644
59621 --- a/fs/cachefiles/namei.c
59622 +++ b/fs/cachefiles/namei.c
59623 @@ -312,7 +312,7 @@ try_again:
59624 /* first step is to make up a grave dentry in the graveyard */
59625 sprintf(nbuffer, "%08x%08x",
59626 (uint32_t) get_seconds(),
59627 - (uint32_t) atomic_inc_return(&cache->gravecounter));
59628 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59629
59630 /* do the multiway lock magic */
59631 trap = lock_rename(cache->graveyard, dir);
59632 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59633 index eccd339..4c1d995 100644
59634 --- a/fs/cachefiles/proc.c
59635 +++ b/fs/cachefiles/proc.c
59636 @@ -14,9 +14,9 @@
59637 #include <linux/seq_file.h>
59638 #include "internal.h"
59639
59640 -atomic_t cachefiles_lookup_histogram[HZ];
59641 -atomic_t cachefiles_mkdir_histogram[HZ];
59642 -atomic_t cachefiles_create_histogram[HZ];
59643 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59644 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59645 +atomic_unchecked_t cachefiles_create_histogram[HZ];
59646
59647 /*
59648 * display the latency histogram
59649 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59650 return 0;
59651 default:
59652 index = (unsigned long) v - 3;
59653 - x = atomic_read(&cachefiles_lookup_histogram[index]);
59654 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
59655 - z = atomic_read(&cachefiles_create_histogram[index]);
59656 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59657 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59658 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59659 if (x == 0 && y == 0 && z == 0)
59660 return 0;
59661
59662 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59663 index 695e788..f4a9d4d 100644
59664 --- a/fs/ceph/dir.c
59665 +++ b/fs/ceph/dir.c
59666 @@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59667 struct dentry *dentry, *last;
59668 struct ceph_dentry_info *di;
59669 int err = 0;
59670 + char d_name[DNAME_INLINE_LEN];
59671 + const unsigned char *name;
59672
59673 /* claim ref on last dentry we returned */
59674 last = fi->dentry;
59675 @@ -192,7 +194,12 @@ more:
59676
59677 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59678 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59679 - if (!dir_emit(ctx, dentry->d_name.name,
59680 + name = dentry->d_name.name;
59681 + if (name == dentry->d_iname) {
59682 + memcpy(d_name, name, dentry->d_name.len);
59683 + name = d_name;
59684 + }
59685 + if (!dir_emit(ctx, name,
59686 dentry->d_name.len,
59687 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59688 dentry->d_inode->i_mode >> 12)) {
59689 @@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59690 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59691 struct ceph_mds_client *mdsc = fsc->mdsc;
59692 unsigned frag = fpos_frag(ctx->pos);
59693 - int off = fpos_off(ctx->pos);
59694 + unsigned int off = fpos_off(ctx->pos);
59695 int err;
59696 u32 ftype;
59697 struct ceph_mds_reply_info_parsed *rinfo;
59698 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59699 index f6e1237..796ffd1 100644
59700 --- a/fs/ceph/super.c
59701 +++ b/fs/ceph/super.c
59702 @@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59703 /*
59704 * construct our own bdi so we can control readahead, etc.
59705 */
59706 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59707 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59708
59709 static int ceph_register_bdi(struct super_block *sb,
59710 struct ceph_fs_client *fsc)
59711 @@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59712 default_backing_dev_info.ra_pages;
59713
59714 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59715 - atomic_long_inc_return(&bdi_seq));
59716 + atomic_long_inc_return_unchecked(&bdi_seq));
59717 if (!err)
59718 sb->s_bdi = &fsc->backing_dev_info;
59719 return err;
59720 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59721 index 44ec726..bcb06a3 100644
59722 --- a/fs/cifs/cifs_debug.c
59723 +++ b/fs/cifs/cifs_debug.c
59724 @@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59725
59726 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59727 #ifdef CONFIG_CIFS_STATS2
59728 - atomic_set(&totBufAllocCount, 0);
59729 - atomic_set(&totSmBufAllocCount, 0);
59730 + atomic_set_unchecked(&totBufAllocCount, 0);
59731 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59732 #endif /* CONFIG_CIFS_STATS2 */
59733 spin_lock(&cifs_tcp_ses_lock);
59734 list_for_each(tmp1, &cifs_tcp_ses_list) {
59735 @@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59736 tcon = list_entry(tmp3,
59737 struct cifs_tcon,
59738 tcon_list);
59739 - atomic_set(&tcon->num_smbs_sent, 0);
59740 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59741 if (server->ops->clear_stats)
59742 server->ops->clear_stats(tcon);
59743 }
59744 @@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59745 smBufAllocCount.counter, cifs_min_small);
59746 #ifdef CONFIG_CIFS_STATS2
59747 seq_printf(m, "Total Large %d Small %d Allocations\n",
59748 - atomic_read(&totBufAllocCount),
59749 - atomic_read(&totSmBufAllocCount));
59750 + atomic_read_unchecked(&totBufAllocCount),
59751 + atomic_read_unchecked(&totSmBufAllocCount));
59752 #endif /* CONFIG_CIFS_STATS2 */
59753
59754 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59755 @@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59756 if (tcon->need_reconnect)
59757 seq_puts(m, "\tDISCONNECTED ");
59758 seq_printf(m, "\nSMBs: %d",
59759 - atomic_read(&tcon->num_smbs_sent));
59760 + atomic_read_unchecked(&tcon->num_smbs_sent));
59761 if (server->ops->print_stats)
59762 server->ops->print_stats(m, tcon);
59763 }
59764 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59765 index 9d7996e..35ad5cf4 100644
59766 --- a/fs/cifs/cifsfs.c
59767 +++ b/fs/cifs/cifsfs.c
59768 @@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59769 */
59770 cifs_req_cachep = kmem_cache_create("cifs_request",
59771 CIFSMaxBufSize + max_hdr_size, 0,
59772 - SLAB_HWCACHE_ALIGN, NULL);
59773 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59774 if (cifs_req_cachep == NULL)
59775 return -ENOMEM;
59776
59777 @@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59778 efficient to alloc 1 per page off the slab compared to 17K (5page)
59779 alloc of large cifs buffers even when page debugging is on */
59780 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59781 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59782 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59783 NULL);
59784 if (cifs_sm_req_cachep == NULL) {
59785 mempool_destroy(cifs_req_poolp);
59786 @@ -1205,8 +1205,8 @@ init_cifs(void)
59787 atomic_set(&bufAllocCount, 0);
59788 atomic_set(&smBufAllocCount, 0);
59789 #ifdef CONFIG_CIFS_STATS2
59790 - atomic_set(&totBufAllocCount, 0);
59791 - atomic_set(&totSmBufAllocCount, 0);
59792 + atomic_set_unchecked(&totBufAllocCount, 0);
59793 + atomic_set_unchecked(&totSmBufAllocCount, 0);
59794 #endif /* CONFIG_CIFS_STATS2 */
59795
59796 atomic_set(&midCount, 0);
59797 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59798 index 02a33e5..3a28b5a 100644
59799 --- a/fs/cifs/cifsglob.h
59800 +++ b/fs/cifs/cifsglob.h
59801 @@ -823,35 +823,35 @@ struct cifs_tcon {
59802 __u16 Flags; /* optional support bits */
59803 enum statusEnum tidStatus;
59804 #ifdef CONFIG_CIFS_STATS
59805 - atomic_t num_smbs_sent;
59806 + atomic_unchecked_t num_smbs_sent;
59807 union {
59808 struct {
59809 - atomic_t num_writes;
59810 - atomic_t num_reads;
59811 - atomic_t num_flushes;
59812 - atomic_t num_oplock_brks;
59813 - atomic_t num_opens;
59814 - atomic_t num_closes;
59815 - atomic_t num_deletes;
59816 - atomic_t num_mkdirs;
59817 - atomic_t num_posixopens;
59818 - atomic_t num_posixmkdirs;
59819 - atomic_t num_rmdirs;
59820 - atomic_t num_renames;
59821 - atomic_t num_t2renames;
59822 - atomic_t num_ffirst;
59823 - atomic_t num_fnext;
59824 - atomic_t num_fclose;
59825 - atomic_t num_hardlinks;
59826 - atomic_t num_symlinks;
59827 - atomic_t num_locks;
59828 - atomic_t num_acl_get;
59829 - atomic_t num_acl_set;
59830 + atomic_unchecked_t num_writes;
59831 + atomic_unchecked_t num_reads;
59832 + atomic_unchecked_t num_flushes;
59833 + atomic_unchecked_t num_oplock_brks;
59834 + atomic_unchecked_t num_opens;
59835 + atomic_unchecked_t num_closes;
59836 + atomic_unchecked_t num_deletes;
59837 + atomic_unchecked_t num_mkdirs;
59838 + atomic_unchecked_t num_posixopens;
59839 + atomic_unchecked_t num_posixmkdirs;
59840 + atomic_unchecked_t num_rmdirs;
59841 + atomic_unchecked_t num_renames;
59842 + atomic_unchecked_t num_t2renames;
59843 + atomic_unchecked_t num_ffirst;
59844 + atomic_unchecked_t num_fnext;
59845 + atomic_unchecked_t num_fclose;
59846 + atomic_unchecked_t num_hardlinks;
59847 + atomic_unchecked_t num_symlinks;
59848 + atomic_unchecked_t num_locks;
59849 + atomic_unchecked_t num_acl_get;
59850 + atomic_unchecked_t num_acl_set;
59851 } cifs_stats;
59852 #ifdef CONFIG_CIFS_SMB2
59853 struct {
59854 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59855 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59856 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59857 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59858 } smb2_stats;
59859 #endif /* CONFIG_CIFS_SMB2 */
59860 } stats;
59861 @@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59862 }
59863
59864 #ifdef CONFIG_CIFS_STATS
59865 -#define cifs_stats_inc atomic_inc
59866 +#define cifs_stats_inc atomic_inc_unchecked
59867
59868 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59869 unsigned int bytes)
59870 @@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59871 /* Various Debug counters */
59872 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59873 #ifdef CONFIG_CIFS_STATS2
59874 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59875 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59876 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59877 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59878 #endif
59879 GLOBAL_EXTERN atomic_t smBufAllocCount;
59880 GLOBAL_EXTERN atomic_t midCount;
59881 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59882 index 3e4d00a..38a122d 100644
59883 --- a/fs/cifs/file.c
59884 +++ b/fs/cifs/file.c
59885 @@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59886 index = mapping->writeback_index; /* Start from prev offset */
59887 end = -1;
59888 } else {
59889 - index = wbc->range_start >> PAGE_CACHE_SHIFT;
59890 - end = wbc->range_end >> PAGE_CACHE_SHIFT;
59891 - if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59892 + if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59893 range_whole = true;
59894 + index = 0;
59895 + end = ULONG_MAX;
59896 + } else {
59897 + index = wbc->range_start >> PAGE_CACHE_SHIFT;
59898 + end = wbc->range_end >> PAGE_CACHE_SHIFT;
59899 + }
59900 scanned = true;
59901 }
59902 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59903 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59904 index b7415d5..3984ec0 100644
59905 --- a/fs/cifs/misc.c
59906 +++ b/fs/cifs/misc.c
59907 @@ -170,7 +170,7 @@ cifs_buf_get(void)
59908 memset(ret_buf, 0, buf_size + 3);
59909 atomic_inc(&bufAllocCount);
59910 #ifdef CONFIG_CIFS_STATS2
59911 - atomic_inc(&totBufAllocCount);
59912 + atomic_inc_unchecked(&totBufAllocCount);
59913 #endif /* CONFIG_CIFS_STATS2 */
59914 }
59915
59916 @@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59917 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59918 atomic_inc(&smBufAllocCount);
59919 #ifdef CONFIG_CIFS_STATS2
59920 - atomic_inc(&totSmBufAllocCount);
59921 + atomic_inc_unchecked(&totSmBufAllocCount);
59922 #endif /* CONFIG_CIFS_STATS2 */
59923
59924 }
59925 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59926 index d297903..1cb7516 100644
59927 --- a/fs/cifs/smb1ops.c
59928 +++ b/fs/cifs/smb1ops.c
59929 @@ -622,27 +622,27 @@ static void
59930 cifs_clear_stats(struct cifs_tcon *tcon)
59931 {
59932 #ifdef CONFIG_CIFS_STATS
59933 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59934 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59935 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59936 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59937 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59938 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59939 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59940 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59941 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59942 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59943 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59944 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59945 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59946 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
59947 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
59948 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
59949 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
59950 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
59951 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
59952 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
59953 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
59954 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
59955 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
59956 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
59957 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59958 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
59959 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
59960 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59961 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
59962 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
59963 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
59964 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
59965 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
59966 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
59967 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
59968 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
59969 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
59970 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
59971 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
59972 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
59973 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
59974 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
59975 #endif
59976 }
59977
59978 @@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59979 {
59980 #ifdef CONFIG_CIFS_STATS
59981 seq_printf(m, " Oplocks breaks: %d",
59982 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
59983 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
59984 seq_printf(m, "\nReads: %d Bytes: %llu",
59985 - atomic_read(&tcon->stats.cifs_stats.num_reads),
59986 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
59987 (long long)(tcon->bytes_read));
59988 seq_printf(m, "\nWrites: %d Bytes: %llu",
59989 - atomic_read(&tcon->stats.cifs_stats.num_writes),
59990 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
59991 (long long)(tcon->bytes_written));
59992 seq_printf(m, "\nFlushes: %d",
59993 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
59994 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
59995 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
59996 - atomic_read(&tcon->stats.cifs_stats.num_locks),
59997 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
59998 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
59999 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
60000 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
60001 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
60002 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
60003 - atomic_read(&tcon->stats.cifs_stats.num_opens),
60004 - atomic_read(&tcon->stats.cifs_stats.num_closes),
60005 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
60006 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
60007 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
60008 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
60009 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
60010 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
60011 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
60012 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
60013 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
60014 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
60015 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
60016 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
60017 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
60018 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
60019 seq_printf(m, "\nRenames: %d T2 Renames %d",
60020 - atomic_read(&tcon->stats.cifs_stats.num_renames),
60021 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
60022 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
60023 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
60024 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
60025 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
60026 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
60027 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
60028 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
60029 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
60030 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
60031 #endif
60032 }
60033
60034 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
60035 index c5f521b..1a40865 100644
60036 --- a/fs/cifs/smb2ops.c
60037 +++ b/fs/cifs/smb2ops.c
60038 @@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
60039 #ifdef CONFIG_CIFS_STATS
60040 int i;
60041 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
60042 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60043 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60044 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60045 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60046 }
60047 #endif
60048 }
60049 @@ -458,65 +458,65 @@ static void
60050 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60051 {
60052 #ifdef CONFIG_CIFS_STATS
60053 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60054 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60055 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60056 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60057 seq_printf(m, "\nNegotiates: %d sent %d failed",
60058 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
60059 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
60060 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
60061 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
60062 seq_printf(m, "\nSessionSetups: %d sent %d failed",
60063 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
60064 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
60065 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
60066 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
60067 seq_printf(m, "\nLogoffs: %d sent %d failed",
60068 - atomic_read(&sent[SMB2_LOGOFF_HE]),
60069 - atomic_read(&failed[SMB2_LOGOFF_HE]));
60070 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
60071 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
60072 seq_printf(m, "\nTreeConnects: %d sent %d failed",
60073 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60074 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60075 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60076 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60077 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60078 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60079 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60080 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60081 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60082 seq_printf(m, "\nCreates: %d sent %d failed",
60083 - atomic_read(&sent[SMB2_CREATE_HE]),
60084 - atomic_read(&failed[SMB2_CREATE_HE]));
60085 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60086 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60087 seq_printf(m, "\nCloses: %d sent %d failed",
60088 - atomic_read(&sent[SMB2_CLOSE_HE]),
60089 - atomic_read(&failed[SMB2_CLOSE_HE]));
60090 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60091 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60092 seq_printf(m, "\nFlushes: %d sent %d failed",
60093 - atomic_read(&sent[SMB2_FLUSH_HE]),
60094 - atomic_read(&failed[SMB2_FLUSH_HE]));
60095 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60096 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60097 seq_printf(m, "\nReads: %d sent %d failed",
60098 - atomic_read(&sent[SMB2_READ_HE]),
60099 - atomic_read(&failed[SMB2_READ_HE]));
60100 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
60101 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
60102 seq_printf(m, "\nWrites: %d sent %d failed",
60103 - atomic_read(&sent[SMB2_WRITE_HE]),
60104 - atomic_read(&failed[SMB2_WRITE_HE]));
60105 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60106 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60107 seq_printf(m, "\nLocks: %d sent %d failed",
60108 - atomic_read(&sent[SMB2_LOCK_HE]),
60109 - atomic_read(&failed[SMB2_LOCK_HE]));
60110 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60111 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60112 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60113 - atomic_read(&sent[SMB2_IOCTL_HE]),
60114 - atomic_read(&failed[SMB2_IOCTL_HE]));
60115 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60116 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60117 seq_printf(m, "\nCancels: %d sent %d failed",
60118 - atomic_read(&sent[SMB2_CANCEL_HE]),
60119 - atomic_read(&failed[SMB2_CANCEL_HE]));
60120 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60121 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60122 seq_printf(m, "\nEchos: %d sent %d failed",
60123 - atomic_read(&sent[SMB2_ECHO_HE]),
60124 - atomic_read(&failed[SMB2_ECHO_HE]));
60125 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60126 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60127 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60128 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60129 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60130 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60131 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60132 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60133 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60134 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60135 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60136 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60137 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60138 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60139 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60140 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60141 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60142 seq_printf(m, "\nSetInfos: %d sent %d failed",
60143 - atomic_read(&sent[SMB2_SET_INFO_HE]),
60144 - atomic_read(&failed[SMB2_SET_INFO_HE]));
60145 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60146 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60147 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60148 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60149 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60150 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60151 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60152 #endif
60153 }
60154
60155 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60156 index 8f1672b..af339c07 100644
60157 --- a/fs/cifs/smb2pdu.c
60158 +++ b/fs/cifs/smb2pdu.c
60159 @@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60160 default:
60161 cifs_dbg(VFS, "info level %u isn't supported\n",
60162 srch_inf->info_level);
60163 - rc = -EINVAL;
60164 - goto qdir_exit;
60165 + return -EINVAL;
60166 }
60167
60168 req->FileIndex = cpu_to_le32(index);
60169 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60170 index 46ee6f2..89a9e7f 100644
60171 --- a/fs/coda/cache.c
60172 +++ b/fs/coda/cache.c
60173 @@ -24,7 +24,7 @@
60174 #include "coda_linux.h"
60175 #include "coda_cache.h"
60176
60177 -static atomic_t permission_epoch = ATOMIC_INIT(0);
60178 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60179
60180 /* replace or extend an acl cache hit */
60181 void coda_cache_enter(struct inode *inode, int mask)
60182 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60183 struct coda_inode_info *cii = ITOC(inode);
60184
60185 spin_lock(&cii->c_lock);
60186 - cii->c_cached_epoch = atomic_read(&permission_epoch);
60187 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60188 if (!uid_eq(cii->c_uid, current_fsuid())) {
60189 cii->c_uid = current_fsuid();
60190 cii->c_cached_perm = mask;
60191 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60192 {
60193 struct coda_inode_info *cii = ITOC(inode);
60194 spin_lock(&cii->c_lock);
60195 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60196 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60197 spin_unlock(&cii->c_lock);
60198 }
60199
60200 /* remove all acl caches */
60201 void coda_cache_clear_all(struct super_block *sb)
60202 {
60203 - atomic_inc(&permission_epoch);
60204 + atomic_inc_unchecked(&permission_epoch);
60205 }
60206
60207
60208 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60209 spin_lock(&cii->c_lock);
60210 hit = (mask & cii->c_cached_perm) == mask &&
60211 uid_eq(cii->c_uid, current_fsuid()) &&
60212 - cii->c_cached_epoch == atomic_read(&permission_epoch);
60213 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60214 spin_unlock(&cii->c_lock);
60215
60216 return hit;
60217 diff --git a/fs/compat.c b/fs/compat.c
60218 index b13df99..6f6f4a3 100644
60219 --- a/fs/compat.c
60220 +++ b/fs/compat.c
60221 @@ -54,7 +54,7 @@
60222 #include <asm/ioctls.h>
60223 #include "internal.h"
60224
60225 -int compat_log = 1;
60226 +int compat_log = 0;
60227
60228 int compat_printk(const char *fmt, ...)
60229 {
60230 @@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60231
60232 set_fs(KERNEL_DS);
60233 /* The __user pointer cast is valid because of the set_fs() */
60234 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60235 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60236 set_fs(oldfs);
60237 /* truncating is ok because it's a user address */
60238 if (!ret)
60239 @@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60240 goto out;
60241
60242 ret = -EINVAL;
60243 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60244 + if (nr_segs > UIO_MAXIOV)
60245 goto out;
60246 if (nr_segs > fast_segs) {
60247 ret = -ENOMEM;
60248 @@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60249 struct compat_readdir_callback {
60250 struct dir_context ctx;
60251 struct compat_old_linux_dirent __user *dirent;
60252 + struct file * file;
60253 int result;
60254 };
60255
60256 @@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60257 buf->result = -EOVERFLOW;
60258 return -EOVERFLOW;
60259 }
60260 +
60261 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60262 + return 0;
60263 +
60264 buf->result++;
60265 dirent = buf->dirent;
60266 if (!access_ok(VERIFY_WRITE, dirent,
60267 @@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60268 if (!f.file)
60269 return -EBADF;
60270
60271 + buf.file = f.file;
60272 error = iterate_dir(f.file, &buf.ctx);
60273 if (buf.result)
60274 error = buf.result;
60275 @@ -911,6 +917,7 @@ struct compat_getdents_callback {
60276 struct dir_context ctx;
60277 struct compat_linux_dirent __user *current_dir;
60278 struct compat_linux_dirent __user *previous;
60279 + struct file * file;
60280 int count;
60281 int error;
60282 };
60283 @@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60284 buf->error = -EOVERFLOW;
60285 return -EOVERFLOW;
60286 }
60287 +
60288 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60289 + return 0;
60290 +
60291 dirent = buf->previous;
60292 if (dirent) {
60293 if (__put_user(offset, &dirent->d_off))
60294 @@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60295 if (!f.file)
60296 return -EBADF;
60297
60298 + buf.file = f.file;
60299 error = iterate_dir(f.file, &buf.ctx);
60300 if (error >= 0)
60301 error = buf.error;
60302 @@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60303 struct dir_context ctx;
60304 struct linux_dirent64 __user *current_dir;
60305 struct linux_dirent64 __user *previous;
60306 + struct file * file;
60307 int count;
60308 int error;
60309 };
60310 @@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60311 buf->error = -EINVAL; /* only used if we fail.. */
60312 if (reclen > buf->count)
60313 return -EINVAL;
60314 +
60315 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60316 + return 0;
60317 +
60318 dirent = buf->previous;
60319
60320 if (dirent) {
60321 @@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60322 if (!f.file)
60323 return -EBADF;
60324
60325 + buf.file = f.file;
60326 error = iterate_dir(f.file, &buf.ctx);
60327 if (error >= 0)
60328 error = buf.error;
60329 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60330 index 4d24d17..4f8c09e 100644
60331 --- a/fs/compat_binfmt_elf.c
60332 +++ b/fs/compat_binfmt_elf.c
60333 @@ -30,11 +30,13 @@
60334 #undef elf_phdr
60335 #undef elf_shdr
60336 #undef elf_note
60337 +#undef elf_dyn
60338 #undef elf_addr_t
60339 #define elfhdr elf32_hdr
60340 #define elf_phdr elf32_phdr
60341 #define elf_shdr elf32_shdr
60342 #define elf_note elf32_note
60343 +#define elf_dyn Elf32_Dyn
60344 #define elf_addr_t Elf32_Addr
60345
60346 /*
60347 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60348 index afec645..9c65620 100644
60349 --- a/fs/compat_ioctl.c
60350 +++ b/fs/compat_ioctl.c
60351 @@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60352 return -EFAULT;
60353 if (__get_user(udata, &ss32->iomem_base))
60354 return -EFAULT;
60355 - ss.iomem_base = compat_ptr(udata);
60356 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60357 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60358 __get_user(ss.port_high, &ss32->port_high))
60359 return -EFAULT;
60360 @@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60361 for (i = 0; i < nmsgs; i++) {
60362 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60363 return -EFAULT;
60364 - if (get_user(datap, &umsgs[i].buf) ||
60365 - put_user(compat_ptr(datap), &tmsgs[i].buf))
60366 + if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60367 + put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60368 return -EFAULT;
60369 }
60370 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60371 @@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60372 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60373 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60374 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60375 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60376 + copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60377 return -EFAULT;
60378
60379 return ioctl_preallocate(file, p);
60380 @@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60381 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60382 {
60383 unsigned int a, b;
60384 - a = *(unsigned int *)p;
60385 - b = *(unsigned int *)q;
60386 + a = *(const unsigned int *)p;
60387 + b = *(const unsigned int *)q;
60388 if (a > b)
60389 return 1;
60390 if (a < b)
60391 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60392 index 668dcab..daebcd6 100644
60393 --- a/fs/configfs/dir.c
60394 +++ b/fs/configfs/dir.c
60395 @@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60396 }
60397 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60398 struct configfs_dirent *next;
60399 - const char *name;
60400 + const unsigned char * name;
60401 + char d_name[sizeof(next->s_dentry->d_iname)];
60402 int len;
60403 struct inode *inode = NULL;
60404
60405 @@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60406 continue;
60407
60408 name = configfs_get_name(next);
60409 - len = strlen(name);
60410 + if (next->s_dentry && name == next->s_dentry->d_iname) {
60411 + len = next->s_dentry->d_name.len;
60412 + memcpy(d_name, name, len);
60413 + name = d_name;
60414 + } else
60415 + len = strlen(name);
60416
60417 /*
60418 * We'll have a dentry and an inode for
60419 diff --git a/fs/coredump.c b/fs/coredump.c
60420 index b5c86ff..0dac262 100644
60421 --- a/fs/coredump.c
60422 +++ b/fs/coredump.c
60423 @@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60424 struct pipe_inode_info *pipe = file->private_data;
60425
60426 pipe_lock(pipe);
60427 - pipe->readers++;
60428 - pipe->writers--;
60429 + atomic_inc(&pipe->readers);
60430 + atomic_dec(&pipe->writers);
60431 wake_up_interruptible_sync(&pipe->wait);
60432 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60433 pipe_unlock(pipe);
60434 @@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60435 * We actually want wait_event_freezable() but then we need
60436 * to clear TIF_SIGPENDING and improve dump_interrupted().
60437 */
60438 - wait_event_interruptible(pipe->wait, pipe->readers == 1);
60439 + wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60440
60441 pipe_lock(pipe);
60442 - pipe->readers--;
60443 - pipe->writers++;
60444 + atomic_dec(&pipe->readers);
60445 + atomic_inc(&pipe->writers);
60446 pipe_unlock(pipe);
60447 }
60448
60449 @@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60450 struct files_struct *displaced;
60451 bool need_nonrelative = false;
60452 bool core_dumped = false;
60453 - static atomic_t core_dump_count = ATOMIC_INIT(0);
60454 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60455 + long signr = siginfo->si_signo;
60456 + int dumpable;
60457 struct coredump_params cprm = {
60458 .siginfo = siginfo,
60459 .regs = signal_pt_regs(),
60460 @@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60461 .mm_flags = mm->flags,
60462 };
60463
60464 - audit_core_dumps(siginfo->si_signo);
60465 + audit_core_dumps(signr);
60466 +
60467 + dumpable = __get_dumpable(cprm.mm_flags);
60468 +
60469 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60470 + gr_handle_brute_attach(dumpable);
60471
60472 binfmt = mm->binfmt;
60473 if (!binfmt || !binfmt->core_dump)
60474 goto fail;
60475 - if (!__get_dumpable(cprm.mm_flags))
60476 + if (!dumpable)
60477 goto fail;
60478
60479 cred = prepare_creds();
60480 @@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60481 need_nonrelative = true;
60482 }
60483
60484 - retval = coredump_wait(siginfo->si_signo, &core_state);
60485 + retval = coredump_wait(signr, &core_state);
60486 if (retval < 0)
60487 goto fail_creds;
60488
60489 @@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60490 }
60491 cprm.limit = RLIM_INFINITY;
60492
60493 - dump_count = atomic_inc_return(&core_dump_count);
60494 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
60495 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60496 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60497 task_tgid_vnr(current), current->comm);
60498 @@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60499 } else {
60500 struct inode *inode;
60501
60502 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60503 +
60504 if (cprm.limit < binfmt->min_coredump)
60505 goto fail_unlock;
60506
60507 @@ -681,7 +690,7 @@ close_fail:
60508 filp_close(cprm.file, NULL);
60509 fail_dropcount:
60510 if (ispipe)
60511 - atomic_dec(&core_dump_count);
60512 + atomic_dec_unchecked(&core_dump_count);
60513 fail_unlock:
60514 kfree(cn.corename);
60515 coredump_finish(mm, core_dumped);
60516 @@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60517 struct file *file = cprm->file;
60518 loff_t pos = file->f_pos;
60519 ssize_t n;
60520 +
60521 + gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60522 if (cprm->written + nr > cprm->limit)
60523 return 0;
60524 while (nr) {
60525 diff --git a/fs/dcache.c b/fs/dcache.c
60526 index 03dca3c..f66c622 100644
60527 --- a/fs/dcache.c
60528 +++ b/fs/dcache.c
60529 @@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60530 * dentry_iput drops the locks, at which point nobody (except
60531 * transient RCU lookups) can reach this dentry.
60532 */
60533 - BUG_ON((int)dentry->d_lockref.count > 0);
60534 + BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60535 this_cpu_dec(nr_dentry);
60536 if (dentry->d_op && dentry->d_op->d_release)
60537 dentry->d_op->d_release(dentry);
60538 @@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60539 struct dentry *parent = dentry->d_parent;
60540 if (IS_ROOT(dentry))
60541 return NULL;
60542 - if (unlikely((int)dentry->d_lockref.count < 0))
60543 + if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60544 return NULL;
60545 if (likely(spin_trylock(&parent->d_lock)))
60546 return parent;
60547 @@ -638,7 +638,7 @@ repeat:
60548 dentry->d_flags |= DCACHE_REFERENCED;
60549 dentry_lru_add(dentry);
60550
60551 - dentry->d_lockref.count--;
60552 + __lockref_dec(&dentry->d_lockref);
60553 spin_unlock(&dentry->d_lock);
60554 return;
60555
60556 @@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60557 /* This must be called with d_lock held */
60558 static inline void __dget_dlock(struct dentry *dentry)
60559 {
60560 - dentry->d_lockref.count++;
60561 + __lockref_inc(&dentry->d_lockref);
60562 }
60563
60564 static inline void __dget(struct dentry *dentry)
60565 @@ -694,8 +694,8 @@ repeat:
60566 goto repeat;
60567 }
60568 rcu_read_unlock();
60569 - BUG_ON(!ret->d_lockref.count);
60570 - ret->d_lockref.count++;
60571 + BUG_ON(!__lockref_read(&ret->d_lockref));
60572 + __lockref_inc(&ret->d_lockref);
60573 spin_unlock(&ret->d_lock);
60574 return ret;
60575 }
60576 @@ -773,9 +773,9 @@ restart:
60577 spin_lock(&inode->i_lock);
60578 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60579 spin_lock(&dentry->d_lock);
60580 - if (!dentry->d_lockref.count) {
60581 + if (!__lockref_read(&dentry->d_lockref)) {
60582 struct dentry *parent = lock_parent(dentry);
60583 - if (likely(!dentry->d_lockref.count)) {
60584 + if (likely(!__lockref_read(&dentry->d_lockref))) {
60585 __dentry_kill(dentry);
60586 dput(parent);
60587 goto restart;
60588 @@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60589 * We found an inuse dentry which was not removed from
60590 * the LRU because of laziness during lookup. Do not free it.
60591 */
60592 - if ((int)dentry->d_lockref.count > 0) {
60593 + if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60594 spin_unlock(&dentry->d_lock);
60595 if (parent)
60596 spin_unlock(&parent->d_lock);
60597 @@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60598 dentry = parent;
60599 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60600 parent = lock_parent(dentry);
60601 - if (dentry->d_lockref.count != 1) {
60602 - dentry->d_lockref.count--;
60603 + if (__lockref_read(&dentry->d_lockref) != 1) {
60604 + __lockref_inc(&dentry->d_lockref);
60605 spin_unlock(&dentry->d_lock);
60606 if (parent)
60607 spin_unlock(&parent->d_lock);
60608 @@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60609 * counts, just remove them from the LRU. Otherwise give them
60610 * another pass through the LRU.
60611 */
60612 - if (dentry->d_lockref.count) {
60613 + if (__lockref_read(&dentry->d_lockref) > 0) {
60614 d_lru_isolate(dentry);
60615 spin_unlock(&dentry->d_lock);
60616 return LRU_REMOVED;
60617 @@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60618 } else {
60619 if (dentry->d_flags & DCACHE_LRU_LIST)
60620 d_lru_del(dentry);
60621 - if (!dentry->d_lockref.count) {
60622 + if (!__lockref_read(&dentry->d_lockref)) {
60623 d_shrink_add(dentry, &data->dispose);
60624 data->found++;
60625 }
60626 @@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60627 return D_WALK_CONTINUE;
60628
60629 /* root with refcount 1 is fine */
60630 - if (dentry == _data && dentry->d_lockref.count == 1)
60631 + if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60632 return D_WALK_CONTINUE;
60633
60634 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60635 @@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60636 dentry->d_inode ?
60637 dentry->d_inode->i_ino : 0UL,
60638 dentry,
60639 - dentry->d_lockref.count,
60640 + __lockref_read(&dentry->d_lockref),
60641 dentry->d_sb->s_type->name,
60642 dentry->d_sb->s_id);
60643 WARN_ON(1);
60644 @@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60645 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60646 if (name->len > DNAME_INLINE_LEN-1) {
60647 size_t size = offsetof(struct external_name, name[1]);
60648 - struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60649 + struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60650 if (!p) {
60651 kmem_cache_free(dentry_cache, dentry);
60652 return NULL;
60653 @@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60654 smp_wmb();
60655 dentry->d_name.name = dname;
60656
60657 - dentry->d_lockref.count = 1;
60658 + __lockref_set(&dentry->d_lockref, 1);
60659 dentry->d_flags = 0;
60660 spin_lock_init(&dentry->d_lock);
60661 seqcount_init(&dentry->d_seq);
60662 @@ -2183,7 +2183,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60663 goto next;
60664 }
60665
60666 - dentry->d_lockref.count++;
60667 + __lockref_inc(&dentry->d_lockref);
60668 found = dentry;
60669 spin_unlock(&dentry->d_lock);
60670 break;
60671 @@ -2282,7 +2282,7 @@ again:
60672 spin_lock(&dentry->d_lock);
60673 inode = dentry->d_inode;
60674 isdir = S_ISDIR(inode->i_mode);
60675 - if (dentry->d_lockref.count == 1) {
60676 + if (__lockref_read(&dentry->d_lockref) == 1) {
60677 if (!spin_trylock(&inode->i_lock)) {
60678 spin_unlock(&dentry->d_lock);
60679 cpu_relax();
60680 @@ -3308,7 +3308,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60681
60682 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60683 dentry->d_flags |= DCACHE_GENOCIDE;
60684 - dentry->d_lockref.count--;
60685 + __lockref_dec(&dentry->d_lockref);
60686 }
60687 }
60688 return D_WALK_CONTINUE;
60689 @@ -3424,7 +3424,8 @@ void __init vfs_caches_init(unsigned long mempages)
60690 mempages -= reserve;
60691
60692 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60693 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60694 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60695 + SLAB_NO_SANITIZE, NULL);
60696
60697 dcache_init();
60698 inode_init();
60699 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60700 index 05f2960..b012481 100644
60701 --- a/fs/debugfs/inode.c
60702 +++ b/fs/debugfs/inode.c
60703 @@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60704 */
60705 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60706 {
60707 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60708 + return __create_file(name, S_IFDIR | S_IRWXU,
60709 +#else
60710 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60711 +#endif
60712 parent, NULL, NULL);
60713 }
60714 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60715 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60716 index 1686dc2..9611c50 100644
60717 --- a/fs/ecryptfs/inode.c
60718 +++ b/fs/ecryptfs/inode.c
60719 @@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60720 old_fs = get_fs();
60721 set_fs(get_ds());
60722 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60723 - (char __user *)lower_buf,
60724 + (char __force_user *)lower_buf,
60725 PATH_MAX);
60726 set_fs(old_fs);
60727 if (rc < 0)
60728 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60729 index e4141f2..d8263e8 100644
60730 --- a/fs/ecryptfs/miscdev.c
60731 +++ b/fs/ecryptfs/miscdev.c
60732 @@ -304,7 +304,7 @@ check_list:
60733 goto out_unlock_msg_ctx;
60734 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60735 if (msg_ctx->msg) {
60736 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
60737 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60738 goto out_unlock_msg_ctx;
60739 i += packet_length_size;
60740 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60741 diff --git a/fs/exec.c b/fs/exec.c
60742 index 7302b75..b917171 100644
60743 --- a/fs/exec.c
60744 +++ b/fs/exec.c
60745 @@ -56,8 +56,20 @@
60746 #include <linux/pipe_fs_i.h>
60747 #include <linux/oom.h>
60748 #include <linux/compat.h>
60749 +#include <linux/random.h>
60750 +#include <linux/seq_file.h>
60751 +#include <linux/coredump.h>
60752 +#include <linux/mman.h>
60753 +
60754 +#ifdef CONFIG_PAX_REFCOUNT
60755 +#include <linux/kallsyms.h>
60756 +#include <linux/kdebug.h>
60757 +#endif
60758 +
60759 +#include <trace/events/fs.h>
60760
60761 #include <asm/uaccess.h>
60762 +#include <asm/sections.h>
60763 #include <asm/mmu_context.h>
60764 #include <asm/tlb.h>
60765
60766 @@ -66,19 +78,34 @@
60767
60768 #include <trace/events/sched.h>
60769
60770 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60771 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60772 +{
60773 + 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");
60774 +}
60775 +#endif
60776 +
60777 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60778 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60779 +EXPORT_SYMBOL(pax_set_initial_flags_func);
60780 +#endif
60781 +
60782 int suid_dumpable = 0;
60783
60784 static LIST_HEAD(formats);
60785 static DEFINE_RWLOCK(binfmt_lock);
60786
60787 +extern int gr_process_kernel_exec_ban(void);
60788 +extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60789 +
60790 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60791 {
60792 BUG_ON(!fmt);
60793 if (WARN_ON(!fmt->load_binary))
60794 return;
60795 write_lock(&binfmt_lock);
60796 - insert ? list_add(&fmt->lh, &formats) :
60797 - list_add_tail(&fmt->lh, &formats);
60798 + insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60799 + pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60800 write_unlock(&binfmt_lock);
60801 }
60802
60803 @@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60804 void unregister_binfmt(struct linux_binfmt * fmt)
60805 {
60806 write_lock(&binfmt_lock);
60807 - list_del(&fmt->lh);
60808 + pax_list_del((struct list_head *)&fmt->lh);
60809 write_unlock(&binfmt_lock);
60810 }
60811
60812 @@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60813 int write)
60814 {
60815 struct page *page;
60816 - int ret;
60817
60818 -#ifdef CONFIG_STACK_GROWSUP
60819 - if (write) {
60820 - ret = expand_downwards(bprm->vma, pos);
60821 - if (ret < 0)
60822 - return NULL;
60823 - }
60824 -#endif
60825 - ret = get_user_pages(current, bprm->mm, pos,
60826 - 1, write, 1, &page, NULL);
60827 - if (ret <= 0)
60828 + if (0 > expand_downwards(bprm->vma, pos))
60829 + return NULL;
60830 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60831 return NULL;
60832
60833 if (write) {
60834 @@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60835 if (size <= ARG_MAX)
60836 return page;
60837
60838 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60839 + // only allow 512KB for argv+env on suid/sgid binaries
60840 + // to prevent easy ASLR exhaustion
60841 + if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60842 + (!gid_eq(bprm->cred->egid, current_egid()))) &&
60843 + (size > (512 * 1024))) {
60844 + put_page(page);
60845 + return NULL;
60846 + }
60847 +#endif
60848 +
60849 /*
60850 * Limit to 1/4-th the stack size for the argv+env strings.
60851 * This ensures that:
60852 @@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60853 vma->vm_end = STACK_TOP_MAX;
60854 vma->vm_start = vma->vm_end - PAGE_SIZE;
60855 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60856 +
60857 +#ifdef CONFIG_PAX_SEGMEXEC
60858 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60859 +#endif
60860 +
60861 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60862 INIT_LIST_HEAD(&vma->anon_vma_chain);
60863
60864 @@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60865 mm->stack_vm = mm->total_vm = 1;
60866 up_write(&mm->mmap_sem);
60867 bprm->p = vma->vm_end - sizeof(void *);
60868 +
60869 +#ifdef CONFIG_PAX_RANDUSTACK
60870 + if (randomize_va_space)
60871 + bprm->p ^= prandom_u32() & ~PAGE_MASK;
60872 +#endif
60873 +
60874 return 0;
60875 err:
60876 up_write(&mm->mmap_sem);
60877 @@ -395,7 +436,7 @@ struct user_arg_ptr {
60878 } ptr;
60879 };
60880
60881 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60882 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60883 {
60884 const char __user *native;
60885
60886 @@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60887 compat_uptr_t compat;
60888
60889 if (get_user(compat, argv.ptr.compat + nr))
60890 - return ERR_PTR(-EFAULT);
60891 + return (const char __force_user *)ERR_PTR(-EFAULT);
60892
60893 return compat_ptr(compat);
60894 }
60895 #endif
60896
60897 if (get_user(native, argv.ptr.native + nr))
60898 - return ERR_PTR(-EFAULT);
60899 + return (const char __force_user *)ERR_PTR(-EFAULT);
60900
60901 return native;
60902 }
60903 @@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60904 if (!p)
60905 break;
60906
60907 - if (IS_ERR(p))
60908 + if (IS_ERR((const char __force_kernel *)p))
60909 return -EFAULT;
60910
60911 if (i >= max)
60912 @@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60913
60914 ret = -EFAULT;
60915 str = get_user_arg_ptr(argv, argc);
60916 - if (IS_ERR(str))
60917 + if (IS_ERR((const char __force_kernel *)str))
60918 goto out;
60919
60920 len = strnlen_user(str, MAX_ARG_STRLEN);
60921 @@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60922 int r;
60923 mm_segment_t oldfs = get_fs();
60924 struct user_arg_ptr argv = {
60925 - .ptr.native = (const char __user *const __user *)__argv,
60926 + .ptr.native = (const char __user * const __force_user *)__argv,
60927 };
60928
60929 set_fs(KERNEL_DS);
60930 @@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60931 unsigned long new_end = old_end - shift;
60932 struct mmu_gather tlb;
60933
60934 - BUG_ON(new_start > new_end);
60935 + if (new_start >= new_end || new_start < mmap_min_addr)
60936 + return -ENOMEM;
60937
60938 /*
60939 * ensure there are no vmas between where we want to go
60940 @@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60941 if (vma != find_vma(mm, new_start))
60942 return -EFAULT;
60943
60944 +#ifdef CONFIG_PAX_SEGMEXEC
60945 + BUG_ON(pax_find_mirror_vma(vma));
60946 +#endif
60947 +
60948 /*
60949 * cover the whole range: [new_start, old_end)
60950 */
60951 @@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60952 stack_top = arch_align_stack(stack_top);
60953 stack_top = PAGE_ALIGN(stack_top);
60954
60955 - if (unlikely(stack_top < mmap_min_addr) ||
60956 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
60957 - return -ENOMEM;
60958 -
60959 stack_shift = vma->vm_end - stack_top;
60960
60961 bprm->p -= stack_shift;
60962 @@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
60963 bprm->exec -= stack_shift;
60964
60965 down_write(&mm->mmap_sem);
60966 +
60967 + /* Move stack pages down in memory. */
60968 + if (stack_shift) {
60969 + ret = shift_arg_pages(vma, stack_shift);
60970 + if (ret)
60971 + goto out_unlock;
60972 + }
60973 +
60974 vm_flags = VM_STACK_FLAGS;
60975
60976 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
60977 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
60978 + vm_flags &= ~VM_EXEC;
60979 +
60980 +#ifdef CONFIG_PAX_MPROTECT
60981 + if (mm->pax_flags & MF_PAX_MPROTECT)
60982 + vm_flags &= ~VM_MAYEXEC;
60983 +#endif
60984 +
60985 + }
60986 +#endif
60987 +
60988 /*
60989 * Adjust stack execute permissions; explicitly enable for
60990 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
60991 @@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60992 goto out_unlock;
60993 BUG_ON(prev != vma);
60994
60995 - /* Move stack pages down in memory. */
60996 - if (stack_shift) {
60997 - ret = shift_arg_pages(vma, stack_shift);
60998 - if (ret)
60999 - goto out_unlock;
61000 - }
61001 -
61002 /* mprotect_fixup is overkill to remove the temporary stack flags */
61003 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
61004
61005 @@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
61006 #endif
61007 current->mm->start_stack = bprm->p;
61008 ret = expand_stack(vma, stack_base);
61009 +
61010 +#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
61011 + if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
61012 + unsigned long size;
61013 + vm_flags_t vm_flags;
61014 +
61015 + size = STACK_TOP - vma->vm_end;
61016 + vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
61017 +
61018 + ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
61019 +
61020 +#ifdef CONFIG_X86
61021 + if (!ret) {
61022 + size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
61023 + ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
61024 + }
61025 +#endif
61026 +
61027 + }
61028 +#endif
61029 +
61030 if (ret)
61031 ret = -EFAULT;
61032
61033 @@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
61034
61035 fsnotify_open(file);
61036
61037 + trace_open_exec(name->name);
61038 +
61039 err = deny_write_access(file);
61040 if (err)
61041 goto exit;
61042 @@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
61043 old_fs = get_fs();
61044 set_fs(get_ds());
61045 /* The cast to a user pointer is valid due to the set_fs() */
61046 - result = vfs_read(file, (void __user *)addr, count, &pos);
61047 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
61048 set_fs(old_fs);
61049 return result;
61050 }
61051 @@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
61052 tsk->mm = mm;
61053 tsk->active_mm = mm;
61054 activate_mm(active_mm, mm);
61055 + populate_stack();
61056 tsk->mm->vmacache_seqnum = 0;
61057 vmacache_flush(tsk);
61058 task_unlock(tsk);
61059 @@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
61060 }
61061 rcu_read_unlock();
61062
61063 - if (p->fs->users > n_fs)
61064 + if (atomic_read(&p->fs->users) > n_fs)
61065 bprm->unsafe |= LSM_UNSAFE_SHARE;
61066 else
61067 p->fs->in_exec = 1;
61068 @@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
61069 return ret;
61070 }
61071
61072 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61073 +static DEFINE_PER_CPU(u64, exec_counter);
61074 +static int __init init_exec_counters(void)
61075 +{
61076 + unsigned int cpu;
61077 +
61078 + for_each_possible_cpu(cpu) {
61079 + per_cpu(exec_counter, cpu) = (u64)cpu;
61080 + }
61081 +
61082 + return 0;
61083 +}
61084 +early_initcall(init_exec_counters);
61085 +static inline void increment_exec_counter(void)
61086 +{
61087 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
61088 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61089 +}
61090 +#else
61091 +static inline void increment_exec_counter(void) {}
61092 +#endif
61093 +
61094 +extern void gr_handle_exec_args(struct linux_binprm *bprm,
61095 + struct user_arg_ptr argv);
61096 +
61097 /*
61098 * sys_execve() executes a new program.
61099 */
61100 @@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
61101 struct user_arg_ptr argv,
61102 struct user_arg_ptr envp)
61103 {
61104 +#ifdef CONFIG_GRKERNSEC
61105 + struct file *old_exec_file;
61106 + struct acl_subject_label *old_acl;
61107 + struct rlimit old_rlim[RLIM_NLIMITS];
61108 +#endif
61109 struct linux_binprm *bprm;
61110 struct file *file;
61111 struct files_struct *displaced;
61112 @@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
61113 if (IS_ERR(filename))
61114 return PTR_ERR(filename);
61115
61116 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61117 +
61118 /*
61119 * We move the actual failure in case of RLIMIT_NPROC excess from
61120 * set*uid() to execve() because too many poorly written programs
61121 @@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
61122 if (IS_ERR(file))
61123 goto out_unmark;
61124
61125 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
61126 + retval = -EPERM;
61127 + goto out_unmark;
61128 + }
61129 +
61130 sched_exec();
61131
61132 bprm->file = file;
61133 bprm->filename = bprm->interp = filename->name;
61134
61135 + if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61136 + retval = -EACCES;
61137 + goto out_unmark;
61138 + }
61139 +
61140 retval = bprm_mm_init(bprm);
61141 if (retval)
61142 goto out_unmark;
61143 @@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
61144 if (retval < 0)
61145 goto out;
61146
61147 +#ifdef CONFIG_GRKERNSEC
61148 + old_acl = current->acl;
61149 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61150 + old_exec_file = current->exec_file;
61151 + get_file(file);
61152 + current->exec_file = file;
61153 +#endif
61154 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61155 + /* limit suid stack to 8MB
61156 + * we saved the old limits above and will restore them if this exec fails
61157 + */
61158 + if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61159 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61160 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61161 +#endif
61162 +
61163 + if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61164 + retval = -EPERM;
61165 + goto out_fail;
61166 + }
61167 +
61168 + if (!gr_tpe_allow(file)) {
61169 + retval = -EACCES;
61170 + goto out_fail;
61171 + }
61172 +
61173 + if (gr_check_crash_exec(file)) {
61174 + retval = -EACCES;
61175 + goto out_fail;
61176 + }
61177 +
61178 + retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61179 + bprm->unsafe);
61180 + if (retval < 0)
61181 + goto out_fail;
61182 +
61183 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61184 if (retval < 0)
61185 - goto out;
61186 + goto out_fail;
61187
61188 bprm->exec = bprm->p;
61189 retval = copy_strings(bprm->envc, envp, bprm);
61190 if (retval < 0)
61191 - goto out;
61192 + goto out_fail;
61193
61194 retval = copy_strings(bprm->argc, argv, bprm);
61195 if (retval < 0)
61196 - goto out;
61197 + goto out_fail;
61198 +
61199 + gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61200 +
61201 + gr_handle_exec_args(bprm, argv);
61202
61203 retval = exec_binprm(bprm);
61204 if (retval < 0)
61205 - goto out;
61206 + goto out_fail;
61207 +#ifdef CONFIG_GRKERNSEC
61208 + if (old_exec_file)
61209 + fput(old_exec_file);
61210 +#endif
61211
61212 /* execve succeeded */
61213 +
61214 + increment_exec_counter();
61215 current->fs->in_exec = 0;
61216 current->in_execve = 0;
61217 acct_update_integrals(current);
61218 @@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61219 put_files_struct(displaced);
61220 return retval;
61221
61222 +out_fail:
61223 +#ifdef CONFIG_GRKERNSEC
61224 + current->acl = old_acl;
61225 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61226 + fput(current->exec_file);
61227 + current->exec_file = old_exec_file;
61228 +#endif
61229 +
61230 out:
61231 if (bprm->mm) {
61232 acct_arg_size(bprm, 0);
61233 @@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61234 return compat_do_execve(getname(filename), argv, envp);
61235 }
61236 #endif
61237 +
61238 +int pax_check_flags(unsigned long *flags)
61239 +{
61240 + int retval = 0;
61241 +
61242 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61243 + if (*flags & MF_PAX_SEGMEXEC)
61244 + {
61245 + *flags &= ~MF_PAX_SEGMEXEC;
61246 + retval = -EINVAL;
61247 + }
61248 +#endif
61249 +
61250 + if ((*flags & MF_PAX_PAGEEXEC)
61251 +
61252 +#ifdef CONFIG_PAX_PAGEEXEC
61253 + && (*flags & MF_PAX_SEGMEXEC)
61254 +#endif
61255 +
61256 + )
61257 + {
61258 + *flags &= ~MF_PAX_PAGEEXEC;
61259 + retval = -EINVAL;
61260 + }
61261 +
61262 + if ((*flags & MF_PAX_MPROTECT)
61263 +
61264 +#ifdef CONFIG_PAX_MPROTECT
61265 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61266 +#endif
61267 +
61268 + )
61269 + {
61270 + *flags &= ~MF_PAX_MPROTECT;
61271 + retval = -EINVAL;
61272 + }
61273 +
61274 + if ((*flags & MF_PAX_EMUTRAMP)
61275 +
61276 +#ifdef CONFIG_PAX_EMUTRAMP
61277 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61278 +#endif
61279 +
61280 + )
61281 + {
61282 + *flags &= ~MF_PAX_EMUTRAMP;
61283 + retval = -EINVAL;
61284 + }
61285 +
61286 + return retval;
61287 +}
61288 +
61289 +EXPORT_SYMBOL(pax_check_flags);
61290 +
61291 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61292 +char *pax_get_path(const struct path *path, char *buf, int buflen)
61293 +{
61294 + char *pathname = d_path(path, buf, buflen);
61295 +
61296 + if (IS_ERR(pathname))
61297 + goto toolong;
61298 +
61299 + pathname = mangle_path(buf, pathname, "\t\n\\");
61300 + if (!pathname)
61301 + goto toolong;
61302 +
61303 + *pathname = 0;
61304 + return buf;
61305 +
61306 +toolong:
61307 + return "<path too long>";
61308 +}
61309 +EXPORT_SYMBOL(pax_get_path);
61310 +
61311 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61312 +{
61313 + struct task_struct *tsk = current;
61314 + struct mm_struct *mm = current->mm;
61315 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61316 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61317 + char *path_exec = NULL;
61318 + char *path_fault = NULL;
61319 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
61320 + siginfo_t info = { };
61321 +
61322 + if (buffer_exec && buffer_fault) {
61323 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61324 +
61325 + down_read(&mm->mmap_sem);
61326 + vma = mm->mmap;
61327 + while (vma && (!vma_exec || !vma_fault)) {
61328 + if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61329 + vma_exec = vma;
61330 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61331 + vma_fault = vma;
61332 + vma = vma->vm_next;
61333 + }
61334 + if (vma_exec)
61335 + path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61336 + if (vma_fault) {
61337 + start = vma_fault->vm_start;
61338 + end = vma_fault->vm_end;
61339 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61340 + if (vma_fault->vm_file)
61341 + path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61342 + else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61343 + path_fault = "<heap>";
61344 + else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61345 + path_fault = "<stack>";
61346 + else
61347 + path_fault = "<anonymous mapping>";
61348 + }
61349 + up_read(&mm->mmap_sem);
61350 + }
61351 + if (tsk->signal->curr_ip)
61352 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61353 + else
61354 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61355 + 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),
61356 + from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61357 + free_page((unsigned long)buffer_exec);
61358 + free_page((unsigned long)buffer_fault);
61359 + pax_report_insns(regs, pc, sp);
61360 + info.si_signo = SIGKILL;
61361 + info.si_errno = 0;
61362 + info.si_code = SI_KERNEL;
61363 + info.si_pid = 0;
61364 + info.si_uid = 0;
61365 + do_coredump(&info);
61366 +}
61367 +#endif
61368 +
61369 +#ifdef CONFIG_PAX_REFCOUNT
61370 +void pax_report_refcount_overflow(struct pt_regs *regs)
61371 +{
61372 + if (current->signal->curr_ip)
61373 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61374 + &current->signal->curr_ip, current->comm, task_pid_nr(current),
61375 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61376 + else
61377 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61378 + from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61379 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61380 + preempt_disable();
61381 + show_regs(regs);
61382 + preempt_enable();
61383 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61384 +}
61385 +#endif
61386 +
61387 +#ifdef CONFIG_PAX_USERCOPY
61388 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61389 +static noinline int check_stack_object(const void *obj, unsigned long len)
61390 +{
61391 + const void * const stack = task_stack_page(current);
61392 + const void * const stackend = stack + THREAD_SIZE;
61393 +
61394 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61395 + const void *frame = NULL;
61396 + const void *oldframe;
61397 +#endif
61398 +
61399 + if (obj + len < obj)
61400 + return -1;
61401 +
61402 + if (obj + len <= stack || stackend <= obj)
61403 + return 0;
61404 +
61405 + if (obj < stack || stackend < obj + len)
61406 + return -1;
61407 +
61408 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61409 + oldframe = __builtin_frame_address(1);
61410 + if (oldframe)
61411 + frame = __builtin_frame_address(2);
61412 + /*
61413 + low ----------------------------------------------> high
61414 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
61415 + ^----------------^
61416 + allow copies only within here
61417 + */
61418 + while (stack <= frame && frame < stackend) {
61419 + /* if obj + len extends past the last frame, this
61420 + check won't pass and the next frame will be 0,
61421 + causing us to bail out and correctly report
61422 + the copy as invalid
61423 + */
61424 + if (obj + len <= frame)
61425 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61426 + oldframe = frame;
61427 + frame = *(const void * const *)frame;
61428 + }
61429 + return -1;
61430 +#else
61431 + return 1;
61432 +#endif
61433 +}
61434 +
61435 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61436 +{
61437 + if (current->signal->curr_ip)
61438 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61439 + &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61440 + else
61441 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61442 + to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61443 + dump_stack();
61444 + gr_handle_kernel_exploit();
61445 + do_group_exit(SIGKILL);
61446 +}
61447 +#endif
61448 +
61449 +#ifdef CONFIG_PAX_USERCOPY
61450 +
61451 +static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61452 +{
61453 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61454 + unsigned long textlow = ktla_ktva((unsigned long)_stext);
61455 +#ifdef CONFIG_MODULES
61456 + unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61457 +#else
61458 + unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61459 +#endif
61460 +
61461 +#else
61462 + unsigned long textlow = (unsigned long)_stext;
61463 + unsigned long texthigh = (unsigned long)_etext;
61464 +
61465 +#ifdef CONFIG_X86_64
61466 + /* check against linear mapping as well */
61467 + if (high > (unsigned long)__va(__pa(textlow)) &&
61468 + low < (unsigned long)__va(__pa(texthigh)))
61469 + return true;
61470 +#endif
61471 +
61472 +#endif
61473 +
61474 + if (high <= textlow || low >= texthigh)
61475 + return false;
61476 + else
61477 + return true;
61478 +}
61479 +#endif
61480 +
61481 +void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61482 +{
61483 +#ifdef CONFIG_PAX_USERCOPY
61484 + const char *type;
61485 +#endif
61486 +
61487 +#ifndef CONFIG_STACK_GROWSUP
61488 + unsigned long stackstart = (unsigned long)task_stack_page(current);
61489 + unsigned long currentsp = (unsigned long)&stackstart;
61490 + if (unlikely((currentsp < stackstart + 512 ||
61491 + currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61492 + BUG();
61493 +#endif
61494 +
61495 +#ifndef CONFIG_PAX_USERCOPY_DEBUG
61496 + if (const_size)
61497 + return;
61498 +#endif
61499 +
61500 +#ifdef CONFIG_PAX_USERCOPY
61501 + if (!n)
61502 + return;
61503 +
61504 + type = check_heap_object(ptr, n);
61505 + if (!type) {
61506 + int ret = check_stack_object(ptr, n);
61507 + if (ret == 1 || ret == 2)
61508 + return;
61509 + if (ret == 0) {
61510 + if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61511 + type = "<kernel text>";
61512 + else
61513 + return;
61514 + } else
61515 + type = "<process stack>";
61516 + }
61517 +
61518 + pax_report_usercopy(ptr, n, to_user, type);
61519 +#endif
61520 +
61521 +}
61522 +EXPORT_SYMBOL(__check_object_size);
61523 +
61524 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61525 +void pax_track_stack(void)
61526 +{
61527 + unsigned long sp = (unsigned long)&sp;
61528 + if (sp < current_thread_info()->lowest_stack &&
61529 + sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
61530 + current_thread_info()->lowest_stack = sp;
61531 + if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61532 + BUG();
61533 +}
61534 +EXPORT_SYMBOL(pax_track_stack);
61535 +#endif
61536 +
61537 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
61538 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61539 +{
61540 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61541 + dump_stack();
61542 + do_group_exit(SIGKILL);
61543 +}
61544 +EXPORT_SYMBOL(report_size_overflow);
61545 +#endif
61546 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61547 index 9f9992b..8b59411 100644
61548 --- a/fs/ext2/balloc.c
61549 +++ b/fs/ext2/balloc.c
61550 @@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61551
61552 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61553 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61554 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61555 + if (free_blocks < root_blocks + 1 &&
61556 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61557 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61558 - !in_group_p (sbi->s_resgid))) {
61559 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61560 return 0;
61561 }
61562 return 1;
61563 diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61564 index 170dc41..62f6b18 100644
61565 --- a/fs/ext2/super.c
61566 +++ b/fs/ext2/super.c
61567 @@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61568 #ifdef CONFIG_EXT2_FS_XATTR
61569 if (test_opt(sb, XATTR_USER))
61570 seq_puts(seq, ",user_xattr");
61571 - if (!test_opt(sb, XATTR_USER) &&
61572 - (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61573 + if (!test_opt(sb, XATTR_USER))
61574 seq_puts(seq, ",nouser_xattr");
61575 - }
61576 #endif
61577
61578 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61579 @@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61580 if (def_mount_opts & EXT2_DEFM_UID16)
61581 set_opt(sbi->s_mount_opt, NO_UID32);
61582 #ifdef CONFIG_EXT2_FS_XATTR
61583 - if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61584 - set_opt(sbi->s_mount_opt, XATTR_USER);
61585 + /* always enable user xattrs */
61586 + set_opt(sbi->s_mount_opt, XATTR_USER);
61587 #endif
61588 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61589 if (def_mount_opts & EXT2_DEFM_ACL)
61590 diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61591 index 9142614..97484fa 100644
61592 --- a/fs/ext2/xattr.c
61593 +++ b/fs/ext2/xattr.c
61594 @@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61595 struct buffer_head *bh = NULL;
61596 struct ext2_xattr_entry *entry;
61597 char *end;
61598 - size_t rest = buffer_size;
61599 + size_t rest = buffer_size, total_size = 0;
61600 int error;
61601
61602 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61603 @@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61604 buffer += size;
61605 }
61606 rest -= size;
61607 + total_size += size;
61608 }
61609 }
61610 - error = buffer_size - rest; /* total size */
61611 + error = total_size;
61612
61613 cleanup:
61614 brelse(bh);
61615 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61616 index 158b5d4..2432610 100644
61617 --- a/fs/ext3/balloc.c
61618 +++ b/fs/ext3/balloc.c
61619 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61620
61621 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61622 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61623 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61624 + if (free_blocks < root_blocks + 1 &&
61625 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61626 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61627 - !in_group_p (sbi->s_resgid))) {
61628 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61629 return 0;
61630 }
61631 return 1;
61632 diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61633 index eb742d0..c19f705 100644
61634 --- a/fs/ext3/super.c
61635 +++ b/fs/ext3/super.c
61636 @@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61637 #ifdef CONFIG_EXT3_FS_XATTR
61638 if (test_opt(sb, XATTR_USER))
61639 seq_puts(seq, ",user_xattr");
61640 - if (!test_opt(sb, XATTR_USER) &&
61641 - (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61642 + if (!test_opt(sb, XATTR_USER))
61643 seq_puts(seq, ",nouser_xattr");
61644 - }
61645 #endif
61646 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61647 if (test_opt(sb, POSIX_ACL))
61648 @@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61649 if (def_mount_opts & EXT3_DEFM_UID16)
61650 set_opt(sbi->s_mount_opt, NO_UID32);
61651 #ifdef CONFIG_EXT3_FS_XATTR
61652 - if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61653 - set_opt(sbi->s_mount_opt, XATTR_USER);
61654 + /* always enable user xattrs */
61655 + set_opt(sbi->s_mount_opt, XATTR_USER);
61656 #endif
61657 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61658 if (def_mount_opts & EXT3_DEFM_ACL)
61659 diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61660 index c6874be..f8a6ae8 100644
61661 --- a/fs/ext3/xattr.c
61662 +++ b/fs/ext3/xattr.c
61663 @@ -330,7 +330,7 @@ static int
61664 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61665 char *buffer, size_t buffer_size)
61666 {
61667 - size_t rest = buffer_size;
61668 + size_t rest = buffer_size, total_size = 0;
61669
61670 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61671 const struct xattr_handler *handler =
61672 @@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61673 buffer += size;
61674 }
61675 rest -= size;
61676 + total_size += size;
61677 }
61678 }
61679 - return buffer_size - rest;
61680 + return total_size;
61681 }
61682
61683 static int
61684 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61685 index 83a6f49..d4e4d03 100644
61686 --- a/fs/ext4/balloc.c
61687 +++ b/fs/ext4/balloc.c
61688 @@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61689 /* Hm, nope. Are (enough) root reserved clusters available? */
61690 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61691 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61692 - capable(CAP_SYS_RESOURCE) ||
61693 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61694 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61695 + capable_nolog(CAP_SYS_RESOURCE)) {
61696
61697 if (free_clusters >= (nclusters + dirty_clusters +
61698 resv_clusters))
61699 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61700 index c55a1fa..9904ebb 100644
61701 --- a/fs/ext4/ext4.h
61702 +++ b/fs/ext4/ext4.h
61703 @@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61704 unsigned long s_mb_last_start;
61705
61706 /* stats for buddy allocator */
61707 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61708 - atomic_t s_bal_success; /* we found long enough chunks */
61709 - atomic_t s_bal_allocated; /* in blocks */
61710 - atomic_t s_bal_ex_scanned; /* total extents scanned */
61711 - atomic_t s_bal_goals; /* goal hits */
61712 - atomic_t s_bal_breaks; /* too long searches */
61713 - atomic_t s_bal_2orders; /* 2^order hits */
61714 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61715 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61716 + atomic_unchecked_t s_bal_allocated; /* in blocks */
61717 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61718 + atomic_unchecked_t s_bal_goals; /* goal hits */
61719 + atomic_unchecked_t s_bal_breaks; /* too long searches */
61720 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61721 spinlock_t s_bal_lock;
61722 unsigned long s_mb_buddies_generated;
61723 unsigned long long s_mb_generation_time;
61724 - atomic_t s_mb_lost_chunks;
61725 - atomic_t s_mb_preallocated;
61726 - atomic_t s_mb_discarded;
61727 + atomic_unchecked_t s_mb_lost_chunks;
61728 + atomic_unchecked_t s_mb_preallocated;
61729 + atomic_unchecked_t s_mb_discarded;
61730 atomic_t s_lock_busy;
61731
61732 /* locality groups */
61733 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61734 index dbfe15c..9a6ee8d 100644
61735 --- a/fs/ext4/mballoc.c
61736 +++ b/fs/ext4/mballoc.c
61737 @@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61738 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61739
61740 if (EXT4_SB(sb)->s_mb_stats)
61741 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61742 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61743
61744 break;
61745 }
61746 @@ -2211,7 +2211,7 @@ repeat:
61747 ac->ac_status = AC_STATUS_CONTINUE;
61748 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61749 cr = 3;
61750 - atomic_inc(&sbi->s_mb_lost_chunks);
61751 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61752 goto repeat;
61753 }
61754 }
61755 @@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61756 if (sbi->s_mb_stats) {
61757 ext4_msg(sb, KERN_INFO,
61758 "mballoc: %u blocks %u reqs (%u success)",
61759 - atomic_read(&sbi->s_bal_allocated),
61760 - atomic_read(&sbi->s_bal_reqs),
61761 - atomic_read(&sbi->s_bal_success));
61762 + atomic_read_unchecked(&sbi->s_bal_allocated),
61763 + atomic_read_unchecked(&sbi->s_bal_reqs),
61764 + atomic_read_unchecked(&sbi->s_bal_success));
61765 ext4_msg(sb, KERN_INFO,
61766 "mballoc: %u extents scanned, %u goal hits, "
61767 "%u 2^N hits, %u breaks, %u lost",
61768 - atomic_read(&sbi->s_bal_ex_scanned),
61769 - atomic_read(&sbi->s_bal_goals),
61770 - atomic_read(&sbi->s_bal_2orders),
61771 - atomic_read(&sbi->s_bal_breaks),
61772 - atomic_read(&sbi->s_mb_lost_chunks));
61773 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61774 + atomic_read_unchecked(&sbi->s_bal_goals),
61775 + atomic_read_unchecked(&sbi->s_bal_2orders),
61776 + atomic_read_unchecked(&sbi->s_bal_breaks),
61777 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61778 ext4_msg(sb, KERN_INFO,
61779 "mballoc: %lu generated and it took %Lu",
61780 sbi->s_mb_buddies_generated,
61781 sbi->s_mb_generation_time);
61782 ext4_msg(sb, KERN_INFO,
61783 "mballoc: %u preallocated, %u discarded",
61784 - atomic_read(&sbi->s_mb_preallocated),
61785 - atomic_read(&sbi->s_mb_discarded));
61786 + atomic_read_unchecked(&sbi->s_mb_preallocated),
61787 + atomic_read_unchecked(&sbi->s_mb_discarded));
61788 }
61789
61790 free_percpu(sbi->s_locality_groups);
61791 @@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61792 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61793
61794 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61795 - atomic_inc(&sbi->s_bal_reqs);
61796 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61797 + atomic_inc_unchecked(&sbi->s_bal_reqs);
61798 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61799 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61800 - atomic_inc(&sbi->s_bal_success);
61801 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61802 + atomic_inc_unchecked(&sbi->s_bal_success);
61803 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61804 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61805 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61806 - atomic_inc(&sbi->s_bal_goals);
61807 + atomic_inc_unchecked(&sbi->s_bal_goals);
61808 if (ac->ac_found > sbi->s_mb_max_to_scan)
61809 - atomic_inc(&sbi->s_bal_breaks);
61810 + atomic_inc_unchecked(&sbi->s_bal_breaks);
61811 }
61812
61813 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61814 @@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61815 trace_ext4_mb_new_inode_pa(ac, pa);
61816
61817 ext4_mb_use_inode_pa(ac, pa);
61818 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61819 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61820
61821 ei = EXT4_I(ac->ac_inode);
61822 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61823 @@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61824 trace_ext4_mb_new_group_pa(ac, pa);
61825
61826 ext4_mb_use_group_pa(ac, pa);
61827 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61828 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61829
61830 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61831 lg = ac->ac_lg;
61832 @@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61833 * from the bitmap and continue.
61834 */
61835 }
61836 - atomic_add(free, &sbi->s_mb_discarded);
61837 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
61838
61839 return err;
61840 }
61841 @@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61842 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61843 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61844 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61845 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61846 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61847 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61848
61849 return 0;
61850 diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61851 index 8313ca3..8a37d08 100644
61852 --- a/fs/ext4/mmp.c
61853 +++ b/fs/ext4/mmp.c
61854 @@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61855 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61856 const char *function, unsigned int line, const char *msg)
61857 {
61858 - __ext4_warning(sb, function, line, msg);
61859 + __ext4_warning(sb, function, line, "%s", msg);
61860 __ext4_warning(sb, function, line,
61861 "MMP failure info: last update time: %llu, last update "
61862 "node: %s, last update device: %s\n",
61863 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61864 index 2c9e686..6a40edc 100644
61865 --- a/fs/ext4/super.c
61866 +++ b/fs/ext4/super.c
61867 @@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61868 }
61869
61870 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61871 -static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61872 +static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61873 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61874
61875 #ifdef CONFIG_QUOTA
61876 @@ -2434,7 +2434,7 @@ struct ext4_attr {
61877 int offset;
61878 int deprecated_val;
61879 } u;
61880 -};
61881 +} __do_const;
61882
61883 static int parse_strtoull(const char *buf,
61884 unsigned long long max, unsigned long long *value)
61885 diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61886 index 1e09fc7..0400dd4 100644
61887 --- a/fs/ext4/xattr.c
61888 +++ b/fs/ext4/xattr.c
61889 @@ -399,7 +399,7 @@ static int
61890 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61891 char *buffer, size_t buffer_size)
61892 {
61893 - size_t rest = buffer_size;
61894 + size_t rest = buffer_size, total_size = 0;
61895
61896 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61897 const struct xattr_handler *handler =
61898 @@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61899 buffer += size;
61900 }
61901 rest -= size;
61902 + total_size += size;
61903 }
61904 }
61905 - return buffer_size - rest;
61906 + return total_size;
61907 }
61908
61909 static int
61910 diff --git a/fs/fcntl.c b/fs/fcntl.c
61911 index 99d440a..eb979d1 100644
61912 --- a/fs/fcntl.c
61913 +++ b/fs/fcntl.c
61914 @@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61915 int force)
61916 {
61917 security_file_set_fowner(filp);
61918 + if (gr_handle_chroot_fowner(pid, type))
61919 + return;
61920 + if (gr_check_protected_task_fowner(pid, type))
61921 + return;
61922 f_modown(filp, pid, type, force);
61923 }
61924 EXPORT_SYMBOL(__f_setown);
61925 diff --git a/fs/fhandle.c b/fs/fhandle.c
61926 index 999ff5c..ac037c9 100644
61927 --- a/fs/fhandle.c
61928 +++ b/fs/fhandle.c
61929 @@ -8,6 +8,7 @@
61930 #include <linux/fs_struct.h>
61931 #include <linux/fsnotify.h>
61932 #include <linux/personality.h>
61933 +#include <linux/grsecurity.h>
61934 #include <asm/uaccess.h>
61935 #include "internal.h"
61936 #include "mount.h"
61937 @@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
61938 } else
61939 retval = 0;
61940 /* copy the mount id */
61941 - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
61942 - sizeof(*mnt_id)) ||
61943 + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
61944 copy_to_user(ufh, handle,
61945 sizeof(struct file_handle) + handle_bytes))
61946 retval = -EFAULT;
61947 @@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
61948 * the directory. Ideally we would like CAP_DAC_SEARCH.
61949 * But we don't have that
61950 */
61951 - if (!capable(CAP_DAC_READ_SEARCH)) {
61952 + if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
61953 retval = -EPERM;
61954 goto out_err;
61955 }
61956 diff --git a/fs/file.c b/fs/file.c
61957 index ab3eb6a..8de2392 100644
61958 --- a/fs/file.c
61959 +++ b/fs/file.c
61960 @@ -16,6 +16,7 @@
61961 #include <linux/slab.h>
61962 #include <linux/vmalloc.h>
61963 #include <linux/file.h>
61964 +#include <linux/security.h>
61965 #include <linux/fdtable.h>
61966 #include <linux/bitops.h>
61967 #include <linux/interrupt.h>
61968 @@ -139,7 +140,7 @@ out:
61969 * Return <0 error code on error; 1 on successful completion.
61970 * The files->file_lock should be held on entry, and will be held on exit.
61971 */
61972 -static int expand_fdtable(struct files_struct *files, int nr)
61973 +static int expand_fdtable(struct files_struct *files, unsigned int nr)
61974 __releases(files->file_lock)
61975 __acquires(files->file_lock)
61976 {
61977 @@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
61978 * expanded and execution may have blocked.
61979 * The files->file_lock should be held on entry, and will be held on exit.
61980 */
61981 -static int expand_files(struct files_struct *files, int nr)
61982 +static int expand_files(struct files_struct *files, unsigned int nr)
61983 {
61984 struct fdtable *fdt;
61985
61986 @@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
61987 if (!file)
61988 return __close_fd(files, fd);
61989
61990 + gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
61991 if (fd >= rlimit(RLIMIT_NOFILE))
61992 return -EBADF;
61993
61994 @@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
61995 if (unlikely(oldfd == newfd))
61996 return -EINVAL;
61997
61998 + gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
61999 if (newfd >= rlimit(RLIMIT_NOFILE))
62000 return -EBADF;
62001
62002 @@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
62003 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
62004 {
62005 int err;
62006 + gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
62007 if (from >= rlimit(RLIMIT_NOFILE))
62008 return -EINVAL;
62009 err = alloc_fd(from, flags);
62010 diff --git a/fs/filesystems.c b/fs/filesystems.c
62011 index 5797d45..7d7d79a 100644
62012 --- a/fs/filesystems.c
62013 +++ b/fs/filesystems.c
62014 @@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
62015 int len = dot ? dot - name : strlen(name);
62016
62017 fs = __get_fs_type(name, len);
62018 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
62019 + if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
62020 +#else
62021 if (!fs && (request_module("fs-%.*s", len, name) == 0))
62022 +#endif
62023 fs = __get_fs_type(name, len);
62024
62025 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
62026 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
62027 index 7dca743..543d620 100644
62028 --- a/fs/fs_struct.c
62029 +++ b/fs/fs_struct.c
62030 @@ -4,6 +4,7 @@
62031 #include <linux/path.h>
62032 #include <linux/slab.h>
62033 #include <linux/fs_struct.h>
62034 +#include <linux/grsecurity.h>
62035 #include "internal.h"
62036
62037 /*
62038 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
62039 write_seqcount_begin(&fs->seq);
62040 old_root = fs->root;
62041 fs->root = *path;
62042 + gr_set_chroot_entries(current, path);
62043 write_seqcount_end(&fs->seq);
62044 spin_unlock(&fs->lock);
62045 if (old_root.dentry)
62046 @@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62047 int hits = 0;
62048 spin_lock(&fs->lock);
62049 write_seqcount_begin(&fs->seq);
62050 + /* this root replacement is only done by pivot_root,
62051 + leave grsec's chroot tagging alone for this task
62052 + so that a pivoted root isn't treated as a chroot
62053 + */
62054 hits += replace_path(&fs->root, old_root, new_root);
62055 hits += replace_path(&fs->pwd, old_root, new_root);
62056 write_seqcount_end(&fs->seq);
62057 @@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
62058 task_lock(tsk);
62059 spin_lock(&fs->lock);
62060 tsk->fs = NULL;
62061 - kill = !--fs->users;
62062 + gr_clear_chroot_entries(tsk);
62063 + kill = !atomic_dec_return(&fs->users);
62064 spin_unlock(&fs->lock);
62065 task_unlock(tsk);
62066 if (kill)
62067 @@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62068 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
62069 /* We don't need to lock fs - think why ;-) */
62070 if (fs) {
62071 - fs->users = 1;
62072 + atomic_set(&fs->users, 1);
62073 fs->in_exec = 0;
62074 spin_lock_init(&fs->lock);
62075 seqcount_init(&fs->seq);
62076 @@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62077 spin_lock(&old->lock);
62078 fs->root = old->root;
62079 path_get(&fs->root);
62080 + /* instead of calling gr_set_chroot_entries here,
62081 + we call it from every caller of this function
62082 + */
62083 fs->pwd = old->pwd;
62084 path_get(&fs->pwd);
62085 spin_unlock(&old->lock);
62086 @@ -139,8 +149,9 @@ int unshare_fs_struct(void)
62087
62088 task_lock(current);
62089 spin_lock(&fs->lock);
62090 - kill = !--fs->users;
62091 + kill = !atomic_dec_return(&fs->users);
62092 current->fs = new_fs;
62093 + gr_set_chroot_entries(current, &new_fs->root);
62094 spin_unlock(&fs->lock);
62095 task_unlock(current);
62096
62097 @@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
62098
62099 int current_umask(void)
62100 {
62101 - return current->fs->umask;
62102 + return current->fs->umask | gr_acl_umask();
62103 }
62104 EXPORT_SYMBOL(current_umask);
62105
62106 /* to be mentioned only in INIT_TASK */
62107 struct fs_struct init_fs = {
62108 - .users = 1,
62109 + .users = ATOMIC_INIT(1),
62110 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
62111 .seq = SEQCNT_ZERO(init_fs.seq),
62112 .umask = 0022,
62113 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
62114 index 89acec7..a575262 100644
62115 --- a/fs/fscache/cookie.c
62116 +++ b/fs/fscache/cookie.c
62117 @@ -19,7 +19,7 @@
62118
62119 struct kmem_cache *fscache_cookie_jar;
62120
62121 -static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
62122 +static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
62123
62124 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
62125 static int fscache_alloc_object(struct fscache_cache *cache,
62126 @@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62127 parent ? (char *) parent->def->name : "<no-parent>",
62128 def->name, netfs_data, enable);
62129
62130 - fscache_stat(&fscache_n_acquires);
62131 + fscache_stat_unchecked(&fscache_n_acquires);
62132
62133 /* if there's no parent cookie, then we don't create one here either */
62134 if (!parent) {
62135 - fscache_stat(&fscache_n_acquires_null);
62136 + fscache_stat_unchecked(&fscache_n_acquires_null);
62137 _leave(" [no parent]");
62138 return NULL;
62139 }
62140 @@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62141 /* allocate and initialise a cookie */
62142 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62143 if (!cookie) {
62144 - fscache_stat(&fscache_n_acquires_oom);
62145 + fscache_stat_unchecked(&fscache_n_acquires_oom);
62146 _leave(" [ENOMEM]");
62147 return NULL;
62148 }
62149 @@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62150
62151 switch (cookie->def->type) {
62152 case FSCACHE_COOKIE_TYPE_INDEX:
62153 - fscache_stat(&fscache_n_cookie_index);
62154 + fscache_stat_unchecked(&fscache_n_cookie_index);
62155 break;
62156 case FSCACHE_COOKIE_TYPE_DATAFILE:
62157 - fscache_stat(&fscache_n_cookie_data);
62158 + fscache_stat_unchecked(&fscache_n_cookie_data);
62159 break;
62160 default:
62161 - fscache_stat(&fscache_n_cookie_special);
62162 + fscache_stat_unchecked(&fscache_n_cookie_special);
62163 break;
62164 }
62165
62166 @@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62167 } else {
62168 atomic_dec(&parent->n_children);
62169 __fscache_cookie_put(cookie);
62170 - fscache_stat(&fscache_n_acquires_nobufs);
62171 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62172 _leave(" = NULL");
62173 return NULL;
62174 }
62175 @@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62176 }
62177 }
62178
62179 - fscache_stat(&fscache_n_acquires_ok);
62180 + fscache_stat_unchecked(&fscache_n_acquires_ok);
62181 _leave(" = %p", cookie);
62182 return cookie;
62183 }
62184 @@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62185 cache = fscache_select_cache_for_object(cookie->parent);
62186 if (!cache) {
62187 up_read(&fscache_addremove_sem);
62188 - fscache_stat(&fscache_n_acquires_no_cache);
62189 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62190 _leave(" = -ENOMEDIUM [no cache]");
62191 return -ENOMEDIUM;
62192 }
62193 @@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62194 object = cache->ops->alloc_object(cache, cookie);
62195 fscache_stat_d(&fscache_n_cop_alloc_object);
62196 if (IS_ERR(object)) {
62197 - fscache_stat(&fscache_n_object_no_alloc);
62198 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
62199 ret = PTR_ERR(object);
62200 goto error;
62201 }
62202
62203 - fscache_stat(&fscache_n_object_alloc);
62204 + fscache_stat_unchecked(&fscache_n_object_alloc);
62205
62206 - object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62207 + object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62208
62209 _debug("ALLOC OBJ%x: %s {%lx}",
62210 object->debug_id, cookie->def->name, object->events);
62211 @@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62212
62213 _enter("{%s}", cookie->def->name);
62214
62215 - fscache_stat(&fscache_n_invalidates);
62216 + fscache_stat_unchecked(&fscache_n_invalidates);
62217
62218 /* Only permit invalidation of data files. Invalidating an index will
62219 * require the caller to release all its attachments to the tree rooted
62220 @@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62221 {
62222 struct fscache_object *object;
62223
62224 - fscache_stat(&fscache_n_updates);
62225 + fscache_stat_unchecked(&fscache_n_updates);
62226
62227 if (!cookie) {
62228 - fscache_stat(&fscache_n_updates_null);
62229 + fscache_stat_unchecked(&fscache_n_updates_null);
62230 _leave(" [no cookie]");
62231 return;
62232 }
62233 @@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62234 */
62235 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62236 {
62237 - fscache_stat(&fscache_n_relinquishes);
62238 + fscache_stat_unchecked(&fscache_n_relinquishes);
62239 if (retire)
62240 - fscache_stat(&fscache_n_relinquishes_retire);
62241 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62242
62243 if (!cookie) {
62244 - fscache_stat(&fscache_n_relinquishes_null);
62245 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
62246 _leave(" [no cookie]");
62247 return;
62248 }
62249 @@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62250 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62251 goto inconsistent;
62252
62253 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62254 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62255
62256 __fscache_use_cookie(cookie);
62257 if (fscache_submit_op(object, op) < 0)
62258 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62259 index 7872a62..d91b19f 100644
62260 --- a/fs/fscache/internal.h
62261 +++ b/fs/fscache/internal.h
62262 @@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62263 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62264 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62265 struct fscache_operation *,
62266 - atomic_t *,
62267 - atomic_t *,
62268 + atomic_unchecked_t *,
62269 + atomic_unchecked_t *,
62270 void (*)(struct fscache_operation *));
62271 extern void fscache_invalidate_writes(struct fscache_cookie *);
62272
62273 @@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62274 * stats.c
62275 */
62276 #ifdef CONFIG_FSCACHE_STATS
62277 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62278 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62279 +extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62280 +extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62281
62282 -extern atomic_t fscache_n_op_pend;
62283 -extern atomic_t fscache_n_op_run;
62284 -extern atomic_t fscache_n_op_enqueue;
62285 -extern atomic_t fscache_n_op_deferred_release;
62286 -extern atomic_t fscache_n_op_release;
62287 -extern atomic_t fscache_n_op_gc;
62288 -extern atomic_t fscache_n_op_cancelled;
62289 -extern atomic_t fscache_n_op_rejected;
62290 +extern atomic_unchecked_t fscache_n_op_pend;
62291 +extern atomic_unchecked_t fscache_n_op_run;
62292 +extern atomic_unchecked_t fscache_n_op_enqueue;
62293 +extern atomic_unchecked_t fscache_n_op_deferred_release;
62294 +extern atomic_unchecked_t fscache_n_op_release;
62295 +extern atomic_unchecked_t fscache_n_op_gc;
62296 +extern atomic_unchecked_t fscache_n_op_cancelled;
62297 +extern atomic_unchecked_t fscache_n_op_rejected;
62298
62299 -extern atomic_t fscache_n_attr_changed;
62300 -extern atomic_t fscache_n_attr_changed_ok;
62301 -extern atomic_t fscache_n_attr_changed_nobufs;
62302 -extern atomic_t fscache_n_attr_changed_nomem;
62303 -extern atomic_t fscache_n_attr_changed_calls;
62304 +extern atomic_unchecked_t fscache_n_attr_changed;
62305 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
62306 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62307 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62308 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
62309
62310 -extern atomic_t fscache_n_allocs;
62311 -extern atomic_t fscache_n_allocs_ok;
62312 -extern atomic_t fscache_n_allocs_wait;
62313 -extern atomic_t fscache_n_allocs_nobufs;
62314 -extern atomic_t fscache_n_allocs_intr;
62315 -extern atomic_t fscache_n_allocs_object_dead;
62316 -extern atomic_t fscache_n_alloc_ops;
62317 -extern atomic_t fscache_n_alloc_op_waits;
62318 +extern atomic_unchecked_t fscache_n_allocs;
62319 +extern atomic_unchecked_t fscache_n_allocs_ok;
62320 +extern atomic_unchecked_t fscache_n_allocs_wait;
62321 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
62322 +extern atomic_unchecked_t fscache_n_allocs_intr;
62323 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
62324 +extern atomic_unchecked_t fscache_n_alloc_ops;
62325 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
62326
62327 -extern atomic_t fscache_n_retrievals;
62328 -extern atomic_t fscache_n_retrievals_ok;
62329 -extern atomic_t fscache_n_retrievals_wait;
62330 -extern atomic_t fscache_n_retrievals_nodata;
62331 -extern atomic_t fscache_n_retrievals_nobufs;
62332 -extern atomic_t fscache_n_retrievals_intr;
62333 -extern atomic_t fscache_n_retrievals_nomem;
62334 -extern atomic_t fscache_n_retrievals_object_dead;
62335 -extern atomic_t fscache_n_retrieval_ops;
62336 -extern atomic_t fscache_n_retrieval_op_waits;
62337 +extern atomic_unchecked_t fscache_n_retrievals;
62338 +extern atomic_unchecked_t fscache_n_retrievals_ok;
62339 +extern atomic_unchecked_t fscache_n_retrievals_wait;
62340 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
62341 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62342 +extern atomic_unchecked_t fscache_n_retrievals_intr;
62343 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
62344 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62345 +extern atomic_unchecked_t fscache_n_retrieval_ops;
62346 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62347
62348 -extern atomic_t fscache_n_stores;
62349 -extern atomic_t fscache_n_stores_ok;
62350 -extern atomic_t fscache_n_stores_again;
62351 -extern atomic_t fscache_n_stores_nobufs;
62352 -extern atomic_t fscache_n_stores_oom;
62353 -extern atomic_t fscache_n_store_ops;
62354 -extern atomic_t fscache_n_store_calls;
62355 -extern atomic_t fscache_n_store_pages;
62356 -extern atomic_t fscache_n_store_radix_deletes;
62357 -extern atomic_t fscache_n_store_pages_over_limit;
62358 +extern atomic_unchecked_t fscache_n_stores;
62359 +extern atomic_unchecked_t fscache_n_stores_ok;
62360 +extern atomic_unchecked_t fscache_n_stores_again;
62361 +extern atomic_unchecked_t fscache_n_stores_nobufs;
62362 +extern atomic_unchecked_t fscache_n_stores_oom;
62363 +extern atomic_unchecked_t fscache_n_store_ops;
62364 +extern atomic_unchecked_t fscache_n_store_calls;
62365 +extern atomic_unchecked_t fscache_n_store_pages;
62366 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
62367 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62368
62369 -extern atomic_t fscache_n_store_vmscan_not_storing;
62370 -extern atomic_t fscache_n_store_vmscan_gone;
62371 -extern atomic_t fscache_n_store_vmscan_busy;
62372 -extern atomic_t fscache_n_store_vmscan_cancelled;
62373 -extern atomic_t fscache_n_store_vmscan_wait;
62374 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62375 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62376 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62377 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62378 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62379
62380 -extern atomic_t fscache_n_marks;
62381 -extern atomic_t fscache_n_uncaches;
62382 +extern atomic_unchecked_t fscache_n_marks;
62383 +extern atomic_unchecked_t fscache_n_uncaches;
62384
62385 -extern atomic_t fscache_n_acquires;
62386 -extern atomic_t fscache_n_acquires_null;
62387 -extern atomic_t fscache_n_acquires_no_cache;
62388 -extern atomic_t fscache_n_acquires_ok;
62389 -extern atomic_t fscache_n_acquires_nobufs;
62390 -extern atomic_t fscache_n_acquires_oom;
62391 +extern atomic_unchecked_t fscache_n_acquires;
62392 +extern atomic_unchecked_t fscache_n_acquires_null;
62393 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
62394 +extern atomic_unchecked_t fscache_n_acquires_ok;
62395 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
62396 +extern atomic_unchecked_t fscache_n_acquires_oom;
62397
62398 -extern atomic_t fscache_n_invalidates;
62399 -extern atomic_t fscache_n_invalidates_run;
62400 +extern atomic_unchecked_t fscache_n_invalidates;
62401 +extern atomic_unchecked_t fscache_n_invalidates_run;
62402
62403 -extern atomic_t fscache_n_updates;
62404 -extern atomic_t fscache_n_updates_null;
62405 -extern atomic_t fscache_n_updates_run;
62406 +extern atomic_unchecked_t fscache_n_updates;
62407 +extern atomic_unchecked_t fscache_n_updates_null;
62408 +extern atomic_unchecked_t fscache_n_updates_run;
62409
62410 -extern atomic_t fscache_n_relinquishes;
62411 -extern atomic_t fscache_n_relinquishes_null;
62412 -extern atomic_t fscache_n_relinquishes_waitcrt;
62413 -extern atomic_t fscache_n_relinquishes_retire;
62414 +extern atomic_unchecked_t fscache_n_relinquishes;
62415 +extern atomic_unchecked_t fscache_n_relinquishes_null;
62416 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62417 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
62418
62419 -extern atomic_t fscache_n_cookie_index;
62420 -extern atomic_t fscache_n_cookie_data;
62421 -extern atomic_t fscache_n_cookie_special;
62422 +extern atomic_unchecked_t fscache_n_cookie_index;
62423 +extern atomic_unchecked_t fscache_n_cookie_data;
62424 +extern atomic_unchecked_t fscache_n_cookie_special;
62425
62426 -extern atomic_t fscache_n_object_alloc;
62427 -extern atomic_t fscache_n_object_no_alloc;
62428 -extern atomic_t fscache_n_object_lookups;
62429 -extern atomic_t fscache_n_object_lookups_negative;
62430 -extern atomic_t fscache_n_object_lookups_positive;
62431 -extern atomic_t fscache_n_object_lookups_timed_out;
62432 -extern atomic_t fscache_n_object_created;
62433 -extern atomic_t fscache_n_object_avail;
62434 -extern atomic_t fscache_n_object_dead;
62435 +extern atomic_unchecked_t fscache_n_object_alloc;
62436 +extern atomic_unchecked_t fscache_n_object_no_alloc;
62437 +extern atomic_unchecked_t fscache_n_object_lookups;
62438 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
62439 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
62440 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62441 +extern atomic_unchecked_t fscache_n_object_created;
62442 +extern atomic_unchecked_t fscache_n_object_avail;
62443 +extern atomic_unchecked_t fscache_n_object_dead;
62444
62445 -extern atomic_t fscache_n_checkaux_none;
62446 -extern atomic_t fscache_n_checkaux_okay;
62447 -extern atomic_t fscache_n_checkaux_update;
62448 -extern atomic_t fscache_n_checkaux_obsolete;
62449 +extern atomic_unchecked_t fscache_n_checkaux_none;
62450 +extern atomic_unchecked_t fscache_n_checkaux_okay;
62451 +extern atomic_unchecked_t fscache_n_checkaux_update;
62452 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62453
62454 extern atomic_t fscache_n_cop_alloc_object;
62455 extern atomic_t fscache_n_cop_lookup_object;
62456 @@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62457 atomic_inc(stat);
62458 }
62459
62460 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62461 +{
62462 + atomic_inc_unchecked(stat);
62463 +}
62464 +
62465 static inline void fscache_stat_d(atomic_t *stat)
62466 {
62467 atomic_dec(stat);
62468 @@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62469
62470 #define __fscache_stat(stat) (NULL)
62471 #define fscache_stat(stat) do {} while (0)
62472 +#define fscache_stat_unchecked(stat) do {} while (0)
62473 #define fscache_stat_d(stat) do {} while (0)
62474 #endif
62475
62476 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62477 index da032da..0076ce7 100644
62478 --- a/fs/fscache/object.c
62479 +++ b/fs/fscache/object.c
62480 @@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62481 _debug("LOOKUP \"%s\" in \"%s\"",
62482 cookie->def->name, object->cache->tag->name);
62483
62484 - fscache_stat(&fscache_n_object_lookups);
62485 + fscache_stat_unchecked(&fscache_n_object_lookups);
62486 fscache_stat(&fscache_n_cop_lookup_object);
62487 ret = object->cache->ops->lookup_object(object);
62488 fscache_stat_d(&fscache_n_cop_lookup_object);
62489 @@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62490 if (ret == -ETIMEDOUT) {
62491 /* probably stuck behind another object, so move this one to
62492 * the back of the queue */
62493 - fscache_stat(&fscache_n_object_lookups_timed_out);
62494 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62495 _leave(" [timeout]");
62496 return NO_TRANSIT;
62497 }
62498 @@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62499 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62500
62501 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62502 - fscache_stat(&fscache_n_object_lookups_negative);
62503 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62504
62505 /* Allow write requests to begin stacking up and read requests to begin
62506 * returning ENODATA.
62507 @@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62508 /* if we were still looking up, then we must have a positive lookup
62509 * result, in which case there may be data available */
62510 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62511 - fscache_stat(&fscache_n_object_lookups_positive);
62512 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62513
62514 /* We do (presumably) have data */
62515 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62516 @@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62517 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62518 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62519 } else {
62520 - fscache_stat(&fscache_n_object_created);
62521 + fscache_stat_unchecked(&fscache_n_object_created);
62522 }
62523
62524 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62525 @@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62526 fscache_stat_d(&fscache_n_cop_lookup_complete);
62527
62528 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62529 - fscache_stat(&fscache_n_object_avail);
62530 + fscache_stat_unchecked(&fscache_n_object_avail);
62531
62532 _leave("");
62533 return transit_to(JUMPSTART_DEPS);
62534 @@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62535
62536 /* this just shifts the object release to the work processor */
62537 fscache_put_object(object);
62538 - fscache_stat(&fscache_n_object_dead);
62539 + fscache_stat_unchecked(&fscache_n_object_dead);
62540
62541 _leave("");
62542 return transit_to(OBJECT_DEAD);
62543 @@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62544 enum fscache_checkaux result;
62545
62546 if (!object->cookie->def->check_aux) {
62547 - fscache_stat(&fscache_n_checkaux_none);
62548 + fscache_stat_unchecked(&fscache_n_checkaux_none);
62549 return FSCACHE_CHECKAUX_OKAY;
62550 }
62551
62552 @@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62553 switch (result) {
62554 /* entry okay as is */
62555 case FSCACHE_CHECKAUX_OKAY:
62556 - fscache_stat(&fscache_n_checkaux_okay);
62557 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
62558 break;
62559
62560 /* entry requires update */
62561 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62562 - fscache_stat(&fscache_n_checkaux_update);
62563 + fscache_stat_unchecked(&fscache_n_checkaux_update);
62564 break;
62565
62566 /* entry requires deletion */
62567 case FSCACHE_CHECKAUX_OBSOLETE:
62568 - fscache_stat(&fscache_n_checkaux_obsolete);
62569 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62570 break;
62571
62572 default:
62573 @@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62574 {
62575 const struct fscache_state *s;
62576
62577 - fscache_stat(&fscache_n_invalidates_run);
62578 + fscache_stat_unchecked(&fscache_n_invalidates_run);
62579 fscache_stat(&fscache_n_cop_invalidate_object);
62580 s = _fscache_invalidate_object(object, event);
62581 fscache_stat_d(&fscache_n_cop_invalidate_object);
62582 @@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62583 {
62584 _enter("{OBJ%x},%d", object->debug_id, event);
62585
62586 - fscache_stat(&fscache_n_updates_run);
62587 + fscache_stat_unchecked(&fscache_n_updates_run);
62588 fscache_stat(&fscache_n_cop_update_object);
62589 object->cache->ops->update_object(object);
62590 fscache_stat_d(&fscache_n_cop_update_object);
62591 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62592 index e7b87a0..a85d47a 100644
62593 --- a/fs/fscache/operation.c
62594 +++ b/fs/fscache/operation.c
62595 @@ -17,7 +17,7 @@
62596 #include <linux/slab.h>
62597 #include "internal.h"
62598
62599 -atomic_t fscache_op_debug_id;
62600 +atomic_unchecked_t fscache_op_debug_id;
62601 EXPORT_SYMBOL(fscache_op_debug_id);
62602
62603 /**
62604 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62605 ASSERTCMP(atomic_read(&op->usage), >, 0);
62606 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62607
62608 - fscache_stat(&fscache_n_op_enqueue);
62609 + fscache_stat_unchecked(&fscache_n_op_enqueue);
62610 switch (op->flags & FSCACHE_OP_TYPE) {
62611 case FSCACHE_OP_ASYNC:
62612 _debug("queue async");
62613 @@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62614 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62615 if (op->processor)
62616 fscache_enqueue_operation(op);
62617 - fscache_stat(&fscache_n_op_run);
62618 + fscache_stat_unchecked(&fscache_n_op_run);
62619 }
62620
62621 /*
62622 @@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62623 if (object->n_in_progress > 0) {
62624 atomic_inc(&op->usage);
62625 list_add_tail(&op->pend_link, &object->pending_ops);
62626 - fscache_stat(&fscache_n_op_pend);
62627 + fscache_stat_unchecked(&fscache_n_op_pend);
62628 } else if (!list_empty(&object->pending_ops)) {
62629 atomic_inc(&op->usage);
62630 list_add_tail(&op->pend_link, &object->pending_ops);
62631 - fscache_stat(&fscache_n_op_pend);
62632 + fscache_stat_unchecked(&fscache_n_op_pend);
62633 fscache_start_operations(object);
62634 } else {
62635 ASSERTCMP(object->n_in_progress, ==, 0);
62636 @@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62637 object->n_exclusive++; /* reads and writes must wait */
62638 atomic_inc(&op->usage);
62639 list_add_tail(&op->pend_link, &object->pending_ops);
62640 - fscache_stat(&fscache_n_op_pend);
62641 + fscache_stat_unchecked(&fscache_n_op_pend);
62642 ret = 0;
62643 } else {
62644 /* If we're in any other state, there must have been an I/O
62645 @@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62646 if (object->n_exclusive > 0) {
62647 atomic_inc(&op->usage);
62648 list_add_tail(&op->pend_link, &object->pending_ops);
62649 - fscache_stat(&fscache_n_op_pend);
62650 + fscache_stat_unchecked(&fscache_n_op_pend);
62651 } else if (!list_empty(&object->pending_ops)) {
62652 atomic_inc(&op->usage);
62653 list_add_tail(&op->pend_link, &object->pending_ops);
62654 - fscache_stat(&fscache_n_op_pend);
62655 + fscache_stat_unchecked(&fscache_n_op_pend);
62656 fscache_start_operations(object);
62657 } else {
62658 ASSERTCMP(object->n_exclusive, ==, 0);
62659 @@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62660 object->n_ops++;
62661 atomic_inc(&op->usage);
62662 list_add_tail(&op->pend_link, &object->pending_ops);
62663 - fscache_stat(&fscache_n_op_pend);
62664 + fscache_stat_unchecked(&fscache_n_op_pend);
62665 ret = 0;
62666 } else if (fscache_object_is_dying(object)) {
62667 - fscache_stat(&fscache_n_op_rejected);
62668 + fscache_stat_unchecked(&fscache_n_op_rejected);
62669 op->state = FSCACHE_OP_ST_CANCELLED;
62670 ret = -ENOBUFS;
62671 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62672 @@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62673 ret = -EBUSY;
62674 if (op->state == FSCACHE_OP_ST_PENDING) {
62675 ASSERT(!list_empty(&op->pend_link));
62676 - fscache_stat(&fscache_n_op_cancelled);
62677 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62678 list_del_init(&op->pend_link);
62679 if (do_cancel)
62680 do_cancel(op);
62681 @@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62682 while (!list_empty(&object->pending_ops)) {
62683 op = list_entry(object->pending_ops.next,
62684 struct fscache_operation, pend_link);
62685 - fscache_stat(&fscache_n_op_cancelled);
62686 + fscache_stat_unchecked(&fscache_n_op_cancelled);
62687 list_del_init(&op->pend_link);
62688
62689 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62690 @@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62691 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62692 op->state = FSCACHE_OP_ST_DEAD;
62693
62694 - fscache_stat(&fscache_n_op_release);
62695 + fscache_stat_unchecked(&fscache_n_op_release);
62696
62697 if (op->release) {
62698 op->release(op);
62699 @@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62700 * lock, and defer it otherwise */
62701 if (!spin_trylock(&object->lock)) {
62702 _debug("defer put");
62703 - fscache_stat(&fscache_n_op_deferred_release);
62704 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
62705
62706 cache = object->cache;
62707 spin_lock(&cache->op_gc_list_lock);
62708 @@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62709
62710 _debug("GC DEFERRED REL OBJ%x OP%x",
62711 object->debug_id, op->debug_id);
62712 - fscache_stat(&fscache_n_op_gc);
62713 + fscache_stat_unchecked(&fscache_n_op_gc);
62714
62715 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62716 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62717 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62718 index de33b3f..8be4d29 100644
62719 --- a/fs/fscache/page.c
62720 +++ b/fs/fscache/page.c
62721 @@ -74,7 +74,7 @@ try_again:
62722 val = radix_tree_lookup(&cookie->stores, page->index);
62723 if (!val) {
62724 rcu_read_unlock();
62725 - fscache_stat(&fscache_n_store_vmscan_not_storing);
62726 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62727 __fscache_uncache_page(cookie, page);
62728 return true;
62729 }
62730 @@ -104,11 +104,11 @@ try_again:
62731 spin_unlock(&cookie->stores_lock);
62732
62733 if (xpage) {
62734 - fscache_stat(&fscache_n_store_vmscan_cancelled);
62735 - fscache_stat(&fscache_n_store_radix_deletes);
62736 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62737 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62738 ASSERTCMP(xpage, ==, page);
62739 } else {
62740 - fscache_stat(&fscache_n_store_vmscan_gone);
62741 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62742 }
62743
62744 wake_up_bit(&cookie->flags, 0);
62745 @@ -123,11 +123,11 @@ page_busy:
62746 * sleeping on memory allocation, so we may need to impose a timeout
62747 * too. */
62748 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62749 - fscache_stat(&fscache_n_store_vmscan_busy);
62750 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62751 return false;
62752 }
62753
62754 - fscache_stat(&fscache_n_store_vmscan_wait);
62755 + fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62756 if (!release_page_wait_timeout(cookie, page))
62757 _debug("fscache writeout timeout page: %p{%lx}",
62758 page, page->index);
62759 @@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62760 FSCACHE_COOKIE_STORING_TAG);
62761 if (!radix_tree_tag_get(&cookie->stores, page->index,
62762 FSCACHE_COOKIE_PENDING_TAG)) {
62763 - fscache_stat(&fscache_n_store_radix_deletes);
62764 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62765 xpage = radix_tree_delete(&cookie->stores, page->index);
62766 }
62767 spin_unlock(&cookie->stores_lock);
62768 @@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62769
62770 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62771
62772 - fscache_stat(&fscache_n_attr_changed_calls);
62773 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62774
62775 if (fscache_object_is_active(object)) {
62776 fscache_stat(&fscache_n_cop_attr_changed);
62777 @@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62778
62779 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62780
62781 - fscache_stat(&fscache_n_attr_changed);
62782 + fscache_stat_unchecked(&fscache_n_attr_changed);
62783
62784 op = kzalloc(sizeof(*op), GFP_KERNEL);
62785 if (!op) {
62786 - fscache_stat(&fscache_n_attr_changed_nomem);
62787 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62788 _leave(" = -ENOMEM");
62789 return -ENOMEM;
62790 }
62791 @@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62792 if (fscache_submit_exclusive_op(object, op) < 0)
62793 goto nobufs_dec;
62794 spin_unlock(&cookie->lock);
62795 - fscache_stat(&fscache_n_attr_changed_ok);
62796 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62797 fscache_put_operation(op);
62798 _leave(" = 0");
62799 return 0;
62800 @@ -242,7 +242,7 @@ nobufs:
62801 kfree(op);
62802 if (wake_cookie)
62803 __fscache_wake_unused_cookie(cookie);
62804 - fscache_stat(&fscache_n_attr_changed_nobufs);
62805 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62806 _leave(" = %d", -ENOBUFS);
62807 return -ENOBUFS;
62808 }
62809 @@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62810 /* allocate a retrieval operation and attempt to submit it */
62811 op = kzalloc(sizeof(*op), GFP_NOIO);
62812 if (!op) {
62813 - fscache_stat(&fscache_n_retrievals_nomem);
62814 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62815 return NULL;
62816 }
62817
62818 @@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62819 return 0;
62820 }
62821
62822 - fscache_stat(&fscache_n_retrievals_wait);
62823 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
62824
62825 jif = jiffies;
62826 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62827 TASK_INTERRUPTIBLE) != 0) {
62828 - fscache_stat(&fscache_n_retrievals_intr);
62829 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62830 _leave(" = -ERESTARTSYS");
62831 return -ERESTARTSYS;
62832 }
62833 @@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62834 */
62835 int fscache_wait_for_operation_activation(struct fscache_object *object,
62836 struct fscache_operation *op,
62837 - atomic_t *stat_op_waits,
62838 - atomic_t *stat_object_dead,
62839 + atomic_unchecked_t *stat_op_waits,
62840 + atomic_unchecked_t *stat_object_dead,
62841 void (*do_cancel)(struct fscache_operation *))
62842 {
62843 int ret;
62844 @@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62845
62846 _debug(">>> WT");
62847 if (stat_op_waits)
62848 - fscache_stat(stat_op_waits);
62849 + fscache_stat_unchecked(stat_op_waits);
62850 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62851 TASK_INTERRUPTIBLE) != 0) {
62852 ret = fscache_cancel_op(op, do_cancel);
62853 @@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62854 check_if_dead:
62855 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62856 if (stat_object_dead)
62857 - fscache_stat(stat_object_dead);
62858 + fscache_stat_unchecked(stat_object_dead);
62859 _leave(" = -ENOBUFS [cancelled]");
62860 return -ENOBUFS;
62861 }
62862 @@ -381,7 +381,7 @@ check_if_dead:
62863 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62864 fscache_cancel_op(op, do_cancel);
62865 if (stat_object_dead)
62866 - fscache_stat(stat_object_dead);
62867 + fscache_stat_unchecked(stat_object_dead);
62868 return -ENOBUFS;
62869 }
62870 return 0;
62871 @@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62872
62873 _enter("%p,%p,,,", cookie, page);
62874
62875 - fscache_stat(&fscache_n_retrievals);
62876 + fscache_stat_unchecked(&fscache_n_retrievals);
62877
62878 if (hlist_empty(&cookie->backing_objects))
62879 goto nobufs;
62880 @@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62881 goto nobufs_unlock_dec;
62882 spin_unlock(&cookie->lock);
62883
62884 - fscache_stat(&fscache_n_retrieval_ops);
62885 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62886
62887 /* pin the netfs read context in case we need to do the actual netfs
62888 * read because we've encountered a cache read failure */
62889 @@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62890
62891 error:
62892 if (ret == -ENOMEM)
62893 - fscache_stat(&fscache_n_retrievals_nomem);
62894 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62895 else if (ret == -ERESTARTSYS)
62896 - fscache_stat(&fscache_n_retrievals_intr);
62897 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62898 else if (ret == -ENODATA)
62899 - fscache_stat(&fscache_n_retrievals_nodata);
62900 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62901 else if (ret < 0)
62902 - fscache_stat(&fscache_n_retrievals_nobufs);
62903 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62904 else
62905 - fscache_stat(&fscache_n_retrievals_ok);
62906 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62907
62908 fscache_put_retrieval(op);
62909 _leave(" = %d", ret);
62910 @@ -505,7 +505,7 @@ nobufs_unlock:
62911 __fscache_wake_unused_cookie(cookie);
62912 kfree(op);
62913 nobufs:
62914 - fscache_stat(&fscache_n_retrievals_nobufs);
62915 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62916 _leave(" = -ENOBUFS");
62917 return -ENOBUFS;
62918 }
62919 @@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62920
62921 _enter("%p,,%d,,,", cookie, *nr_pages);
62922
62923 - fscache_stat(&fscache_n_retrievals);
62924 + fscache_stat_unchecked(&fscache_n_retrievals);
62925
62926 if (hlist_empty(&cookie->backing_objects))
62927 goto nobufs;
62928 @@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62929 goto nobufs_unlock_dec;
62930 spin_unlock(&cookie->lock);
62931
62932 - fscache_stat(&fscache_n_retrieval_ops);
62933 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
62934
62935 /* pin the netfs read context in case we need to do the actual netfs
62936 * read because we've encountered a cache read failure */
62937 @@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62938
62939 error:
62940 if (ret == -ENOMEM)
62941 - fscache_stat(&fscache_n_retrievals_nomem);
62942 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62943 else if (ret == -ERESTARTSYS)
62944 - fscache_stat(&fscache_n_retrievals_intr);
62945 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
62946 else if (ret == -ENODATA)
62947 - fscache_stat(&fscache_n_retrievals_nodata);
62948 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62949 else if (ret < 0)
62950 - fscache_stat(&fscache_n_retrievals_nobufs);
62951 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62952 else
62953 - fscache_stat(&fscache_n_retrievals_ok);
62954 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
62955
62956 fscache_put_retrieval(op);
62957 _leave(" = %d", ret);
62958 @@ -636,7 +636,7 @@ nobufs_unlock:
62959 if (wake_cookie)
62960 __fscache_wake_unused_cookie(cookie);
62961 nobufs:
62962 - fscache_stat(&fscache_n_retrievals_nobufs);
62963 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62964 _leave(" = -ENOBUFS");
62965 return -ENOBUFS;
62966 }
62967 @@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62968
62969 _enter("%p,%p,,,", cookie, page);
62970
62971 - fscache_stat(&fscache_n_allocs);
62972 + fscache_stat_unchecked(&fscache_n_allocs);
62973
62974 if (hlist_empty(&cookie->backing_objects))
62975 goto nobufs;
62976 @@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62977 goto nobufs_unlock_dec;
62978 spin_unlock(&cookie->lock);
62979
62980 - fscache_stat(&fscache_n_alloc_ops);
62981 + fscache_stat_unchecked(&fscache_n_alloc_ops);
62982
62983 ret = fscache_wait_for_operation_activation(
62984 object, &op->op,
62985 @@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62986
62987 error:
62988 if (ret == -ERESTARTSYS)
62989 - fscache_stat(&fscache_n_allocs_intr);
62990 + fscache_stat_unchecked(&fscache_n_allocs_intr);
62991 else if (ret < 0)
62992 - fscache_stat(&fscache_n_allocs_nobufs);
62993 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62994 else
62995 - fscache_stat(&fscache_n_allocs_ok);
62996 + fscache_stat_unchecked(&fscache_n_allocs_ok);
62997
62998 fscache_put_retrieval(op);
62999 _leave(" = %d", ret);
63000 @@ -730,7 +730,7 @@ nobufs_unlock:
63001 if (wake_cookie)
63002 __fscache_wake_unused_cookie(cookie);
63003 nobufs:
63004 - fscache_stat(&fscache_n_allocs_nobufs);
63005 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63006 _leave(" = -ENOBUFS");
63007 return -ENOBUFS;
63008 }
63009 @@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63010
63011 spin_lock(&cookie->stores_lock);
63012
63013 - fscache_stat(&fscache_n_store_calls);
63014 + fscache_stat_unchecked(&fscache_n_store_calls);
63015
63016 /* find a page to store */
63017 page = NULL;
63018 @@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63019 page = results[0];
63020 _debug("gang %d [%lx]", n, page->index);
63021 if (page->index > op->store_limit) {
63022 - fscache_stat(&fscache_n_store_pages_over_limit);
63023 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
63024 goto superseded;
63025 }
63026
63027 @@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63028 spin_unlock(&cookie->stores_lock);
63029 spin_unlock(&object->lock);
63030
63031 - fscache_stat(&fscache_n_store_pages);
63032 + fscache_stat_unchecked(&fscache_n_store_pages);
63033 fscache_stat(&fscache_n_cop_write_page);
63034 ret = object->cache->ops->write_page(op, page);
63035 fscache_stat_d(&fscache_n_cop_write_page);
63036 @@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63037 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63038 ASSERT(PageFsCache(page));
63039
63040 - fscache_stat(&fscache_n_stores);
63041 + fscache_stat_unchecked(&fscache_n_stores);
63042
63043 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
63044 _leave(" = -ENOBUFS [invalidating]");
63045 @@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63046 spin_unlock(&cookie->stores_lock);
63047 spin_unlock(&object->lock);
63048
63049 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
63050 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63051 op->store_limit = object->store_limit;
63052
63053 __fscache_use_cookie(cookie);
63054 @@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63055
63056 spin_unlock(&cookie->lock);
63057 radix_tree_preload_end();
63058 - fscache_stat(&fscache_n_store_ops);
63059 - fscache_stat(&fscache_n_stores_ok);
63060 + fscache_stat_unchecked(&fscache_n_store_ops);
63061 + fscache_stat_unchecked(&fscache_n_stores_ok);
63062
63063 /* the work queue now carries its own ref on the object */
63064 fscache_put_operation(&op->op);
63065 @@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63066 return 0;
63067
63068 already_queued:
63069 - fscache_stat(&fscache_n_stores_again);
63070 + fscache_stat_unchecked(&fscache_n_stores_again);
63071 already_pending:
63072 spin_unlock(&cookie->stores_lock);
63073 spin_unlock(&object->lock);
63074 spin_unlock(&cookie->lock);
63075 radix_tree_preload_end();
63076 kfree(op);
63077 - fscache_stat(&fscache_n_stores_ok);
63078 + fscache_stat_unchecked(&fscache_n_stores_ok);
63079 _leave(" = 0");
63080 return 0;
63081
63082 @@ -1039,14 +1039,14 @@ nobufs:
63083 kfree(op);
63084 if (wake_cookie)
63085 __fscache_wake_unused_cookie(cookie);
63086 - fscache_stat(&fscache_n_stores_nobufs);
63087 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
63088 _leave(" = -ENOBUFS");
63089 return -ENOBUFS;
63090
63091 nomem_free:
63092 kfree(op);
63093 nomem:
63094 - fscache_stat(&fscache_n_stores_oom);
63095 + fscache_stat_unchecked(&fscache_n_stores_oom);
63096 _leave(" = -ENOMEM");
63097 return -ENOMEM;
63098 }
63099 @@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
63100 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63101 ASSERTCMP(page, !=, NULL);
63102
63103 - fscache_stat(&fscache_n_uncaches);
63104 + fscache_stat_unchecked(&fscache_n_uncaches);
63105
63106 /* cache withdrawal may beat us to it */
63107 if (!PageFsCache(page))
63108 @@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
63109 struct fscache_cookie *cookie = op->op.object->cookie;
63110
63111 #ifdef CONFIG_FSCACHE_STATS
63112 - atomic_inc(&fscache_n_marks);
63113 + atomic_inc_unchecked(&fscache_n_marks);
63114 #endif
63115
63116 _debug("- mark %p{%lx}", page, page->index);
63117 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
63118 index 40d13c7..ddf52b9 100644
63119 --- a/fs/fscache/stats.c
63120 +++ b/fs/fscache/stats.c
63121 @@ -18,99 +18,99 @@
63122 /*
63123 * operation counters
63124 */
63125 -atomic_t fscache_n_op_pend;
63126 -atomic_t fscache_n_op_run;
63127 -atomic_t fscache_n_op_enqueue;
63128 -atomic_t fscache_n_op_requeue;
63129 -atomic_t fscache_n_op_deferred_release;
63130 -atomic_t fscache_n_op_release;
63131 -atomic_t fscache_n_op_gc;
63132 -atomic_t fscache_n_op_cancelled;
63133 -atomic_t fscache_n_op_rejected;
63134 +atomic_unchecked_t fscache_n_op_pend;
63135 +atomic_unchecked_t fscache_n_op_run;
63136 +atomic_unchecked_t fscache_n_op_enqueue;
63137 +atomic_unchecked_t fscache_n_op_requeue;
63138 +atomic_unchecked_t fscache_n_op_deferred_release;
63139 +atomic_unchecked_t fscache_n_op_release;
63140 +atomic_unchecked_t fscache_n_op_gc;
63141 +atomic_unchecked_t fscache_n_op_cancelled;
63142 +atomic_unchecked_t fscache_n_op_rejected;
63143
63144 -atomic_t fscache_n_attr_changed;
63145 -atomic_t fscache_n_attr_changed_ok;
63146 -atomic_t fscache_n_attr_changed_nobufs;
63147 -atomic_t fscache_n_attr_changed_nomem;
63148 -atomic_t fscache_n_attr_changed_calls;
63149 +atomic_unchecked_t fscache_n_attr_changed;
63150 +atomic_unchecked_t fscache_n_attr_changed_ok;
63151 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
63152 +atomic_unchecked_t fscache_n_attr_changed_nomem;
63153 +atomic_unchecked_t fscache_n_attr_changed_calls;
63154
63155 -atomic_t fscache_n_allocs;
63156 -atomic_t fscache_n_allocs_ok;
63157 -atomic_t fscache_n_allocs_wait;
63158 -atomic_t fscache_n_allocs_nobufs;
63159 -atomic_t fscache_n_allocs_intr;
63160 -atomic_t fscache_n_allocs_object_dead;
63161 -atomic_t fscache_n_alloc_ops;
63162 -atomic_t fscache_n_alloc_op_waits;
63163 +atomic_unchecked_t fscache_n_allocs;
63164 +atomic_unchecked_t fscache_n_allocs_ok;
63165 +atomic_unchecked_t fscache_n_allocs_wait;
63166 +atomic_unchecked_t fscache_n_allocs_nobufs;
63167 +atomic_unchecked_t fscache_n_allocs_intr;
63168 +atomic_unchecked_t fscache_n_allocs_object_dead;
63169 +atomic_unchecked_t fscache_n_alloc_ops;
63170 +atomic_unchecked_t fscache_n_alloc_op_waits;
63171
63172 -atomic_t fscache_n_retrievals;
63173 -atomic_t fscache_n_retrievals_ok;
63174 -atomic_t fscache_n_retrievals_wait;
63175 -atomic_t fscache_n_retrievals_nodata;
63176 -atomic_t fscache_n_retrievals_nobufs;
63177 -atomic_t fscache_n_retrievals_intr;
63178 -atomic_t fscache_n_retrievals_nomem;
63179 -atomic_t fscache_n_retrievals_object_dead;
63180 -atomic_t fscache_n_retrieval_ops;
63181 -atomic_t fscache_n_retrieval_op_waits;
63182 +atomic_unchecked_t fscache_n_retrievals;
63183 +atomic_unchecked_t fscache_n_retrievals_ok;
63184 +atomic_unchecked_t fscache_n_retrievals_wait;
63185 +atomic_unchecked_t fscache_n_retrievals_nodata;
63186 +atomic_unchecked_t fscache_n_retrievals_nobufs;
63187 +atomic_unchecked_t fscache_n_retrievals_intr;
63188 +atomic_unchecked_t fscache_n_retrievals_nomem;
63189 +atomic_unchecked_t fscache_n_retrievals_object_dead;
63190 +atomic_unchecked_t fscache_n_retrieval_ops;
63191 +atomic_unchecked_t fscache_n_retrieval_op_waits;
63192
63193 -atomic_t fscache_n_stores;
63194 -atomic_t fscache_n_stores_ok;
63195 -atomic_t fscache_n_stores_again;
63196 -atomic_t fscache_n_stores_nobufs;
63197 -atomic_t fscache_n_stores_oom;
63198 -atomic_t fscache_n_store_ops;
63199 -atomic_t fscache_n_store_calls;
63200 -atomic_t fscache_n_store_pages;
63201 -atomic_t fscache_n_store_radix_deletes;
63202 -atomic_t fscache_n_store_pages_over_limit;
63203 +atomic_unchecked_t fscache_n_stores;
63204 +atomic_unchecked_t fscache_n_stores_ok;
63205 +atomic_unchecked_t fscache_n_stores_again;
63206 +atomic_unchecked_t fscache_n_stores_nobufs;
63207 +atomic_unchecked_t fscache_n_stores_oom;
63208 +atomic_unchecked_t fscache_n_store_ops;
63209 +atomic_unchecked_t fscache_n_store_calls;
63210 +atomic_unchecked_t fscache_n_store_pages;
63211 +atomic_unchecked_t fscache_n_store_radix_deletes;
63212 +atomic_unchecked_t fscache_n_store_pages_over_limit;
63213
63214 -atomic_t fscache_n_store_vmscan_not_storing;
63215 -atomic_t fscache_n_store_vmscan_gone;
63216 -atomic_t fscache_n_store_vmscan_busy;
63217 -atomic_t fscache_n_store_vmscan_cancelled;
63218 -atomic_t fscache_n_store_vmscan_wait;
63219 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63220 +atomic_unchecked_t fscache_n_store_vmscan_gone;
63221 +atomic_unchecked_t fscache_n_store_vmscan_busy;
63222 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63223 +atomic_unchecked_t fscache_n_store_vmscan_wait;
63224
63225 -atomic_t fscache_n_marks;
63226 -atomic_t fscache_n_uncaches;
63227 +atomic_unchecked_t fscache_n_marks;
63228 +atomic_unchecked_t fscache_n_uncaches;
63229
63230 -atomic_t fscache_n_acquires;
63231 -atomic_t fscache_n_acquires_null;
63232 -atomic_t fscache_n_acquires_no_cache;
63233 -atomic_t fscache_n_acquires_ok;
63234 -atomic_t fscache_n_acquires_nobufs;
63235 -atomic_t fscache_n_acquires_oom;
63236 +atomic_unchecked_t fscache_n_acquires;
63237 +atomic_unchecked_t fscache_n_acquires_null;
63238 +atomic_unchecked_t fscache_n_acquires_no_cache;
63239 +atomic_unchecked_t fscache_n_acquires_ok;
63240 +atomic_unchecked_t fscache_n_acquires_nobufs;
63241 +atomic_unchecked_t fscache_n_acquires_oom;
63242
63243 -atomic_t fscache_n_invalidates;
63244 -atomic_t fscache_n_invalidates_run;
63245 +atomic_unchecked_t fscache_n_invalidates;
63246 +atomic_unchecked_t fscache_n_invalidates_run;
63247
63248 -atomic_t fscache_n_updates;
63249 -atomic_t fscache_n_updates_null;
63250 -atomic_t fscache_n_updates_run;
63251 +atomic_unchecked_t fscache_n_updates;
63252 +atomic_unchecked_t fscache_n_updates_null;
63253 +atomic_unchecked_t fscache_n_updates_run;
63254
63255 -atomic_t fscache_n_relinquishes;
63256 -atomic_t fscache_n_relinquishes_null;
63257 -atomic_t fscache_n_relinquishes_waitcrt;
63258 -atomic_t fscache_n_relinquishes_retire;
63259 +atomic_unchecked_t fscache_n_relinquishes;
63260 +atomic_unchecked_t fscache_n_relinquishes_null;
63261 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63262 +atomic_unchecked_t fscache_n_relinquishes_retire;
63263
63264 -atomic_t fscache_n_cookie_index;
63265 -atomic_t fscache_n_cookie_data;
63266 -atomic_t fscache_n_cookie_special;
63267 +atomic_unchecked_t fscache_n_cookie_index;
63268 +atomic_unchecked_t fscache_n_cookie_data;
63269 +atomic_unchecked_t fscache_n_cookie_special;
63270
63271 -atomic_t fscache_n_object_alloc;
63272 -atomic_t fscache_n_object_no_alloc;
63273 -atomic_t fscache_n_object_lookups;
63274 -atomic_t fscache_n_object_lookups_negative;
63275 -atomic_t fscache_n_object_lookups_positive;
63276 -atomic_t fscache_n_object_lookups_timed_out;
63277 -atomic_t fscache_n_object_created;
63278 -atomic_t fscache_n_object_avail;
63279 -atomic_t fscache_n_object_dead;
63280 +atomic_unchecked_t fscache_n_object_alloc;
63281 +atomic_unchecked_t fscache_n_object_no_alloc;
63282 +atomic_unchecked_t fscache_n_object_lookups;
63283 +atomic_unchecked_t fscache_n_object_lookups_negative;
63284 +atomic_unchecked_t fscache_n_object_lookups_positive;
63285 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
63286 +atomic_unchecked_t fscache_n_object_created;
63287 +atomic_unchecked_t fscache_n_object_avail;
63288 +atomic_unchecked_t fscache_n_object_dead;
63289
63290 -atomic_t fscache_n_checkaux_none;
63291 -atomic_t fscache_n_checkaux_okay;
63292 -atomic_t fscache_n_checkaux_update;
63293 -atomic_t fscache_n_checkaux_obsolete;
63294 +atomic_unchecked_t fscache_n_checkaux_none;
63295 +atomic_unchecked_t fscache_n_checkaux_okay;
63296 +atomic_unchecked_t fscache_n_checkaux_update;
63297 +atomic_unchecked_t fscache_n_checkaux_obsolete;
63298
63299 atomic_t fscache_n_cop_alloc_object;
63300 atomic_t fscache_n_cop_lookup_object;
63301 @@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63302 seq_puts(m, "FS-Cache statistics\n");
63303
63304 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63305 - atomic_read(&fscache_n_cookie_index),
63306 - atomic_read(&fscache_n_cookie_data),
63307 - atomic_read(&fscache_n_cookie_special));
63308 + atomic_read_unchecked(&fscache_n_cookie_index),
63309 + atomic_read_unchecked(&fscache_n_cookie_data),
63310 + atomic_read_unchecked(&fscache_n_cookie_special));
63311
63312 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63313 - atomic_read(&fscache_n_object_alloc),
63314 - atomic_read(&fscache_n_object_no_alloc),
63315 - atomic_read(&fscache_n_object_avail),
63316 - atomic_read(&fscache_n_object_dead));
63317 + atomic_read_unchecked(&fscache_n_object_alloc),
63318 + atomic_read_unchecked(&fscache_n_object_no_alloc),
63319 + atomic_read_unchecked(&fscache_n_object_avail),
63320 + atomic_read_unchecked(&fscache_n_object_dead));
63321 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63322 - atomic_read(&fscache_n_checkaux_none),
63323 - atomic_read(&fscache_n_checkaux_okay),
63324 - atomic_read(&fscache_n_checkaux_update),
63325 - atomic_read(&fscache_n_checkaux_obsolete));
63326 + atomic_read_unchecked(&fscache_n_checkaux_none),
63327 + atomic_read_unchecked(&fscache_n_checkaux_okay),
63328 + atomic_read_unchecked(&fscache_n_checkaux_update),
63329 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63330
63331 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63332 - atomic_read(&fscache_n_marks),
63333 - atomic_read(&fscache_n_uncaches));
63334 + atomic_read_unchecked(&fscache_n_marks),
63335 + atomic_read_unchecked(&fscache_n_uncaches));
63336
63337 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63338 " oom=%u\n",
63339 - atomic_read(&fscache_n_acquires),
63340 - atomic_read(&fscache_n_acquires_null),
63341 - atomic_read(&fscache_n_acquires_no_cache),
63342 - atomic_read(&fscache_n_acquires_ok),
63343 - atomic_read(&fscache_n_acquires_nobufs),
63344 - atomic_read(&fscache_n_acquires_oom));
63345 + atomic_read_unchecked(&fscache_n_acquires),
63346 + atomic_read_unchecked(&fscache_n_acquires_null),
63347 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
63348 + atomic_read_unchecked(&fscache_n_acquires_ok),
63349 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
63350 + atomic_read_unchecked(&fscache_n_acquires_oom));
63351
63352 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63353 - atomic_read(&fscache_n_object_lookups),
63354 - atomic_read(&fscache_n_object_lookups_negative),
63355 - atomic_read(&fscache_n_object_lookups_positive),
63356 - atomic_read(&fscache_n_object_created),
63357 - atomic_read(&fscache_n_object_lookups_timed_out));
63358 + atomic_read_unchecked(&fscache_n_object_lookups),
63359 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
63360 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
63361 + atomic_read_unchecked(&fscache_n_object_created),
63362 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63363
63364 seq_printf(m, "Invals : n=%u run=%u\n",
63365 - atomic_read(&fscache_n_invalidates),
63366 - atomic_read(&fscache_n_invalidates_run));
63367 + atomic_read_unchecked(&fscache_n_invalidates),
63368 + atomic_read_unchecked(&fscache_n_invalidates_run));
63369
63370 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63371 - atomic_read(&fscache_n_updates),
63372 - atomic_read(&fscache_n_updates_null),
63373 - atomic_read(&fscache_n_updates_run));
63374 + atomic_read_unchecked(&fscache_n_updates),
63375 + atomic_read_unchecked(&fscache_n_updates_null),
63376 + atomic_read_unchecked(&fscache_n_updates_run));
63377
63378 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63379 - atomic_read(&fscache_n_relinquishes),
63380 - atomic_read(&fscache_n_relinquishes_null),
63381 - atomic_read(&fscache_n_relinquishes_waitcrt),
63382 - atomic_read(&fscache_n_relinquishes_retire));
63383 + atomic_read_unchecked(&fscache_n_relinquishes),
63384 + atomic_read_unchecked(&fscache_n_relinquishes_null),
63385 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63386 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
63387
63388 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63389 - atomic_read(&fscache_n_attr_changed),
63390 - atomic_read(&fscache_n_attr_changed_ok),
63391 - atomic_read(&fscache_n_attr_changed_nobufs),
63392 - atomic_read(&fscache_n_attr_changed_nomem),
63393 - atomic_read(&fscache_n_attr_changed_calls));
63394 + atomic_read_unchecked(&fscache_n_attr_changed),
63395 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
63396 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63397 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63398 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
63399
63400 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63401 - atomic_read(&fscache_n_allocs),
63402 - atomic_read(&fscache_n_allocs_ok),
63403 - atomic_read(&fscache_n_allocs_wait),
63404 - atomic_read(&fscache_n_allocs_nobufs),
63405 - atomic_read(&fscache_n_allocs_intr));
63406 + atomic_read_unchecked(&fscache_n_allocs),
63407 + atomic_read_unchecked(&fscache_n_allocs_ok),
63408 + atomic_read_unchecked(&fscache_n_allocs_wait),
63409 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
63410 + atomic_read_unchecked(&fscache_n_allocs_intr));
63411 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63412 - atomic_read(&fscache_n_alloc_ops),
63413 - atomic_read(&fscache_n_alloc_op_waits),
63414 - atomic_read(&fscache_n_allocs_object_dead));
63415 + atomic_read_unchecked(&fscache_n_alloc_ops),
63416 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
63417 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
63418
63419 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63420 " int=%u oom=%u\n",
63421 - atomic_read(&fscache_n_retrievals),
63422 - atomic_read(&fscache_n_retrievals_ok),
63423 - atomic_read(&fscache_n_retrievals_wait),
63424 - atomic_read(&fscache_n_retrievals_nodata),
63425 - atomic_read(&fscache_n_retrievals_nobufs),
63426 - atomic_read(&fscache_n_retrievals_intr),
63427 - atomic_read(&fscache_n_retrievals_nomem));
63428 + atomic_read_unchecked(&fscache_n_retrievals),
63429 + atomic_read_unchecked(&fscache_n_retrievals_ok),
63430 + atomic_read_unchecked(&fscache_n_retrievals_wait),
63431 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
63432 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63433 + atomic_read_unchecked(&fscache_n_retrievals_intr),
63434 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
63435 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63436 - atomic_read(&fscache_n_retrieval_ops),
63437 - atomic_read(&fscache_n_retrieval_op_waits),
63438 - atomic_read(&fscache_n_retrievals_object_dead));
63439 + atomic_read_unchecked(&fscache_n_retrieval_ops),
63440 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63441 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63442
63443 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63444 - atomic_read(&fscache_n_stores),
63445 - atomic_read(&fscache_n_stores_ok),
63446 - atomic_read(&fscache_n_stores_again),
63447 - atomic_read(&fscache_n_stores_nobufs),
63448 - atomic_read(&fscache_n_stores_oom));
63449 + atomic_read_unchecked(&fscache_n_stores),
63450 + atomic_read_unchecked(&fscache_n_stores_ok),
63451 + atomic_read_unchecked(&fscache_n_stores_again),
63452 + atomic_read_unchecked(&fscache_n_stores_nobufs),
63453 + atomic_read_unchecked(&fscache_n_stores_oom));
63454 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63455 - atomic_read(&fscache_n_store_ops),
63456 - atomic_read(&fscache_n_store_calls),
63457 - atomic_read(&fscache_n_store_pages),
63458 - atomic_read(&fscache_n_store_radix_deletes),
63459 - atomic_read(&fscache_n_store_pages_over_limit));
63460 + atomic_read_unchecked(&fscache_n_store_ops),
63461 + atomic_read_unchecked(&fscache_n_store_calls),
63462 + atomic_read_unchecked(&fscache_n_store_pages),
63463 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
63464 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63465
63466 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63467 - atomic_read(&fscache_n_store_vmscan_not_storing),
63468 - atomic_read(&fscache_n_store_vmscan_gone),
63469 - atomic_read(&fscache_n_store_vmscan_busy),
63470 - atomic_read(&fscache_n_store_vmscan_cancelled),
63471 - atomic_read(&fscache_n_store_vmscan_wait));
63472 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63473 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63474 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63475 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63476 + atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63477
63478 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63479 - atomic_read(&fscache_n_op_pend),
63480 - atomic_read(&fscache_n_op_run),
63481 - atomic_read(&fscache_n_op_enqueue),
63482 - atomic_read(&fscache_n_op_cancelled),
63483 - atomic_read(&fscache_n_op_rejected));
63484 + atomic_read_unchecked(&fscache_n_op_pend),
63485 + atomic_read_unchecked(&fscache_n_op_run),
63486 + atomic_read_unchecked(&fscache_n_op_enqueue),
63487 + atomic_read_unchecked(&fscache_n_op_cancelled),
63488 + atomic_read_unchecked(&fscache_n_op_rejected));
63489 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63490 - atomic_read(&fscache_n_op_deferred_release),
63491 - atomic_read(&fscache_n_op_release),
63492 - atomic_read(&fscache_n_op_gc));
63493 + atomic_read_unchecked(&fscache_n_op_deferred_release),
63494 + atomic_read_unchecked(&fscache_n_op_release),
63495 + atomic_read_unchecked(&fscache_n_op_gc));
63496
63497 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63498 atomic_read(&fscache_n_cop_alloc_object),
63499 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63500 index 966ace8..030a03a 100644
63501 --- a/fs/fuse/cuse.c
63502 +++ b/fs/fuse/cuse.c
63503 @@ -611,10 +611,12 @@ static int __init cuse_init(void)
63504 INIT_LIST_HEAD(&cuse_conntbl[i]);
63505
63506 /* inherit and extend fuse_dev_operations */
63507 - cuse_channel_fops = fuse_dev_operations;
63508 - cuse_channel_fops.owner = THIS_MODULE;
63509 - cuse_channel_fops.open = cuse_channel_open;
63510 - cuse_channel_fops.release = cuse_channel_release;
63511 + pax_open_kernel();
63512 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63513 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63514 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
63515 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
63516 + pax_close_kernel();
63517
63518 cuse_class = class_create(THIS_MODULE, "cuse");
63519 if (IS_ERR(cuse_class))
63520 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63521 index ca88731..8e9c55d 100644
63522 --- a/fs/fuse/dev.c
63523 +++ b/fs/fuse/dev.c
63524 @@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63525 ret = 0;
63526 pipe_lock(pipe);
63527
63528 - if (!pipe->readers) {
63529 + if (!atomic_read(&pipe->readers)) {
63530 send_sig(SIGPIPE, current, 0);
63531 if (!ret)
63532 ret = -EPIPE;
63533 @@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63534 page_nr++;
63535 ret += buf->len;
63536
63537 - if (pipe->files)
63538 + if (atomic_read(&pipe->files))
63539 do_wakeup = 1;
63540 }
63541
63542 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63543 index dbab798..fefa22b 100644
63544 --- a/fs/fuse/dir.c
63545 +++ b/fs/fuse/dir.c
63546 @@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63547 return link;
63548 }
63549
63550 -static void free_link(char *link)
63551 +static void free_link(const char *link)
63552 {
63553 if (!IS_ERR(link))
63554 free_page((unsigned long) link);
63555 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63556 index fd62cae..3494dfa 100644
63557 --- a/fs/hostfs/hostfs_kern.c
63558 +++ b/fs/hostfs/hostfs_kern.c
63559 @@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63560
63561 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63562 {
63563 - char *s = nd_get_link(nd);
63564 + const char *s = nd_get_link(nd);
63565 if (!IS_ERR(s))
63566 __putname(s);
63567 }
63568 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63569 index 1e2872b..7aea000 100644
63570 --- a/fs/hugetlbfs/inode.c
63571 +++ b/fs/hugetlbfs/inode.c
63572 @@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63573 struct mm_struct *mm = current->mm;
63574 struct vm_area_struct *vma;
63575 struct hstate *h = hstate_file(file);
63576 + unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63577 struct vm_unmapped_area_info info;
63578
63579 if (len & ~huge_page_mask(h))
63580 @@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63581 return addr;
63582 }
63583
63584 +#ifdef CONFIG_PAX_RANDMMAP
63585 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63586 +#endif
63587 +
63588 if (addr) {
63589 addr = ALIGN(addr, huge_page_size(h));
63590 vma = find_vma(mm, addr);
63591 - if (TASK_SIZE - len >= addr &&
63592 - (!vma || addr + len <= vma->vm_start))
63593 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63594 return addr;
63595 }
63596
63597 info.flags = 0;
63598 info.length = len;
63599 info.low_limit = TASK_UNMAPPED_BASE;
63600 +
63601 +#ifdef CONFIG_PAX_RANDMMAP
63602 + if (mm->pax_flags & MF_PAX_RANDMMAP)
63603 + info.low_limit += mm->delta_mmap;
63604 +#endif
63605 +
63606 info.high_limit = TASK_SIZE;
63607 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63608 info.align_offset = 0;
63609 @@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63610 };
63611 MODULE_ALIAS_FS("hugetlbfs");
63612
63613 -static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63614 +struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63615
63616 static int can_do_hugetlb_shm(void)
63617 {
63618 diff --git a/fs/inode.c b/fs/inode.c
63619 index 26753ba..d19eb34 100644
63620 --- a/fs/inode.c
63621 +++ b/fs/inode.c
63622 @@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63623 unsigned int *p = &get_cpu_var(last_ino);
63624 unsigned int res = *p;
63625
63626 +start:
63627 +
63628 #ifdef CONFIG_SMP
63629 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63630 - static atomic_t shared_last_ino;
63631 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63632 + static atomic_unchecked_t shared_last_ino;
63633 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63634
63635 res = next - LAST_INO_BATCH;
63636 }
63637 #endif
63638
63639 - *p = ++res;
63640 + if (unlikely(!++res))
63641 + goto start; /* never zero */
63642 + *p = res;
63643 put_cpu_var(last_ino);
63644 return res;
63645 }
63646 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63647 index 4a6cf28..d3a29d3 100644
63648 --- a/fs/jffs2/erase.c
63649 +++ b/fs/jffs2/erase.c
63650 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63651 struct jffs2_unknown_node marker = {
63652 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63653 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63654 - .totlen = cpu_to_je32(c->cleanmarker_size)
63655 + .totlen = cpu_to_je32(c->cleanmarker_size),
63656 + .hdr_crc = cpu_to_je32(0)
63657 };
63658
63659 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63660 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63661 index 09ed551..45684f8 100644
63662 --- a/fs/jffs2/wbuf.c
63663 +++ b/fs/jffs2/wbuf.c
63664 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63665 {
63666 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63667 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63668 - .totlen = constant_cpu_to_je32(8)
63669 + .totlen = constant_cpu_to_je32(8),
63670 + .hdr_crc = constant_cpu_to_je32(0)
63671 };
63672
63673 /*
63674 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63675 index 93e897e..a863de4 100644
63676 --- a/fs/jfs/super.c
63677 +++ b/fs/jfs/super.c
63678 @@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63679
63680 jfs_inode_cachep =
63681 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63682 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63683 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63684 init_once);
63685 if (jfs_inode_cachep == NULL)
63686 return -ENOMEM;
63687 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63688 index 1c77193..ba73e66 100644
63689 --- a/fs/kernfs/dir.c
63690 +++ b/fs/kernfs/dir.c
63691 @@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63692 *
63693 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63694 */
63695 -static unsigned int kernfs_name_hash(const char *name, const void *ns)
63696 +static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63697 {
63698 unsigned long hash = init_name_hash();
63699 unsigned int len = strlen(name);
63700 @@ -829,6 +829,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
63701 ret = scops->mkdir(parent, dentry->d_name.name, mode);
63702
63703 kernfs_put_active(parent);
63704 +
63705 + if (!ret) {
63706 + struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
63707 + ret = PTR_ERR_OR_ZERO(dentry_ret);
63708 + }
63709 +
63710 return ret;
63711 }
63712
63713 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63714 index 4429d6d..9831f52 100644
63715 --- a/fs/kernfs/file.c
63716 +++ b/fs/kernfs/file.c
63717 @@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63718
63719 struct kernfs_open_node {
63720 atomic_t refcnt;
63721 - atomic_t event;
63722 + atomic_unchecked_t event;
63723 wait_queue_head_t poll;
63724 struct list_head files; /* goes through kernfs_open_file.list */
63725 };
63726 @@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63727 {
63728 struct kernfs_open_file *of = sf->private;
63729
63730 - of->event = atomic_read(&of->kn->attr.open->event);
63731 + of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63732
63733 return of->kn->attr.ops->seq_show(sf, v);
63734 }
63735 @@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63736 return ret;
63737 }
63738
63739 -static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63740 - void *buf, int len, int write)
63741 +static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63742 + void *buf, size_t len, int write)
63743 {
63744 struct file *file = vma->vm_file;
63745 struct kernfs_open_file *of = kernfs_of(file);
63746 - int ret;
63747 + ssize_t ret;
63748
63749 if (!of->vm_ops)
63750 return -EINVAL;
63751 @@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63752 return -ENOMEM;
63753
63754 atomic_set(&new_on->refcnt, 0);
63755 - atomic_set(&new_on->event, 1);
63756 + atomic_set_unchecked(&new_on->event, 1);
63757 init_waitqueue_head(&new_on->poll);
63758 INIT_LIST_HEAD(&new_on->files);
63759 goto retry;
63760 @@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63761
63762 kernfs_put_active(kn);
63763
63764 - if (of->event != atomic_read(&on->event))
63765 + if (of->event != atomic_read_unchecked(&on->event))
63766 goto trigger;
63767
63768 return DEFAULT_POLLMASK;
63769 @@ -818,7 +818,7 @@ repeat:
63770
63771 on = kn->attr.open;
63772 if (on) {
63773 - atomic_inc(&on->event);
63774 + atomic_inc_unchecked(&on->event);
63775 wake_up_interruptible(&on->poll);
63776 }
63777
63778 diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63779 index 8a19889..4c3069a 100644
63780 --- a/fs/kernfs/symlink.c
63781 +++ b/fs/kernfs/symlink.c
63782 @@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63783 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63784 void *cookie)
63785 {
63786 - char *page = nd_get_link(nd);
63787 + const char *page = nd_get_link(nd);
63788 if (!IS_ERR(page))
63789 free_page((unsigned long)page);
63790 }
63791 diff --git a/fs/libfs.c b/fs/libfs.c
63792 index 005843c..06c4191 100644
63793 --- a/fs/libfs.c
63794 +++ b/fs/libfs.c
63795 @@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63796
63797 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63798 struct dentry *next = list_entry(p, struct dentry, d_child);
63799 + char d_name[sizeof(next->d_iname)];
63800 + const unsigned char *name;
63801 +
63802 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63803 if (!simple_positive(next)) {
63804 spin_unlock(&next->d_lock);
63805 @@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63806
63807 spin_unlock(&next->d_lock);
63808 spin_unlock(&dentry->d_lock);
63809 - if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63810 + name = next->d_name.name;
63811 + if (name == next->d_iname) {
63812 + memcpy(d_name, name, next->d_name.len);
63813 + name = d_name;
63814 + }
63815 + if (!dir_emit(ctx, name, next->d_name.len,
63816 next->d_inode->i_ino, dt_type(next->d_inode)))
63817 return 0;
63818 spin_lock(&dentry->d_lock);
63819 @@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63820 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63821 void *cookie)
63822 {
63823 - char *s = nd_get_link(nd);
63824 + const char *s = nd_get_link(nd);
63825 if (!IS_ERR(s))
63826 kfree(s);
63827 }
63828 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63829 index acd3947..1f896e2 100644
63830 --- a/fs/lockd/clntproc.c
63831 +++ b/fs/lockd/clntproc.c
63832 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63833 /*
63834 * Cookie counter for NLM requests
63835 */
63836 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63837 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63838
63839 void nlmclnt_next_cookie(struct nlm_cookie *c)
63840 {
63841 - u32 cookie = atomic_inc_return(&nlm_cookie);
63842 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63843
63844 memcpy(c->data, &cookie, 4);
63845 c->len=4;
63846 diff --git a/fs/locks.c b/fs/locks.c
63847 index 735b8d3..dfc44a2 100644
63848 --- a/fs/locks.c
63849 +++ b/fs/locks.c
63850 @@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63851 locks_remove_posix(filp, filp);
63852
63853 if (filp->f_op->flock) {
63854 - struct file_lock fl = {
63855 + struct file_lock flock = {
63856 .fl_owner = filp,
63857 .fl_pid = current->tgid,
63858 .fl_file = filp,
63859 @@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63860 .fl_type = F_UNLCK,
63861 .fl_end = OFFSET_MAX,
63862 };
63863 - filp->f_op->flock(filp, F_SETLKW, &fl);
63864 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
63865 - fl.fl_ops->fl_release_private(&fl);
63866 + filp->f_op->flock(filp, F_SETLKW, &flock);
63867 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
63868 + flock.fl_ops->fl_release_private(&flock);
63869 }
63870
63871 spin_lock(&inode->i_lock);
63872 diff --git a/fs/mount.h b/fs/mount.h
63873 index f82c628..9492b99 100644
63874 --- a/fs/mount.h
63875 +++ b/fs/mount.h
63876 @@ -11,7 +11,7 @@ struct mnt_namespace {
63877 u64 seq; /* Sequence number to prevent loops */
63878 wait_queue_head_t poll;
63879 u64 event;
63880 -};
63881 +} __randomize_layout;
63882
63883 struct mnt_pcp {
63884 int mnt_count;
63885 @@ -62,7 +62,7 @@ struct mount {
63886 int mnt_expiry_mark; /* true if marked for expiry */
63887 struct hlist_head mnt_pins;
63888 struct path mnt_ex_mountpoint;
63889 -};
63890 +} __randomize_layout;
63891
63892 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63893
63894 diff --git a/fs/namei.c b/fs/namei.c
63895 index db5fe86..d3dcc14 100644
63896 --- a/fs/namei.c
63897 +++ b/fs/namei.c
63898 @@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63899 if (ret != -EACCES)
63900 return ret;
63901
63902 +#ifdef CONFIG_GRKERNSEC
63903 + /* we'll block if we have to log due to a denied capability use */
63904 + if (mask & MAY_NOT_BLOCK)
63905 + return -ECHILD;
63906 +#endif
63907 +
63908 if (S_ISDIR(inode->i_mode)) {
63909 /* DACs are overridable for directories */
63910 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63911 - return 0;
63912 if (!(mask & MAY_WRITE))
63913 - if (capable_wrt_inode_uidgid(inode,
63914 - CAP_DAC_READ_SEARCH))
63915 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63916 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63917 return 0;
63918 + if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63919 + return 0;
63920 return -EACCES;
63921 }
63922 /*
63923 + * Searching includes executable on directories, else just read.
63924 + */
63925 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63926 + if (mask == MAY_READ)
63927 + if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63928 + capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63929 + return 0;
63930 +
63931 + /*
63932 * Read/write DACs are always overridable.
63933 * Executable DACs are overridable when there is
63934 * at least one exec bit set.
63935 @@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
63936 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63937 return 0;
63938
63939 - /*
63940 - * Searching includes executable on directories, else just read.
63941 - */
63942 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63943 - if (mask == MAY_READ)
63944 - if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63945 - return 0;
63946 -
63947 return -EACCES;
63948 }
63949 EXPORT_SYMBOL(generic_permission);
63950 @@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63951 {
63952 struct dentry *dentry = link->dentry;
63953 int error;
63954 - char *s;
63955 + const char *s;
63956
63957 BUG_ON(nd->flags & LOOKUP_RCU);
63958
63959 @@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63960 if (error)
63961 goto out_put_nd_path;
63962
63963 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
63964 + dentry->d_inode, dentry, nd->path.mnt)) {
63965 + error = -EACCES;
63966 + goto out_put_nd_path;
63967 + }
63968 +
63969 nd->last_type = LAST_BIND;
63970 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
63971 error = PTR_ERR(*p);
63972 @@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
63973 if (res)
63974 break;
63975 res = walk_component(nd, path, LOOKUP_FOLLOW);
63976 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
63977 + res = -EACCES;
63978 put_link(nd, &link, cookie);
63979 } while (res > 0);
63980
63981 @@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
63982 static inline u64 hash_name(const char *name)
63983 {
63984 unsigned long a, b, adata, bdata, mask, hash, len;
63985 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63986 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63987
63988 hash = a = 0;
63989 len = -sizeof(unsigned long);
63990 @@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
63991 if (err)
63992 break;
63993 err = lookup_last(nd, &path);
63994 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
63995 + err = -EACCES;
63996 put_link(nd, &link, cookie);
63997 }
63998 }
63999 @@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
64000 if (!err)
64001 err = complete_walk(nd);
64002
64003 + if (!err && !(nd->flags & LOOKUP_PARENT)) {
64004 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64005 + path_put(&nd->path);
64006 + err = -ENOENT;
64007 + }
64008 + }
64009 +
64010 if (!err && nd->flags & LOOKUP_DIRECTORY) {
64011 if (!d_can_lookup(nd->path.dentry)) {
64012 path_put(&nd->path);
64013 @@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
64014 retval = path_lookupat(dfd, name->name,
64015 flags | LOOKUP_REVAL, nd);
64016
64017 - if (likely(!retval))
64018 + if (likely(!retval)) {
64019 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
64020 + if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
64021 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
64022 + path_put(&nd->path);
64023 + return -ENOENT;
64024 + }
64025 + }
64026 + }
64027 return retval;
64028 }
64029
64030 @@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
64031 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
64032 return -EPERM;
64033
64034 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
64035 + return -EPERM;
64036 + if (gr_handle_rawio(inode))
64037 + return -EPERM;
64038 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
64039 + return -EACCES;
64040 +
64041 return 0;
64042 }
64043
64044 @@ -2813,7 +2851,7 @@ looked_up:
64045 * cleared otherwise prior to returning.
64046 */
64047 static int lookup_open(struct nameidata *nd, struct path *path,
64048 - struct file *file,
64049 + struct path *link, struct file *file,
64050 const struct open_flags *op,
64051 bool got_write, int *opened)
64052 {
64053 @@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64054 /* Negative dentry, just create the file */
64055 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
64056 umode_t mode = op->mode;
64057 +
64058 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
64059 + error = -EACCES;
64060 + goto out_dput;
64061 + }
64062 +
64063 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
64064 + error = -EACCES;
64065 + goto out_dput;
64066 + }
64067 +
64068 if (!IS_POSIXACL(dir->d_inode))
64069 mode &= ~current_umask();
64070 /*
64071 @@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
64072 nd->flags & LOOKUP_EXCL);
64073 if (error)
64074 goto out_dput;
64075 + else
64076 + gr_handle_create(dentry, nd->path.mnt);
64077 }
64078 out_no_open:
64079 path->dentry = dentry;
64080 @@ -2883,7 +2934,7 @@ out_dput:
64081 /*
64082 * Handle the last step of open()
64083 */
64084 -static int do_last(struct nameidata *nd, struct path *path,
64085 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
64086 struct file *file, const struct open_flags *op,
64087 int *opened, struct filename *name)
64088 {
64089 @@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
64090 if (error)
64091 return error;
64092
64093 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
64094 + error = -ENOENT;
64095 + goto out;
64096 + }
64097 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
64098 + error = -EACCES;
64099 + goto out;
64100 + }
64101 +
64102 audit_inode(name, dir, LOOKUP_PARENT);
64103 error = -EISDIR;
64104 /* trailing slashes? */
64105 @@ -2952,7 +3012,7 @@ retry_lookup:
64106 */
64107 }
64108 mutex_lock(&dir->d_inode->i_mutex);
64109 - error = lookup_open(nd, path, file, op, got_write, opened);
64110 + error = lookup_open(nd, path, link, file, op, got_write, opened);
64111 mutex_unlock(&dir->d_inode->i_mutex);
64112
64113 if (error <= 0) {
64114 @@ -2976,11 +3036,28 @@ retry_lookup:
64115 goto finish_open_created;
64116 }
64117
64118 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64119 + error = -ENOENT;
64120 + goto exit_dput;
64121 + }
64122 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64123 + error = -EACCES;
64124 + goto exit_dput;
64125 + }
64126 +
64127 /*
64128 * create/update audit record if it already exists.
64129 */
64130 - if (d_is_positive(path->dentry))
64131 + if (d_is_positive(path->dentry)) {
64132 + /* only check if O_CREAT is specified, all other checks need to go
64133 + into may_open */
64134 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64135 + error = -EACCES;
64136 + goto exit_dput;
64137 + }
64138 +
64139 audit_inode(name, path->dentry, 0);
64140 + }
64141
64142 /*
64143 * If atomic_open() acquired write access it is dropped now due to
64144 @@ -3021,6 +3098,11 @@ finish_lookup:
64145 }
64146 }
64147 BUG_ON(inode != path->dentry->d_inode);
64148 + /* if we're resolving a symlink to another symlink */
64149 + if (link && gr_handle_symlink_owner(link, inode)) {
64150 + error = -EACCES;
64151 + goto out;
64152 + }
64153 return 1;
64154 }
64155
64156 @@ -3040,7 +3122,18 @@ finish_open:
64157 path_put(&save_parent);
64158 return error;
64159 }
64160 +
64161 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64162 + error = -ENOENT;
64163 + goto out;
64164 + }
64165 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
64166 + error = -EACCES;
64167 + goto out;
64168 + }
64169 +
64170 audit_inode(name, nd->path.dentry, 0);
64171 +
64172 error = -EISDIR;
64173 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64174 goto out;
64175 @@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64176 if (unlikely(error))
64177 goto out;
64178
64179 - error = do_last(nd, &path, file, op, &opened, pathname);
64180 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64181 while (unlikely(error > 0)) { /* trailing symlink */
64182 struct path link = path;
64183 void *cookie;
64184 @@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64185 error = follow_link(&link, nd, &cookie);
64186 if (unlikely(error))
64187 break;
64188 - error = do_last(nd, &path, file, op, &opened, pathname);
64189 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
64190 put_link(nd, &link, cookie);
64191 }
64192 out:
64193 @@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64194 goto unlock;
64195
64196 error = -EEXIST;
64197 - if (d_is_positive(dentry))
64198 + if (d_is_positive(dentry)) {
64199 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64200 + error = -ENOENT;
64201 goto fail;
64202 -
64203 + }
64204 /*
64205 * Special case - lookup gave negative, but... we had foo/bar/
64206 * From the vfs_mknod() POV we just have a negative dentry -
64207 @@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64208 }
64209 EXPORT_SYMBOL(user_path_create);
64210
64211 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64212 +{
64213 + struct filename *tmp = getname(pathname);
64214 + struct dentry *res;
64215 + if (IS_ERR(tmp))
64216 + return ERR_CAST(tmp);
64217 + res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64218 + if (IS_ERR(res))
64219 + putname(tmp);
64220 + else
64221 + *to = tmp;
64222 + return res;
64223 +}
64224 +
64225 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64226 {
64227 int error = may_create(dir, dentry);
64228 @@ -3442,6 +3551,17 @@ retry:
64229
64230 if (!IS_POSIXACL(path.dentry->d_inode))
64231 mode &= ~current_umask();
64232 +
64233 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64234 + error = -EPERM;
64235 + goto out;
64236 + }
64237 +
64238 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64239 + error = -EACCES;
64240 + goto out;
64241 + }
64242 +
64243 error = security_path_mknod(&path, dentry, mode, dev);
64244 if (error)
64245 goto out;
64246 @@ -3457,6 +3577,8 @@ retry:
64247 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64248 break;
64249 }
64250 + if (!error)
64251 + gr_handle_create(dentry, path.mnt);
64252 out:
64253 done_path_create(&path, dentry);
64254 if (retry_estale(error, lookup_flags)) {
64255 @@ -3511,9 +3633,16 @@ retry:
64256
64257 if (!IS_POSIXACL(path.dentry->d_inode))
64258 mode &= ~current_umask();
64259 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64260 + error = -EACCES;
64261 + goto out;
64262 + }
64263 error = security_path_mkdir(&path, dentry, mode);
64264 if (!error)
64265 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64266 + if (!error)
64267 + gr_handle_create(dentry, path.mnt);
64268 +out:
64269 done_path_create(&path, dentry);
64270 if (retry_estale(error, lookup_flags)) {
64271 lookup_flags |= LOOKUP_REVAL;
64272 @@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64273 struct filename *name;
64274 struct dentry *dentry;
64275 struct nameidata nd;
64276 + ino_t saved_ino = 0;
64277 + dev_t saved_dev = 0;
64278 unsigned int lookup_flags = 0;
64279 retry:
64280 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64281 @@ -3629,10 +3760,21 @@ retry:
64282 error = -ENOENT;
64283 goto exit3;
64284 }
64285 +
64286 + saved_ino = dentry->d_inode->i_ino;
64287 + saved_dev = gr_get_dev_from_dentry(dentry);
64288 +
64289 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64290 + error = -EACCES;
64291 + goto exit3;
64292 + }
64293 +
64294 error = security_path_rmdir(&nd.path, dentry);
64295 if (error)
64296 goto exit3;
64297 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64298 + if (!error && (saved_dev || saved_ino))
64299 + gr_handle_delete(saved_ino, saved_dev);
64300 exit3:
64301 dput(dentry);
64302 exit2:
64303 @@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64304 struct nameidata nd;
64305 struct inode *inode = NULL;
64306 struct inode *delegated_inode = NULL;
64307 + ino_t saved_ino = 0;
64308 + dev_t saved_dev = 0;
64309 unsigned int lookup_flags = 0;
64310 retry:
64311 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64312 @@ -3751,10 +3895,22 @@ retry_deleg:
64313 if (d_is_negative(dentry))
64314 goto slashes;
64315 ihold(inode);
64316 +
64317 + if (inode->i_nlink <= 1) {
64318 + saved_ino = inode->i_ino;
64319 + saved_dev = gr_get_dev_from_dentry(dentry);
64320 + }
64321 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64322 + error = -EACCES;
64323 + goto exit2;
64324 + }
64325 +
64326 error = security_path_unlink(&nd.path, dentry);
64327 if (error)
64328 goto exit2;
64329 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64330 + if (!error && (saved_ino || saved_dev))
64331 + gr_handle_delete(saved_ino, saved_dev);
64332 exit2:
64333 dput(dentry);
64334 }
64335 @@ -3843,9 +3999,17 @@ retry:
64336 if (IS_ERR(dentry))
64337 goto out_putname;
64338
64339 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64340 + error = -EACCES;
64341 + goto out;
64342 + }
64343 +
64344 error = security_path_symlink(&path, dentry, from->name);
64345 if (!error)
64346 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64347 + if (!error)
64348 + gr_handle_create(dentry, path.mnt);
64349 +out:
64350 done_path_create(&path, dentry);
64351 if (retry_estale(error, lookup_flags)) {
64352 lookup_flags |= LOOKUP_REVAL;
64353 @@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64354 struct dentry *new_dentry;
64355 struct path old_path, new_path;
64356 struct inode *delegated_inode = NULL;
64357 + struct filename *to = NULL;
64358 int how = 0;
64359 int error;
64360
64361 @@ -3972,7 +4137,7 @@ retry:
64362 if (error)
64363 return error;
64364
64365 - new_dentry = user_path_create(newdfd, newname, &new_path,
64366 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64367 (how & LOOKUP_REVAL));
64368 error = PTR_ERR(new_dentry);
64369 if (IS_ERR(new_dentry))
64370 @@ -3984,11 +4149,28 @@ retry:
64371 error = may_linkat(&old_path);
64372 if (unlikely(error))
64373 goto out_dput;
64374 +
64375 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64376 + old_path.dentry->d_inode,
64377 + old_path.dentry->d_inode->i_mode, to)) {
64378 + error = -EACCES;
64379 + goto out_dput;
64380 + }
64381 +
64382 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64383 + old_path.dentry, old_path.mnt, to)) {
64384 + error = -EACCES;
64385 + goto out_dput;
64386 + }
64387 +
64388 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64389 if (error)
64390 goto out_dput;
64391 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64392 + if (!error)
64393 + gr_handle_create(new_dentry, new_path.mnt);
64394 out_dput:
64395 + putname(to);
64396 done_path_create(&new_path, new_dentry);
64397 if (delegated_inode) {
64398 error = break_deleg_wait(&delegated_inode);
64399 @@ -4304,6 +4486,12 @@ retry_deleg:
64400 if (new_dentry == trap)
64401 goto exit5;
64402
64403 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64404 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
64405 + to, flags);
64406 + if (error)
64407 + goto exit5;
64408 +
64409 error = security_path_rename(&oldnd.path, old_dentry,
64410 &newnd.path, new_dentry, flags);
64411 if (error)
64412 @@ -4311,6 +4499,9 @@ retry_deleg:
64413 error = vfs_rename(old_dir->d_inode, old_dentry,
64414 new_dir->d_inode, new_dentry,
64415 &delegated_inode, flags);
64416 + if (!error)
64417 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64418 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64419 exit5:
64420 dput(new_dentry);
64421 exit4:
64422 @@ -4367,14 +4558,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64423
64424 int readlink_copy(char __user *buffer, int buflen, const char *link)
64425 {
64426 + char tmpbuf[64];
64427 + const char *newlink;
64428 int len = PTR_ERR(link);
64429 +
64430 if (IS_ERR(link))
64431 goto out;
64432
64433 len = strlen(link);
64434 if (len > (unsigned) buflen)
64435 len = buflen;
64436 - if (copy_to_user(buffer, link, len))
64437 +
64438 + if (len < sizeof(tmpbuf)) {
64439 + memcpy(tmpbuf, link, len);
64440 + newlink = tmpbuf;
64441 + } else
64442 + newlink = link;
64443 +
64444 + if (copy_to_user(buffer, newlink, len))
64445 len = -EFAULT;
64446 out:
64447 return len;
64448 diff --git a/fs/namespace.c b/fs/namespace.c
64449 index bbde147..f4deeba 100644
64450 --- a/fs/namespace.c
64451 +++ b/fs/namespace.c
64452 @@ -1447,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64453 if (!(sb->s_flags & MS_RDONLY))
64454 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64455 up_write(&sb->s_umount);
64456 +
64457 + gr_log_remount(mnt->mnt_devname, retval);
64458 +
64459 return retval;
64460 }
64461
64462 @@ -1469,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64463 }
64464 unlock_mount_hash();
64465 namespace_unlock();
64466 +
64467 + gr_log_unmount(mnt->mnt_devname, retval);
64468 +
64469 return retval;
64470 }
64471
64472 @@ -1519,7 +1525,7 @@ static inline bool may_mount(void)
64473 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64474 */
64475
64476 -SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64477 +SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64478 {
64479 struct path path;
64480 struct mount *mnt;
64481 @@ -1564,7 +1570,7 @@ out:
64482 /*
64483 * The 2.0 compatible umount. No flags.
64484 */
64485 -SYSCALL_DEFINE1(oldumount, char __user *, name)
64486 +SYSCALL_DEFINE1(oldumount, const char __user *, name)
64487 {
64488 return sys_umount(name, 0);
64489 }
64490 @@ -2632,6 +2638,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64491 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64492 MS_STRICTATIME);
64493
64494 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64495 + retval = -EPERM;
64496 + goto dput_out;
64497 + }
64498 +
64499 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64500 + retval = -EPERM;
64501 + goto dput_out;
64502 + }
64503 +
64504 if (flags & MS_REMOUNT)
64505 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64506 data_page);
64507 @@ -2645,7 +2661,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64508 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64509 dev_name, data_page);
64510 dput_out:
64511 + gr_log_mount(dev_name, &path, retval);
64512 +
64513 path_put(&path);
64514 +
64515 return retval;
64516 }
64517
64518 @@ -2663,7 +2682,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64519 * number incrementing at 10Ghz will take 12,427 years to wrap which
64520 * is effectively never, so we can ignore the possibility.
64521 */
64522 -static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64523 +static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64524
64525 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64526 {
64527 @@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64528 kfree(new_ns);
64529 return ERR_PTR(ret);
64530 }
64531 - new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64532 + new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64533 atomic_set(&new_ns->count, 1);
64534 new_ns->root = NULL;
64535 INIT_LIST_HEAD(&new_ns->list);
64536 @@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64537 return new_ns;
64538 }
64539
64540 -struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64541 +__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64542 struct user_namespace *user_ns, struct fs_struct *new_fs)
64543 {
64544 struct mnt_namespace *new_ns;
64545 @@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64546 }
64547 EXPORT_SYMBOL(mount_subtree);
64548
64549 -SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64550 - char __user *, type, unsigned long, flags, void __user *, data)
64551 +SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64552 + const char __user *, type, unsigned long, flags, void __user *, data)
64553 {
64554 int ret;
64555 char *kernel_type;
64556 @@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64557 if (error)
64558 goto out2;
64559
64560 + if (gr_handle_chroot_pivot()) {
64561 + error = -EPERM;
64562 + goto out2;
64563 + }
64564 +
64565 get_fs_root(current->fs, &root);
64566 old_mp = lock_mount(&old);
64567 error = PTR_ERR(old_mp);
64568 @@ -3187,7 +3211,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64569 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64570 return -EPERM;
64571
64572 - if (fs->users != 1)
64573 + if (atomic_read(&fs->users) != 1)
64574 return -EINVAL;
64575
64576 get_mnt_ns(mnt_ns);
64577 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64578 index f4ccfe6..a5cf064 100644
64579 --- a/fs/nfs/callback_xdr.c
64580 +++ b/fs/nfs/callback_xdr.c
64581 @@ -51,7 +51,7 @@ struct callback_op {
64582 callback_decode_arg_t decode_args;
64583 callback_encode_res_t encode_res;
64584 long res_maxsize;
64585 -};
64586 +} __do_const;
64587
64588 static struct callback_op callback_ops[];
64589
64590 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64591 index 00689a8..b162632 100644
64592 --- a/fs/nfs/inode.c
64593 +++ b/fs/nfs/inode.c
64594 @@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64595 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64596 }
64597
64598 -static atomic_long_t nfs_attr_generation_counter;
64599 +static atomic_long_unchecked_t nfs_attr_generation_counter;
64600
64601 static unsigned long nfs_read_attr_generation_counter(void)
64602 {
64603 - return atomic_long_read(&nfs_attr_generation_counter);
64604 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64605 }
64606
64607 unsigned long nfs_inc_attr_generation_counter(void)
64608 {
64609 - return atomic_long_inc_return(&nfs_attr_generation_counter);
64610 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64611 }
64612
64613 void nfs_fattr_init(struct nfs_fattr *fattr)
64614 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64615 index 0beb023..3f685ec 100644
64616 --- a/fs/nfsd/nfs4proc.c
64617 +++ b/fs/nfsd/nfs4proc.c
64618 @@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64619 nfsd4op_rsize op_rsize_bop;
64620 stateid_getter op_get_currentstateid;
64621 stateid_setter op_set_currentstateid;
64622 -};
64623 +} __do_const;
64624
64625 static struct nfsd4_operation nfsd4_ops[];
64626
64627 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64628 index 2a77603..68e0e37 100644
64629 --- a/fs/nfsd/nfs4xdr.c
64630 +++ b/fs/nfsd/nfs4xdr.c
64631 @@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64632
64633 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64634
64635 -static nfsd4_dec nfsd4_dec_ops[] = {
64636 +static const nfsd4_dec nfsd4_dec_ops[] = {
64637 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64638 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64639 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64640 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64641 index 122f691..a00e2e0 100644
64642 --- a/fs/nfsd/nfscache.c
64643 +++ b/fs/nfsd/nfscache.c
64644 @@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64645 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64646 u32 hash;
64647 struct nfsd_drc_bucket *b;
64648 - int len;
64649 + long len;
64650 size_t bufsize = 0;
64651
64652 if (!rp)
64653 @@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64654 hash = nfsd_cache_hash(rp->c_xid);
64655 b = &drc_hashtbl[hash];
64656
64657 - len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64658 - len >>= 2;
64659 + if (statp) {
64660 + len = (char*)statp - (char*)resv->iov_base;
64661 + len = resv->iov_len - len;
64662 + len >>= 2;
64663 + }
64664
64665 /* Don't cache excessive amounts of data and XDR failures */
64666 - if (!statp || len > (256 >> 2)) {
64667 + if (!statp || len > (256 >> 2) || len < 0) {
64668 nfsd_reply_cache_free(b, rp);
64669 return;
64670 }
64671 @@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64672 switch (cachetype) {
64673 case RC_REPLSTAT:
64674 if (len != 1)
64675 - printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64676 + printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64677 rp->c_replstat = *statp;
64678 break;
64679 case RC_REPLBUFF:
64680 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64681 index 989129e..42e019e 100644
64682 --- a/fs/nfsd/vfs.c
64683 +++ b/fs/nfsd/vfs.c
64684 @@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64685
64686 oldfs = get_fs();
64687 set_fs(KERNEL_DS);
64688 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64689 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64690 set_fs(oldfs);
64691 return nfsd_finish_read(file, count, host_err);
64692 }
64693 @@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64694
64695 /* Write the data. */
64696 oldfs = get_fs(); set_fs(KERNEL_DS);
64697 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64698 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64699 set_fs(oldfs);
64700 if (host_err < 0)
64701 goto out_nfserr;
64702 @@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64703 */
64704
64705 oldfs = get_fs(); set_fs(KERNEL_DS);
64706 - host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64707 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64708 set_fs(oldfs);
64709
64710 if (host_err < 0)
64711 diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64712 index 52ccd34..7a6b202 100644
64713 --- a/fs/nls/nls_base.c
64714 +++ b/fs/nls/nls_base.c
64715 @@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64716
64717 int __register_nls(struct nls_table *nls, struct module *owner)
64718 {
64719 - struct nls_table ** tmp = &tables;
64720 + struct nls_table *tmp = tables;
64721
64722 if (nls->next)
64723 return -EBUSY;
64724
64725 - nls->owner = owner;
64726 + pax_open_kernel();
64727 + *(void **)&nls->owner = owner;
64728 + pax_close_kernel();
64729 spin_lock(&nls_lock);
64730 - while (*tmp) {
64731 - if (nls == *tmp) {
64732 + while (tmp) {
64733 + if (nls == tmp) {
64734 spin_unlock(&nls_lock);
64735 return -EBUSY;
64736 }
64737 - tmp = &(*tmp)->next;
64738 + tmp = tmp->next;
64739 }
64740 - nls->next = tables;
64741 + pax_open_kernel();
64742 + *(struct nls_table **)&nls->next = tables;
64743 + pax_close_kernel();
64744 tables = nls;
64745 spin_unlock(&nls_lock);
64746 return 0;
64747 @@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64748
64749 int unregister_nls(struct nls_table * nls)
64750 {
64751 - struct nls_table ** tmp = &tables;
64752 + struct nls_table * const * tmp = &tables;
64753
64754 spin_lock(&nls_lock);
64755 while (*tmp) {
64756 if (nls == *tmp) {
64757 - *tmp = nls->next;
64758 + pax_open_kernel();
64759 + *(struct nls_table **)tmp = nls->next;
64760 + pax_close_kernel();
64761 spin_unlock(&nls_lock);
64762 return 0;
64763 }
64764 @@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64765 return -EINVAL;
64766 }
64767
64768 -static struct nls_table *find_nls(char *charset)
64769 +static struct nls_table *find_nls(const char *charset)
64770 {
64771 struct nls_table *nls;
64772 spin_lock(&nls_lock);
64773 @@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64774 return nls;
64775 }
64776
64777 -struct nls_table *load_nls(char *charset)
64778 +struct nls_table *load_nls(const char *charset)
64779 {
64780 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64781 }
64782 diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64783 index 162b3f1..6076a7c 100644
64784 --- a/fs/nls/nls_euc-jp.c
64785 +++ b/fs/nls/nls_euc-jp.c
64786 @@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64787 p_nls = load_nls("cp932");
64788
64789 if (p_nls) {
64790 - table.charset2upper = p_nls->charset2upper;
64791 - table.charset2lower = p_nls->charset2lower;
64792 + pax_open_kernel();
64793 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64794 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64795 + pax_close_kernel();
64796 return register_nls(&table);
64797 }
64798
64799 diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64800 index a80a741..7b96e1b 100644
64801 --- a/fs/nls/nls_koi8-ru.c
64802 +++ b/fs/nls/nls_koi8-ru.c
64803 @@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64804 p_nls = load_nls("koi8-u");
64805
64806 if (p_nls) {
64807 - table.charset2upper = p_nls->charset2upper;
64808 - table.charset2lower = p_nls->charset2lower;
64809 + pax_open_kernel();
64810 + *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64811 + *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64812 + pax_close_kernel();
64813 return register_nls(&table);
64814 }
64815
64816 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64817 index c991616..5ae51af 100644
64818 --- a/fs/notify/fanotify/fanotify_user.c
64819 +++ b/fs/notify/fanotify/fanotify_user.c
64820 @@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64821
64822 fd = fanotify_event_metadata.fd;
64823 ret = -EFAULT;
64824 - if (copy_to_user(buf, &fanotify_event_metadata,
64825 - fanotify_event_metadata.event_len))
64826 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64827 + copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64828 goto out_close_fd;
64829
64830 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64831 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64832 index a95d8e0..a91a5fd 100644
64833 --- a/fs/notify/notification.c
64834 +++ b/fs/notify/notification.c
64835 @@ -48,7 +48,7 @@
64836 #include <linux/fsnotify_backend.h>
64837 #include "fsnotify.h"
64838
64839 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64840 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64841
64842 /**
64843 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64844 @@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64845 */
64846 u32 fsnotify_get_cookie(void)
64847 {
64848 - return atomic_inc_return(&fsnotify_sync_cookie);
64849 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64850 }
64851 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64852
64853 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64854 index 9e38daf..5727cae 100644
64855 --- a/fs/ntfs/dir.c
64856 +++ b/fs/ntfs/dir.c
64857 @@ -1310,7 +1310,7 @@ find_next_index_buffer:
64858 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64859 ~(s64)(ndir->itype.index.block_size - 1)));
64860 /* Bounds checks. */
64861 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64862 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64863 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64864 "inode 0x%lx or driver bug.", vdir->i_ino);
64865 goto err_out;
64866 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64867 index 643faa4..ef9027e 100644
64868 --- a/fs/ntfs/file.c
64869 +++ b/fs/ntfs/file.c
64870 @@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64871 char *addr;
64872 size_t total = 0;
64873 unsigned len;
64874 - int left;
64875 + unsigned left;
64876
64877 do {
64878 len = PAGE_CACHE_SIZE - ofs;
64879 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64880 index 9e1e112..241a52a 100644
64881 --- a/fs/ntfs/super.c
64882 +++ b/fs/ntfs/super.c
64883 @@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64884 if (!silent)
64885 ntfs_error(sb, "Primary boot sector is invalid.");
64886 } else if (!silent)
64887 - ntfs_error(sb, read_err_str, "primary");
64888 + ntfs_error(sb, read_err_str, "%s", "primary");
64889 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64890 if (bh_primary)
64891 brelse(bh_primary);
64892 @@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64893 goto hotfix_primary_boot_sector;
64894 brelse(bh_backup);
64895 } else if (!silent)
64896 - ntfs_error(sb, read_err_str, "backup");
64897 + ntfs_error(sb, read_err_str, "%s", "backup");
64898 /* Try to read NT3.51- backup boot sector. */
64899 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
64900 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
64901 @@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64902 "sector.");
64903 brelse(bh_backup);
64904 } else if (!silent)
64905 - ntfs_error(sb, read_err_str, "backup");
64906 + ntfs_error(sb, read_err_str, "%s", "backup");
64907 /* We failed. Cleanup and return. */
64908 if (bh_primary)
64909 brelse(bh_primary);
64910 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
64911 index 0440134..d52c93a 100644
64912 --- a/fs/ocfs2/localalloc.c
64913 +++ b/fs/ocfs2/localalloc.c
64914 @@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
64915 goto bail;
64916 }
64917
64918 - atomic_inc(&osb->alloc_stats.moves);
64919 + atomic_inc_unchecked(&osb->alloc_stats.moves);
64920
64921 bail:
64922 if (handle)
64923 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
64924 index bbec539..7b266d5 100644
64925 --- a/fs/ocfs2/ocfs2.h
64926 +++ b/fs/ocfs2/ocfs2.h
64927 @@ -236,11 +236,11 @@ enum ocfs2_vol_state
64928
64929 struct ocfs2_alloc_stats
64930 {
64931 - atomic_t moves;
64932 - atomic_t local_data;
64933 - atomic_t bitmap_data;
64934 - atomic_t bg_allocs;
64935 - atomic_t bg_extends;
64936 + atomic_unchecked_t moves;
64937 + atomic_unchecked_t local_data;
64938 + atomic_unchecked_t bitmap_data;
64939 + atomic_unchecked_t bg_allocs;
64940 + atomic_unchecked_t bg_extends;
64941 };
64942
64943 enum ocfs2_local_alloc_state
64944 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
64945 index 0cb889a..6a26b24 100644
64946 --- a/fs/ocfs2/suballoc.c
64947 +++ b/fs/ocfs2/suballoc.c
64948 @@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
64949 mlog_errno(status);
64950 goto bail;
64951 }
64952 - atomic_inc(&osb->alloc_stats.bg_extends);
64953 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
64954
64955 /* You should never ask for this much metadata */
64956 BUG_ON(bits_wanted >
64957 @@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
64958 mlog_errno(status);
64959 goto bail;
64960 }
64961 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64962 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64963
64964 *suballoc_loc = res.sr_bg_blkno;
64965 *suballoc_bit_start = res.sr_bit_offset;
64966 @@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
64967 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
64968 res->sr_bits);
64969
64970 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64971 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64972
64973 BUG_ON(res->sr_bits != 1);
64974
64975 @@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
64976 mlog_errno(status);
64977 goto bail;
64978 }
64979 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64980 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64981
64982 BUG_ON(res.sr_bits != 1);
64983
64984 @@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64985 cluster_start,
64986 num_clusters);
64987 if (!status)
64988 - atomic_inc(&osb->alloc_stats.local_data);
64989 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
64990 } else {
64991 if (min_clusters > (osb->bitmap_cpg - 1)) {
64992 /* The only paths asking for contiguousness
64993 @@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64994 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
64995 res.sr_bg_blkno,
64996 res.sr_bit_offset);
64997 - atomic_inc(&osb->alloc_stats.bitmap_data);
64998 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
64999 *num_clusters = res.sr_bits;
65000 }
65001 }
65002 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
65003 index 93c85bc..02f68a4 100644
65004 --- a/fs/ocfs2/super.c
65005 +++ b/fs/ocfs2/super.c
65006 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
65007 "%10s => GlobalAllocs: %d LocalAllocs: %d "
65008 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
65009 "Stats",
65010 - atomic_read(&osb->alloc_stats.bitmap_data),
65011 - atomic_read(&osb->alloc_stats.local_data),
65012 - atomic_read(&osb->alloc_stats.bg_allocs),
65013 - atomic_read(&osb->alloc_stats.moves),
65014 - atomic_read(&osb->alloc_stats.bg_extends));
65015 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
65016 + atomic_read_unchecked(&osb->alloc_stats.local_data),
65017 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
65018 + atomic_read_unchecked(&osb->alloc_stats.moves),
65019 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
65020
65021 out += snprintf(buf + out, len - out,
65022 "%10s => State: %u Descriptor: %llu Size: %u bits "
65023 @@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
65024
65025 mutex_init(&osb->system_file_mutex);
65026
65027 - atomic_set(&osb->alloc_stats.moves, 0);
65028 - atomic_set(&osb->alloc_stats.local_data, 0);
65029 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
65030 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
65031 - atomic_set(&osb->alloc_stats.bg_extends, 0);
65032 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
65033 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
65034 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
65035 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
65036 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
65037
65038 /* Copy the blockcheck stats from the superblock probe */
65039 osb->osb_ecc_stats = *stats;
65040 diff --git a/fs/open.c b/fs/open.c
65041 index de92c13..52d2a6c 100644
65042 --- a/fs/open.c
65043 +++ b/fs/open.c
65044 @@ -32,6 +32,8 @@
65045 #include <linux/dnotify.h>
65046 #include <linux/compat.h>
65047
65048 +#define CREATE_TRACE_POINTS
65049 +#include <trace/events/fs.h>
65050 #include "internal.h"
65051
65052 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
65053 @@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
65054 error = locks_verify_truncate(inode, NULL, length);
65055 if (!error)
65056 error = security_path_truncate(path);
65057 + if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
65058 + error = -EACCES;
65059 if (!error)
65060 error = do_truncate(path->dentry, length, 0, NULL);
65061
65062 @@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
65063 error = locks_verify_truncate(inode, f.file, length);
65064 if (!error)
65065 error = security_path_truncate(&f.file->f_path);
65066 + if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
65067 + error = -EACCES;
65068 if (!error)
65069 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
65070 sb_end_write(inode->i_sb);
65071 @@ -380,6 +386,9 @@ retry:
65072 if (__mnt_is_readonly(path.mnt))
65073 res = -EROFS;
65074
65075 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
65076 + res = -EACCES;
65077 +
65078 out_path_release:
65079 path_put(&path);
65080 if (retry_estale(res, lookup_flags)) {
65081 @@ -411,6 +420,8 @@ retry:
65082 if (error)
65083 goto dput_and_out;
65084
65085 + gr_log_chdir(path.dentry, path.mnt);
65086 +
65087 set_fs_pwd(current->fs, &path);
65088
65089 dput_and_out:
65090 @@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65091 goto out_putf;
65092
65093 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65094 +
65095 + if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65096 + error = -EPERM;
65097 +
65098 + if (!error)
65099 + gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65100 +
65101 if (!error)
65102 set_fs_pwd(current->fs, &f.file->f_path);
65103 out_putf:
65104 @@ -469,7 +487,13 @@ retry:
65105 if (error)
65106 goto dput_and_out;
65107
65108 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65109 + goto dput_and_out;
65110 +
65111 set_fs_root(current->fs, &path);
65112 +
65113 + gr_handle_chroot_chdir(&path);
65114 +
65115 error = 0;
65116 dput_and_out:
65117 path_put(&path);
65118 @@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
65119 return error;
65120 retry_deleg:
65121 mutex_lock(&inode->i_mutex);
65122 +
65123 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65124 + error = -EACCES;
65125 + goto out_unlock;
65126 + }
65127 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65128 + error = -EACCES;
65129 + goto out_unlock;
65130 + }
65131 +
65132 error = security_path_chmod(path, mode);
65133 if (error)
65134 goto out_unlock;
65135 @@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65136 uid = make_kuid(current_user_ns(), user);
65137 gid = make_kgid(current_user_ns(), group);
65138
65139 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
65140 + return -EACCES;
65141 +
65142 newattrs.ia_valid = ATTR_CTIME;
65143 if (user != (uid_t) -1) {
65144 if (!uid_valid(uid))
65145 @@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65146 } else {
65147 fsnotify_open(f);
65148 fd_install(fd, f);
65149 + trace_do_sys_open(tmp->name, flags, mode);
65150 }
65151 }
65152 putname(tmp);
65153 diff --git a/fs/pipe.c b/fs/pipe.c
65154 index 21981e5..3d5f55c 100644
65155 --- a/fs/pipe.c
65156 +++ b/fs/pipe.c
65157 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65158
65159 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65160 {
65161 - if (pipe->files)
65162 + if (atomic_read(&pipe->files))
65163 mutex_lock_nested(&pipe->mutex, subclass);
65164 }
65165
65166 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65167
65168 void pipe_unlock(struct pipe_inode_info *pipe)
65169 {
65170 - if (pipe->files)
65171 + if (atomic_read(&pipe->files))
65172 mutex_unlock(&pipe->mutex);
65173 }
65174 EXPORT_SYMBOL(pipe_unlock);
65175 @@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65176 }
65177 if (bufs) /* More to do? */
65178 continue;
65179 - if (!pipe->writers)
65180 + if (!atomic_read(&pipe->writers))
65181 break;
65182 - if (!pipe->waiting_writers) {
65183 + if (!atomic_read(&pipe->waiting_writers)) {
65184 /* syscall merging: Usually we must not sleep
65185 * if O_NONBLOCK is set, or if we got some data.
65186 * But if a writer sleeps in kernel space, then
65187 @@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65188
65189 __pipe_lock(pipe);
65190
65191 - if (!pipe->readers) {
65192 + if (!atomic_read(&pipe->readers)) {
65193 send_sig(SIGPIPE, current, 0);
65194 ret = -EPIPE;
65195 goto out;
65196 @@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65197 for (;;) {
65198 int bufs;
65199
65200 - if (!pipe->readers) {
65201 + if (!atomic_read(&pipe->readers)) {
65202 send_sig(SIGPIPE, current, 0);
65203 if (!ret)
65204 ret = -EPIPE;
65205 @@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65206 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65207 do_wakeup = 0;
65208 }
65209 - pipe->waiting_writers++;
65210 + atomic_inc(&pipe->waiting_writers);
65211 pipe_wait(pipe);
65212 - pipe->waiting_writers--;
65213 + atomic_dec(&pipe->waiting_writers);
65214 }
65215 out:
65216 __pipe_unlock(pipe);
65217 @@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65218 mask = 0;
65219 if (filp->f_mode & FMODE_READ) {
65220 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65221 - if (!pipe->writers && filp->f_version != pipe->w_counter)
65222 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65223 mask |= POLLHUP;
65224 }
65225
65226 @@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65227 * Most Unices do not set POLLERR for FIFOs but on Linux they
65228 * behave exactly like pipes for poll().
65229 */
65230 - if (!pipe->readers)
65231 + if (!atomic_read(&pipe->readers))
65232 mask |= POLLERR;
65233 }
65234
65235 @@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65236 int kill = 0;
65237
65238 spin_lock(&inode->i_lock);
65239 - if (!--pipe->files) {
65240 + if (atomic_dec_and_test(&pipe->files)) {
65241 inode->i_pipe = NULL;
65242 kill = 1;
65243 }
65244 @@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65245
65246 __pipe_lock(pipe);
65247 if (file->f_mode & FMODE_READ)
65248 - pipe->readers--;
65249 + atomic_dec(&pipe->readers);
65250 if (file->f_mode & FMODE_WRITE)
65251 - pipe->writers--;
65252 + atomic_dec(&pipe->writers);
65253
65254 - if (pipe->readers || pipe->writers) {
65255 + if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65256 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65257 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65258 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65259 @@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65260 kfree(pipe);
65261 }
65262
65263 -static struct vfsmount *pipe_mnt __read_mostly;
65264 +struct vfsmount *pipe_mnt __read_mostly;
65265
65266 /*
65267 * pipefs_dname() is called from d_path().
65268 @@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65269 goto fail_iput;
65270
65271 inode->i_pipe = pipe;
65272 - pipe->files = 2;
65273 - pipe->readers = pipe->writers = 1;
65274 + atomic_set(&pipe->files, 2);
65275 + atomic_set(&pipe->readers, 1);
65276 + atomic_set(&pipe->writers, 1);
65277 inode->i_fop = &pipefifo_fops;
65278
65279 /*
65280 @@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65281 spin_lock(&inode->i_lock);
65282 if (inode->i_pipe) {
65283 pipe = inode->i_pipe;
65284 - pipe->files++;
65285 + atomic_inc(&pipe->files);
65286 spin_unlock(&inode->i_lock);
65287 } else {
65288 spin_unlock(&inode->i_lock);
65289 pipe = alloc_pipe_info();
65290 if (!pipe)
65291 return -ENOMEM;
65292 - pipe->files = 1;
65293 + atomic_set(&pipe->files, 1);
65294 spin_lock(&inode->i_lock);
65295 if (unlikely(inode->i_pipe)) {
65296 - inode->i_pipe->files++;
65297 + atomic_inc(&inode->i_pipe->files);
65298 spin_unlock(&inode->i_lock);
65299 free_pipe_info(pipe);
65300 pipe = inode->i_pipe;
65301 @@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65302 * opened, even when there is no process writing the FIFO.
65303 */
65304 pipe->r_counter++;
65305 - if (pipe->readers++ == 0)
65306 + if (atomic_inc_return(&pipe->readers) == 1)
65307 wake_up_partner(pipe);
65308
65309 - if (!is_pipe && !pipe->writers) {
65310 + if (!is_pipe && !atomic_read(&pipe->writers)) {
65311 if ((filp->f_flags & O_NONBLOCK)) {
65312 /* suppress POLLHUP until we have
65313 * seen a writer */
65314 @@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65315 * errno=ENXIO when there is no process reading the FIFO.
65316 */
65317 ret = -ENXIO;
65318 - if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65319 + if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65320 goto err;
65321
65322 pipe->w_counter++;
65323 - if (!pipe->writers++)
65324 + if (atomic_inc_return(&pipe->writers) == 1)
65325 wake_up_partner(pipe);
65326
65327 - if (!is_pipe && !pipe->readers) {
65328 + if (!is_pipe && !atomic_read(&pipe->readers)) {
65329 if (wait_for_partner(pipe, &pipe->r_counter))
65330 goto err_wr;
65331 }
65332 @@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65333 * the process can at least talk to itself.
65334 */
65335
65336 - pipe->readers++;
65337 - pipe->writers++;
65338 + atomic_inc(&pipe->readers);
65339 + atomic_inc(&pipe->writers);
65340 pipe->r_counter++;
65341 pipe->w_counter++;
65342 - if (pipe->readers == 1 || pipe->writers == 1)
65343 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65344 wake_up_partner(pipe);
65345 break;
65346
65347 @@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65348 return 0;
65349
65350 err_rd:
65351 - if (!--pipe->readers)
65352 + if (atomic_dec_and_test(&pipe->readers))
65353 wake_up_interruptible(&pipe->wait);
65354 ret = -ERESTARTSYS;
65355 goto err;
65356
65357 err_wr:
65358 - if (!--pipe->writers)
65359 + if (atomic_dec_and_test(&pipe->writers))
65360 wake_up_interruptible(&pipe->wait);
65361 ret = -ERESTARTSYS;
65362 goto err;
65363 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65364 index 0855f77..6787d50 100644
65365 --- a/fs/posix_acl.c
65366 +++ b/fs/posix_acl.c
65367 @@ -20,6 +20,7 @@
65368 #include <linux/xattr.h>
65369 #include <linux/export.h>
65370 #include <linux/user_namespace.h>
65371 +#include <linux/grsecurity.h>
65372
65373 struct posix_acl **acl_by_type(struct inode *inode, int type)
65374 {
65375 @@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65376 }
65377 }
65378 if (mode_p)
65379 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65380 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65381 return not_equiv;
65382 }
65383 EXPORT_SYMBOL(posix_acl_equiv_mode);
65384 @@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65385 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65386 }
65387
65388 - *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65389 + *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65390 return not_equiv;
65391 }
65392
65393 @@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65394 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65395 int err = -ENOMEM;
65396 if (clone) {
65397 + *mode_p &= ~gr_acl_umask();
65398 +
65399 err = posix_acl_create_masq(clone, mode_p);
65400 if (err < 0) {
65401 posix_acl_release(clone);
65402 @@ -659,11 +662,12 @@ struct posix_acl *
65403 posix_acl_from_xattr(struct user_namespace *user_ns,
65404 const void *value, size_t size)
65405 {
65406 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65407 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65408 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65409 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65410 int count;
65411 struct posix_acl *acl;
65412 struct posix_acl_entry *acl_e;
65413 + umode_t umask = gr_acl_umask();
65414
65415 if (!value)
65416 return NULL;
65417 @@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65418
65419 switch(acl_e->e_tag) {
65420 case ACL_USER_OBJ:
65421 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65422 + break;
65423 case ACL_GROUP_OBJ:
65424 case ACL_MASK:
65425 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65426 + break;
65427 case ACL_OTHER:
65428 + acl_e->e_perm &= ~(umask & S_IRWXO);
65429 break;
65430
65431 case ACL_USER:
65432 + acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65433 acl_e->e_uid =
65434 make_kuid(user_ns,
65435 le32_to_cpu(entry->e_id));
65436 @@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65437 goto fail;
65438 break;
65439 case ACL_GROUP:
65440 + acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65441 acl_e->e_gid =
65442 make_kgid(user_ns,
65443 le32_to_cpu(entry->e_id));
65444 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65445 index 2183fcf..3c32a98 100644
65446 --- a/fs/proc/Kconfig
65447 +++ b/fs/proc/Kconfig
65448 @@ -30,7 +30,7 @@ config PROC_FS
65449
65450 config PROC_KCORE
65451 bool "/proc/kcore support" if !ARM
65452 - depends on PROC_FS && MMU
65453 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65454 help
65455 Provides a virtual ELF core file of the live kernel. This can
65456 be read with gdb and other ELF tools. No modifications can be
65457 @@ -38,8 +38,8 @@ config PROC_KCORE
65458
65459 config PROC_VMCORE
65460 bool "/proc/vmcore support"
65461 - depends on PROC_FS && CRASH_DUMP
65462 - default y
65463 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65464 + default n
65465 help
65466 Exports the dump image of crashed kernel in ELF format.
65467
65468 @@ -63,8 +63,8 @@ config PROC_SYSCTL
65469 limited in memory.
65470
65471 config PROC_PAGE_MONITOR
65472 - default y
65473 - depends on PROC_FS && MMU
65474 + default n
65475 + depends on PROC_FS && MMU && !GRKERNSEC
65476 bool "Enable /proc page monitoring" if EXPERT
65477 help
65478 Various /proc files exist to monitor process memory utilization:
65479 diff --git a/fs/proc/array.c b/fs/proc/array.c
65480 index cd3653e..9b9b79a 100644
65481 --- a/fs/proc/array.c
65482 +++ b/fs/proc/array.c
65483 @@ -60,6 +60,7 @@
65484 #include <linux/tty.h>
65485 #include <linux/string.h>
65486 #include <linux/mman.h>
65487 +#include <linux/grsecurity.h>
65488 #include <linux/proc_fs.h>
65489 #include <linux/ioport.h>
65490 #include <linux/uaccess.h>
65491 @@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65492 seq_putc(m, '\n');
65493 }
65494
65495 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65496 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
65497 +{
65498 + if (p->mm)
65499 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65500 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65501 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65502 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65503 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65504 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65505 + else
65506 + seq_printf(m, "PaX:\t-----\n");
65507 +}
65508 +#endif
65509 +
65510 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65511 struct pid *pid, struct task_struct *task)
65512 {
65513 @@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65514 task_cpus_allowed(m, task);
65515 cpuset_task_status_allowed(m, task);
65516 task_context_switch_counts(m, task);
65517 +
65518 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65519 + task_pax(m, task);
65520 +#endif
65521 +
65522 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65523 + task_grsec_rbac(m, task);
65524 +#endif
65525 +
65526 return 0;
65527 }
65528
65529 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65530 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65531 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65532 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65533 +#endif
65534 +
65535 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65536 struct pid *pid, struct task_struct *task, int whole)
65537 {
65538 @@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65539 char tcomm[sizeof(task->comm)];
65540 unsigned long flags;
65541
65542 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65543 + if (current->exec_id != m->exec_id) {
65544 + gr_log_badprocpid("stat");
65545 + return 0;
65546 + }
65547 +#endif
65548 +
65549 state = *get_task_state(task);
65550 vsize = eip = esp = 0;
65551 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65552 @@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65553 gtime = task_gtime(task);
65554 }
65555
65556 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65557 + if (PAX_RAND_FLAGS(mm)) {
65558 + eip = 0;
65559 + esp = 0;
65560 + wchan = 0;
65561 + }
65562 +#endif
65563 +#ifdef CONFIG_GRKERNSEC_HIDESYM
65564 + wchan = 0;
65565 + eip =0;
65566 + esp =0;
65567 +#endif
65568 +
65569 /* scale priority and nice values from timeslices to -20..20 */
65570 /* to make it look like a "normal" Unix priority/nice value */
65571 priority = task_prio(task);
65572 @@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65573 seq_put_decimal_ull(m, ' ', vsize);
65574 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65575 seq_put_decimal_ull(m, ' ', rsslim);
65576 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65577 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65578 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65579 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65580 +#else
65581 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65582 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65583 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65584 +#endif
65585 seq_put_decimal_ull(m, ' ', esp);
65586 seq_put_decimal_ull(m, ' ', eip);
65587 /* The signal information here is obsolete.
65588 @@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65589 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65590 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65591
65592 - if (mm && permitted) {
65593 + if (mm && permitted
65594 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65595 + && !PAX_RAND_FLAGS(mm)
65596 +#endif
65597 + ) {
65598 seq_put_decimal_ull(m, ' ', mm->start_data);
65599 seq_put_decimal_ull(m, ' ', mm->end_data);
65600 seq_put_decimal_ull(m, ' ', mm->start_brk);
65601 @@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65602 struct pid *pid, struct task_struct *task)
65603 {
65604 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65605 - struct mm_struct *mm = get_task_mm(task);
65606 + struct mm_struct *mm;
65607
65608 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65609 + if (current->exec_id != m->exec_id) {
65610 + gr_log_badprocpid("statm");
65611 + return 0;
65612 + }
65613 +#endif
65614 + mm = get_task_mm(task);
65615 if (mm) {
65616 size = task_statm(mm, &shared, &text, &data, &resident);
65617 mmput(mm);
65618 @@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65619 return 0;
65620 }
65621
65622 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65623 +int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65624 +{
65625 + unsigned long flags;
65626 + u32 curr_ip = 0;
65627 +
65628 + if (lock_task_sighand(task, &flags)) {
65629 + curr_ip = task->signal->curr_ip;
65630 + unlock_task_sighand(task, &flags);
65631 + }
65632 + return seq_printf(m, "%pI4\n", &curr_ip);
65633 +}
65634 +#endif
65635 +
65636 #ifdef CONFIG_CHECKPOINT_RESTORE
65637 static struct pid *
65638 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65639 diff --git a/fs/proc/base.c b/fs/proc/base.c
65640 index 7dc3ea8..4cfe92f 100644
65641 --- a/fs/proc/base.c
65642 +++ b/fs/proc/base.c
65643 @@ -113,6 +113,14 @@ struct pid_entry {
65644 union proc_op op;
65645 };
65646
65647 +struct getdents_callback {
65648 + struct linux_dirent __user * current_dir;
65649 + struct linux_dirent __user * previous;
65650 + struct file * file;
65651 + int count;
65652 + int error;
65653 +};
65654 +
65655 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65656 .name = (NAME), \
65657 .len = sizeof(NAME) - 1, \
65658 @@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65659 return 0;
65660 }
65661
65662 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65663 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65664 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
65665 + _mm->pax_flags & MF_PAX_SEGMEXEC))
65666 +#endif
65667 +
65668 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65669 struct pid *pid, struct task_struct *task)
65670 {
65671 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65672 if (mm && !IS_ERR(mm)) {
65673 unsigned int nwords = 0;
65674 +
65675 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65676 + /* allow if we're currently ptracing this task */
65677 + if (PAX_RAND_FLAGS(mm) &&
65678 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65679 + mmput(mm);
65680 + return 0;
65681 + }
65682 +#endif
65683 +
65684 do {
65685 nwords += 2;
65686 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65687 @@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65688 }
65689
65690
65691 -#ifdef CONFIG_KALLSYMS
65692 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65693 /*
65694 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65695 * Returns the resolved symbol. If that fails, simply return the address.
65696 @@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65697 mutex_unlock(&task->signal->cred_guard_mutex);
65698 }
65699
65700 -#ifdef CONFIG_STACKTRACE
65701 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65702
65703 #define MAX_STACK_TRACE_DEPTH 64
65704
65705 @@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65706 return 0;
65707 }
65708
65709 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65710 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65711 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65712 struct pid *pid, struct task_struct *task)
65713 {
65714 @@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65715 /************************************************************************/
65716
65717 /* permission checks */
65718 -static int proc_fd_access_allowed(struct inode *inode)
65719 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65720 {
65721 struct task_struct *task;
65722 int allowed = 0;
65723 @@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65724 */
65725 task = get_proc_task(inode);
65726 if (task) {
65727 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65728 + if (log)
65729 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65730 + else
65731 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65732 put_task_struct(task);
65733 }
65734 return allowed;
65735 @@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65736 struct task_struct *task,
65737 int hide_pid_min)
65738 {
65739 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65740 + return false;
65741 +
65742 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65743 + rcu_read_lock();
65744 + {
65745 + const struct cred *tmpcred = current_cred();
65746 + const struct cred *cred = __task_cred(task);
65747 +
65748 + if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65749 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65750 + || in_group_p(grsec_proc_gid)
65751 +#endif
65752 + ) {
65753 + rcu_read_unlock();
65754 + return true;
65755 + }
65756 + }
65757 + rcu_read_unlock();
65758 +
65759 + if (!pid->hide_pid)
65760 + return false;
65761 +#endif
65762 +
65763 if (pid->hide_pid < hide_pid_min)
65764 return true;
65765 if (in_group_p(pid->pid_gid))
65766 return true;
65767 +
65768 return ptrace_may_access(task, PTRACE_MODE_READ);
65769 }
65770
65771 @@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65772 put_task_struct(task);
65773
65774 if (!has_perms) {
65775 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65776 + {
65777 +#else
65778 if (pid->hide_pid == 2) {
65779 +#endif
65780 /*
65781 * Let's make getdents(), stat(), and open()
65782 * consistent with each other. If a process
65783 @@ -609,6 +665,8 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65784
65785 if (task) {
65786 mm = mm_access(task, mode);
65787 + if (gr_acl_handle_procpidmem(task))
65788 + mm = ERR_PTR(-EPERM);
65789 put_task_struct(task);
65790
65791 if (!IS_ERR_OR_NULL(mm)) {
65792 @@ -630,6 +688,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65793 return PTR_ERR(mm);
65794
65795 file->private_data = mm;
65796 +
65797 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65798 + file->f_version = current->exec_id;
65799 +#endif
65800 +
65801 return 0;
65802 }
65803
65804 @@ -651,6 +714,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65805 ssize_t copied;
65806 char *page;
65807
65808 +#ifdef CONFIG_GRKERNSEC
65809 + if (write)
65810 + return -EPERM;
65811 +#endif
65812 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65813 + if (file->f_version != current->exec_id) {
65814 + gr_log_badprocpid("mem");
65815 + return 0;
65816 + }
65817 +#endif
65818 +
65819 if (!mm)
65820 return 0;
65821
65822 @@ -663,7 +737,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65823 goto free;
65824
65825 while (count > 0) {
65826 - int this_len = min_t(int, count, PAGE_SIZE);
65827 + ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65828
65829 if (write && copy_from_user(page, buf, this_len)) {
65830 copied = -EFAULT;
65831 @@ -755,6 +829,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65832 if (!mm)
65833 return 0;
65834
65835 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65836 + if (file->f_version != current->exec_id) {
65837 + gr_log_badprocpid("environ");
65838 + return 0;
65839 + }
65840 +#endif
65841 +
65842 page = (char *)__get_free_page(GFP_TEMPORARY);
65843 if (!page)
65844 return -ENOMEM;
65845 @@ -764,7 +845,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65846 goto free;
65847 while (count > 0) {
65848 size_t this_len, max_len;
65849 - int retval;
65850 + ssize_t retval;
65851
65852 if (src >= (mm->env_end - mm->env_start))
65853 break;
65854 @@ -1378,7 +1459,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65855 int error = -EACCES;
65856
65857 /* Are we allowed to snoop on the tasks file descriptors? */
65858 - if (!proc_fd_access_allowed(inode))
65859 + if (!proc_fd_access_allowed(inode, 0))
65860 goto out;
65861
65862 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65863 @@ -1422,8 +1503,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65864 struct path path;
65865
65866 /* Are we allowed to snoop on the tasks file descriptors? */
65867 - if (!proc_fd_access_allowed(inode))
65868 - goto out;
65869 + /* logging this is needed for learning on chromium to work properly,
65870 + but we don't want to flood the logs from 'ps' which does a readlink
65871 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65872 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
65873 + */
65874 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65875 + if (!proc_fd_access_allowed(inode,0))
65876 + goto out;
65877 + } else {
65878 + if (!proc_fd_access_allowed(inode,1))
65879 + goto out;
65880 + }
65881
65882 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65883 if (error)
65884 @@ -1473,7 +1564,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65885 rcu_read_lock();
65886 cred = __task_cred(task);
65887 inode->i_uid = cred->euid;
65888 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65889 + inode->i_gid = grsec_proc_gid;
65890 +#else
65891 inode->i_gid = cred->egid;
65892 +#endif
65893 rcu_read_unlock();
65894 }
65895 security_task_to_inode(task, inode);
65896 @@ -1509,10 +1604,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
65897 return -ENOENT;
65898 }
65899 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65900 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65901 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65902 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65903 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65904 +#endif
65905 task_dumpable(task)) {
65906 cred = __task_cred(task);
65907 stat->uid = cred->euid;
65908 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65909 + stat->gid = grsec_proc_gid;
65910 +#else
65911 stat->gid = cred->egid;
65912 +#endif
65913 }
65914 }
65915 rcu_read_unlock();
65916 @@ -1550,11 +1654,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
65917
65918 if (task) {
65919 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65920 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65921 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65922 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65923 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65924 +#endif
65925 task_dumpable(task)) {
65926 rcu_read_lock();
65927 cred = __task_cred(task);
65928 inode->i_uid = cred->euid;
65929 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65930 + inode->i_gid = grsec_proc_gid;
65931 +#else
65932 inode->i_gid = cred->egid;
65933 +#endif
65934 rcu_read_unlock();
65935 } else {
65936 inode->i_uid = GLOBAL_ROOT_UID;
65937 @@ -2085,6 +2198,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
65938 if (!task)
65939 goto out_no_task;
65940
65941 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65942 + goto out;
65943 +
65944 /*
65945 * Yes, it does not scale. And it should not. Don't add
65946 * new entries into /proc/<tgid>/ without very good reasons.
65947 @@ -2115,6 +2231,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
65948 if (!task)
65949 return -ENOENT;
65950
65951 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65952 + goto out;
65953 +
65954 if (!dir_emit_dots(file, ctx))
65955 goto out;
65956
65957 @@ -2557,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
65958 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
65959 #endif
65960 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65961 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65962 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65963 ONE("syscall", S_IRUSR, proc_pid_syscall),
65964 #endif
65965 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65966 @@ -2582,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
65967 #ifdef CONFIG_SECURITY
65968 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65969 #endif
65970 -#ifdef CONFIG_KALLSYMS
65971 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65972 ONE("wchan", S_IRUGO, proc_pid_wchan),
65973 #endif
65974 -#ifdef CONFIG_STACKTRACE
65975 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65976 ONE("stack", S_IRUSR, proc_pid_stack),
65977 #endif
65978 #ifdef CONFIG_SCHEDSTATS
65979 @@ -2619,6 +2738,9 @@ static const struct pid_entry tgid_base_stuff[] = {
65980 #ifdef CONFIG_HARDWALL
65981 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
65982 #endif
65983 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65984 + ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
65985 +#endif
65986 #ifdef CONFIG_USER_NS
65987 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
65988 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
65989 @@ -2748,7 +2870,14 @@ static int proc_pid_instantiate(struct inode *dir,
65990 if (!inode)
65991 goto out;
65992
65993 +#ifdef CONFIG_GRKERNSEC_PROC_USER
65994 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
65995 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65996 + inode->i_gid = grsec_proc_gid;
65997 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
65998 +#else
65999 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
66000 +#endif
66001 inode->i_op = &proc_tgid_base_inode_operations;
66002 inode->i_fop = &proc_tgid_base_operations;
66003 inode->i_flags|=S_IMMUTABLE;
66004 @@ -2786,7 +2915,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
66005 if (!task)
66006 goto out;
66007
66008 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66009 + goto out_put_task;
66010 +
66011 result = proc_pid_instantiate(dir, dentry, task, NULL);
66012 +out_put_task:
66013 put_task_struct(task);
66014 out:
66015 return ERR_PTR(result);
66016 @@ -2900,7 +3033,7 @@ static const struct pid_entry tid_base_stuff[] = {
66017 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
66018 #endif
66019 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
66020 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66021 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66022 ONE("syscall", S_IRUSR, proc_pid_syscall),
66023 #endif
66024 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
66025 @@ -2927,10 +3060,10 @@ static const struct pid_entry tid_base_stuff[] = {
66026 #ifdef CONFIG_SECURITY
66027 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
66028 #endif
66029 -#ifdef CONFIG_KALLSYMS
66030 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66031 ONE("wchan", S_IRUGO, proc_pid_wchan),
66032 #endif
66033 -#ifdef CONFIG_STACKTRACE
66034 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66035 ONE("stack", S_IRUSR, proc_pid_stack),
66036 #endif
66037 #ifdef CONFIG_SCHEDSTATS
66038 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
66039 index cbd82df..c0407d2 100644
66040 --- a/fs/proc/cmdline.c
66041 +++ b/fs/proc/cmdline.c
66042 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
66043
66044 static int __init proc_cmdline_init(void)
66045 {
66046 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66047 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
66048 +#else
66049 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
66050 +#endif
66051 return 0;
66052 }
66053 fs_initcall(proc_cmdline_init);
66054 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
66055 index 50493ed..248166b 100644
66056 --- a/fs/proc/devices.c
66057 +++ b/fs/proc/devices.c
66058 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
66059
66060 static int __init proc_devices_init(void)
66061 {
66062 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66063 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
66064 +#else
66065 proc_create("devices", 0, NULL, &proc_devinfo_operations);
66066 +#endif
66067 return 0;
66068 }
66069 fs_initcall(proc_devices_init);
66070 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
66071 index e11d7c5..9128ce06 100644
66072 --- a/fs/proc/fd.c
66073 +++ b/fs/proc/fd.c
66074 @@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
66075 if (!task)
66076 return -ENOENT;
66077
66078 - files = get_files_struct(task);
66079 + if (!gr_acl_handle_procpidmem(task))
66080 + files = get_files_struct(task);
66081 put_task_struct(task);
66082
66083 if (files) {
66084 @@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
66085 */
66086 int proc_fd_permission(struct inode *inode, int mask)
66087 {
66088 + struct task_struct *task;
66089 int rv = generic_permission(inode, mask);
66090 - if (rv == 0)
66091 - return 0;
66092 +
66093 if (task_tgid(current) == proc_pid(inode))
66094 rv = 0;
66095 +
66096 + task = get_proc_task(inode);
66097 + if (task == NULL)
66098 + return rv;
66099 +
66100 + if (gr_acl_handle_procpidmem(task))
66101 + rv = -EACCES;
66102 +
66103 + put_task_struct(task);
66104 +
66105 return rv;
66106 }
66107
66108 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66109 index 317b726..e329aed 100644
66110 --- a/fs/proc/generic.c
66111 +++ b/fs/proc/generic.c
66112 @@ -23,6 +23,7 @@
66113 #include <linux/bitops.h>
66114 #include <linux/spinlock.h>
66115 #include <linux/completion.h>
66116 +#include <linux/grsecurity.h>
66117 #include <asm/uaccess.h>
66118
66119 #include "internal.h"
66120 @@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66121 return proc_lookup_de(PDE(dir), dir, dentry);
66122 }
66123
66124 +struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66125 + unsigned int flags)
66126 +{
66127 + if (gr_proc_is_restricted())
66128 + return ERR_PTR(-EACCES);
66129 +
66130 + return proc_lookup_de(PDE(dir), dir, dentry);
66131 +}
66132 +
66133 /*
66134 * This returns non-zero if at EOF, so that the /proc
66135 * root directory can use this and check if it should
66136 @@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66137 return proc_readdir_de(PDE(inode), file, ctx);
66138 }
66139
66140 +int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66141 +{
66142 + struct inode *inode = file_inode(file);
66143 +
66144 + if (gr_proc_is_restricted())
66145 + return -EACCES;
66146 +
66147 + return proc_readdir_de(PDE(inode), file, ctx);
66148 +}
66149 +
66150 /*
66151 * These are the generic /proc directory operations. They
66152 * use the in-memory "struct proc_dir_entry" tree to parse
66153 @@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
66154 .iterate = proc_readdir,
66155 };
66156
66157 +static const struct file_operations proc_dir_restricted_operations = {
66158 + .llseek = generic_file_llseek,
66159 + .read = generic_read_dir,
66160 + .iterate = proc_readdir_restrict,
66161 +};
66162 +
66163 /*
66164 * proc directories can do almost nothing..
66165 */
66166 @@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66167 .setattr = proc_notify_change,
66168 };
66169
66170 +static const struct inode_operations proc_dir_restricted_inode_operations = {
66171 + .lookup = proc_lookup_restrict,
66172 + .getattr = proc_getattr,
66173 + .setattr = proc_notify_change,
66174 +};
66175 +
66176 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66177 {
66178 struct proc_dir_entry *tmp;
66179 @@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66180 return ret;
66181
66182 if (S_ISDIR(dp->mode)) {
66183 - dp->proc_fops = &proc_dir_operations;
66184 - dp->proc_iops = &proc_dir_inode_operations;
66185 + if (dp->restricted) {
66186 + dp->proc_fops = &proc_dir_restricted_operations;
66187 + dp->proc_iops = &proc_dir_restricted_inode_operations;
66188 + } else {
66189 + dp->proc_fops = &proc_dir_operations;
66190 + dp->proc_iops = &proc_dir_inode_operations;
66191 + }
66192 dir->nlink++;
66193 } else if (S_ISLNK(dp->mode)) {
66194 dp->proc_iops = &proc_link_inode_operations;
66195 @@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66196 }
66197 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66198
66199 +struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66200 + struct proc_dir_entry *parent, void *data)
66201 +{
66202 + struct proc_dir_entry *ent;
66203 +
66204 + if (mode == 0)
66205 + mode = S_IRUGO | S_IXUGO;
66206 +
66207 + ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66208 + if (ent) {
66209 + ent->data = data;
66210 + ent->restricted = 1;
66211 + if (proc_register(parent, ent) < 0) {
66212 + kfree(ent);
66213 + ent = NULL;
66214 + }
66215 + }
66216 + return ent;
66217 +}
66218 +EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66219 +
66220 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66221 struct proc_dir_entry *parent)
66222 {
66223 @@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66224 }
66225 EXPORT_SYMBOL(proc_mkdir);
66226
66227 +struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66228 + struct proc_dir_entry *parent)
66229 +{
66230 + return proc_mkdir_data_restrict(name, 0, parent, NULL);
66231 +}
66232 +EXPORT_SYMBOL(proc_mkdir_restrict);
66233 +
66234 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66235 struct proc_dir_entry *parent,
66236 const struct file_operations *proc_fops,
66237 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66238 index 333080d..0a35ec4 100644
66239 --- a/fs/proc/inode.c
66240 +++ b/fs/proc/inode.c
66241 @@ -23,11 +23,17 @@
66242 #include <linux/slab.h>
66243 #include <linux/mount.h>
66244 #include <linux/magic.h>
66245 +#include <linux/grsecurity.h>
66246
66247 #include <asm/uaccess.h>
66248
66249 #include "internal.h"
66250
66251 +#ifdef CONFIG_PROC_SYSCTL
66252 +extern const struct inode_operations proc_sys_inode_operations;
66253 +extern const struct inode_operations proc_sys_dir_operations;
66254 +#endif
66255 +
66256 static void proc_evict_inode(struct inode *inode)
66257 {
66258 struct proc_dir_entry *de;
66259 @@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66260 ns = PROC_I(inode)->ns.ns;
66261 if (ns_ops && ns)
66262 ns_ops->put(ns);
66263 +
66264 +#ifdef CONFIG_PROC_SYSCTL
66265 + if (inode->i_op == &proc_sys_inode_operations ||
66266 + inode->i_op == &proc_sys_dir_operations)
66267 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66268 +#endif
66269 +
66270 }
66271
66272 static struct kmem_cache * proc_inode_cachep;
66273 @@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66274 if (de->mode) {
66275 inode->i_mode = de->mode;
66276 inode->i_uid = de->uid;
66277 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66278 + inode->i_gid = grsec_proc_gid;
66279 +#else
66280 inode->i_gid = de->gid;
66281 +#endif
66282 }
66283 if (de->size)
66284 inode->i_size = de->size;
66285 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66286 index aa7a0ee..f2318df 100644
66287 --- a/fs/proc/internal.h
66288 +++ b/fs/proc/internal.h
66289 @@ -46,9 +46,10 @@ struct proc_dir_entry {
66290 struct completion *pde_unload_completion;
66291 struct list_head pde_openers; /* who did ->open, but not ->release */
66292 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66293 + u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66294 u8 namelen;
66295 char name[];
66296 -};
66297 +} __randomize_layout;
66298
66299 union proc_op {
66300 int (*proc_get_link)(struct dentry *, struct path *);
66301 @@ -66,7 +67,7 @@ struct proc_inode {
66302 struct ctl_table *sysctl_entry;
66303 struct proc_ns ns;
66304 struct inode vfs_inode;
66305 -};
66306 +} __randomize_layout;
66307
66308 /*
66309 * General functions
66310 @@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66311 struct pid *, struct task_struct *);
66312 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66313 struct pid *, struct task_struct *);
66314 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66315 +extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66316 + struct pid *, struct task_struct *);
66317 +#endif
66318
66319 /*
66320 * base.c
66321 @@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66322 * generic.c
66323 */
66324 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66325 +extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66326 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66327 struct dentry *);
66328 extern int proc_readdir(struct file *, struct dir_context *);
66329 +extern int proc_readdir_restrict(struct file *, struct dir_context *);
66330 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66331
66332 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66333 diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66334 index a352d57..cb94a5c 100644
66335 --- a/fs/proc/interrupts.c
66336 +++ b/fs/proc/interrupts.c
66337 @@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66338
66339 static int __init proc_interrupts_init(void)
66340 {
66341 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66342 + proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66343 +#else
66344 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66345 +#endif
66346 return 0;
66347 }
66348 fs_initcall(proc_interrupts_init);
66349 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66350 index 91a4e64..cb007c0 100644
66351 --- a/fs/proc/kcore.c
66352 +++ b/fs/proc/kcore.c
66353 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66354 * the addresses in the elf_phdr on our list.
66355 */
66356 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66357 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66358 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66359 + if (tsz > buflen)
66360 tsz = buflen;
66361 -
66362 +
66363 while (buflen) {
66364 struct kcore_list *m;
66365
66366 @@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66367 kfree(elf_buf);
66368 } else {
66369 if (kern_addr_valid(start)) {
66370 - unsigned long n;
66371 + char *elf_buf;
66372 + mm_segment_t oldfs;
66373
66374 - n = copy_to_user(buffer, (char *)start, tsz);
66375 - /*
66376 - * We cannot distinguish between fault on source
66377 - * and fault on destination. When this happens
66378 - * we clear too and hope it will trigger the
66379 - * EFAULT again.
66380 - */
66381 - if (n) {
66382 - if (clear_user(buffer + tsz - n,
66383 - n))
66384 + elf_buf = kmalloc(tsz, GFP_KERNEL);
66385 + if (!elf_buf)
66386 + return -ENOMEM;
66387 + oldfs = get_fs();
66388 + set_fs(KERNEL_DS);
66389 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66390 + set_fs(oldfs);
66391 + if (copy_to_user(buffer, elf_buf, tsz)) {
66392 + kfree(elf_buf);
66393 return -EFAULT;
66394 + }
66395 }
66396 + set_fs(oldfs);
66397 + kfree(elf_buf);
66398 } else {
66399 if (clear_user(buffer, tsz))
66400 return -EFAULT;
66401 @@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66402
66403 static int open_kcore(struct inode *inode, struct file *filp)
66404 {
66405 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66406 + return -EPERM;
66407 +#endif
66408 if (!capable(CAP_SYS_RAWIO))
66409 return -EPERM;
66410 if (kcore_need_update)
66411 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66412 index aa1eee0..03dda72 100644
66413 --- a/fs/proc/meminfo.c
66414 +++ b/fs/proc/meminfo.c
66415 @@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66416 vmi.used >> 10,
66417 vmi.largest_chunk >> 10
66418 #ifdef CONFIG_MEMORY_FAILURE
66419 - ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66420 + ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66421 #endif
66422 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66423 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66424 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66425 index d4a3574..b421ce9 100644
66426 --- a/fs/proc/nommu.c
66427 +++ b/fs/proc/nommu.c
66428 @@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66429
66430 if (file) {
66431 seq_pad(m, ' ');
66432 - seq_path(m, &file->f_path, "");
66433 + seq_path(m, &file->f_path, "\n\\");
66434 }
66435
66436 seq_putc(m, '\n');
66437 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66438 index a63af3e..b4f262a 100644
66439 --- a/fs/proc/proc_net.c
66440 +++ b/fs/proc/proc_net.c
66441 @@ -23,9 +23,27 @@
66442 #include <linux/nsproxy.h>
66443 #include <net/net_namespace.h>
66444 #include <linux/seq_file.h>
66445 +#include <linux/grsecurity.h>
66446
66447 #include "internal.h"
66448
66449 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66450 +static struct seq_operations *ipv6_seq_ops_addr;
66451 +
66452 +void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66453 +{
66454 + ipv6_seq_ops_addr = addr;
66455 +}
66456 +
66457 +void unregister_ipv6_seq_ops_addr(void)
66458 +{
66459 + ipv6_seq_ops_addr = NULL;
66460 +}
66461 +
66462 +EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66463 +EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66464 +#endif
66465 +
66466 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66467 {
66468 return pde->parent->data;
66469 @@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66470 return maybe_get_net(PDE_NET(PDE(inode)));
66471 }
66472
66473 +extern const struct seq_operations dev_seq_ops;
66474 +
66475 int seq_open_net(struct inode *ino, struct file *f,
66476 const struct seq_operations *ops, int size)
66477 {
66478 @@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66479
66480 BUG_ON(size < sizeof(*p));
66481
66482 + /* only permit access to /proc/net/dev */
66483 + if (
66484 +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66485 + ops != ipv6_seq_ops_addr &&
66486 +#endif
66487 + ops != &dev_seq_ops && gr_proc_is_restricted())
66488 + return -EACCES;
66489 +
66490 net = get_proc_net(ino);
66491 if (net == NULL)
66492 return -ENXIO;
66493 @@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66494 int err;
66495 struct net *net;
66496
66497 + if (gr_proc_is_restricted())
66498 + return -EACCES;
66499 +
66500 err = -ENXIO;
66501 net = get_proc_net(inode);
66502 if (net == NULL)
66503 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66504 index f92d5dd..26398ac 100644
66505 --- a/fs/proc/proc_sysctl.c
66506 +++ b/fs/proc/proc_sysctl.c
66507 @@ -11,13 +11,21 @@
66508 #include <linux/namei.h>
66509 #include <linux/mm.h>
66510 #include <linux/module.h>
66511 +#include <linux/nsproxy.h>
66512 +#ifdef CONFIG_GRKERNSEC
66513 +#include <net/net_namespace.h>
66514 +#endif
66515 #include "internal.h"
66516
66517 +extern int gr_handle_chroot_sysctl(const int op);
66518 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66519 + const int op);
66520 +
66521 static const struct dentry_operations proc_sys_dentry_operations;
66522 static const struct file_operations proc_sys_file_operations;
66523 -static const struct inode_operations proc_sys_inode_operations;
66524 +const struct inode_operations proc_sys_inode_operations;
66525 static const struct file_operations proc_sys_dir_file_operations;
66526 -static const struct inode_operations proc_sys_dir_operations;
66527 +const struct inode_operations proc_sys_dir_operations;
66528
66529 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66530 {
66531 @@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66532
66533 err = NULL;
66534 d_set_d_op(dentry, &proc_sys_dentry_operations);
66535 +
66536 + gr_handle_proc_create(dentry, inode);
66537 +
66538 d_add(dentry, inode);
66539
66540 out:
66541 @@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66542 struct inode *inode = file_inode(filp);
66543 struct ctl_table_header *head = grab_header(inode);
66544 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66545 + int op = write ? MAY_WRITE : MAY_READ;
66546 ssize_t error;
66547 size_t res;
66548
66549 @@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66550 * and won't be until we finish.
66551 */
66552 error = -EPERM;
66553 - if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66554 + if (sysctl_perm(head, table, op))
66555 goto out;
66556
66557 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66558 @@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66559 if (!table->proc_handler)
66560 goto out;
66561
66562 +#ifdef CONFIG_GRKERNSEC
66563 + error = -EPERM;
66564 + if (gr_handle_chroot_sysctl(op))
66565 + goto out;
66566 + dget(filp->f_path.dentry);
66567 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66568 + dput(filp->f_path.dentry);
66569 + goto out;
66570 + }
66571 + dput(filp->f_path.dentry);
66572 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66573 + goto out;
66574 + if (write) {
66575 + if (current->nsproxy->net_ns != table->extra2) {
66576 + if (!capable(CAP_SYS_ADMIN))
66577 + goto out;
66578 + } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66579 + goto out;
66580 + }
66581 +#endif
66582 +
66583 /* careful: calling conventions are nasty here */
66584 res = count;
66585 error = table->proc_handler(table, write, buf, &res, ppos);
66586 @@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66587 return false;
66588 } else {
66589 d_set_d_op(child, &proc_sys_dentry_operations);
66590 +
66591 + gr_handle_proc_create(child, inode);
66592 +
66593 d_add(child, inode);
66594 }
66595 } else {
66596 @@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66597 if ((*pos)++ < ctx->pos)
66598 return true;
66599
66600 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66601 + return 0;
66602 +
66603 if (unlikely(S_ISLNK(table->mode)))
66604 res = proc_sys_link_fill_cache(file, ctx, head, table);
66605 else
66606 @@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66607 if (IS_ERR(head))
66608 return PTR_ERR(head);
66609
66610 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66611 + return -ENOENT;
66612 +
66613 generic_fillattr(inode, stat);
66614 if (table)
66615 stat->mode = (stat->mode & S_IFMT) | table->mode;
66616 @@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66617 .llseek = generic_file_llseek,
66618 };
66619
66620 -static const struct inode_operations proc_sys_inode_operations = {
66621 +const struct inode_operations proc_sys_inode_operations = {
66622 .permission = proc_sys_permission,
66623 .setattr = proc_sys_setattr,
66624 .getattr = proc_sys_getattr,
66625 };
66626
66627 -static const struct inode_operations proc_sys_dir_operations = {
66628 +const struct inode_operations proc_sys_dir_operations = {
66629 .lookup = proc_sys_lookup,
66630 .permission = proc_sys_permission,
66631 .setattr = proc_sys_setattr,
66632 @@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66633 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66634 const char *name, int namelen)
66635 {
66636 - struct ctl_table *table;
66637 + ctl_table_no_const *table;
66638 struct ctl_dir *new;
66639 struct ctl_node *node;
66640 char *new_name;
66641 @@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66642 return NULL;
66643
66644 node = (struct ctl_node *)(new + 1);
66645 - table = (struct ctl_table *)(node + 1);
66646 + table = (ctl_table_no_const *)(node + 1);
66647 new_name = (char *)(table + 2);
66648 memcpy(new_name, name, namelen);
66649 new_name[namelen] = '\0';
66650 @@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66651 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66652 struct ctl_table_root *link_root)
66653 {
66654 - struct ctl_table *link_table, *entry, *link;
66655 + ctl_table_no_const *link_table, *link;
66656 + struct ctl_table *entry;
66657 struct ctl_table_header *links;
66658 struct ctl_node *node;
66659 char *link_name;
66660 @@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66661 return NULL;
66662
66663 node = (struct ctl_node *)(links + 1);
66664 - link_table = (struct ctl_table *)(node + nr_entries);
66665 + link_table = (ctl_table_no_const *)(node + nr_entries);
66666 link_name = (char *)&link_table[nr_entries + 1];
66667
66668 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66669 @@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66670 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66671 struct ctl_table *table)
66672 {
66673 - struct ctl_table *ctl_table_arg = NULL;
66674 - struct ctl_table *entry, *files;
66675 + ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66676 + struct ctl_table *entry;
66677 int nr_files = 0;
66678 int nr_dirs = 0;
66679 int err = -ENOMEM;
66680 @@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66681 nr_files++;
66682 }
66683
66684 - files = table;
66685 /* If there are mixed files and directories we need a new table */
66686 if (nr_dirs && nr_files) {
66687 - struct ctl_table *new;
66688 + ctl_table_no_const *new;
66689 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66690 GFP_KERNEL);
66691 if (!files)
66692 @@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66693 /* Register everything except a directory full of subdirectories */
66694 if (nr_files || !nr_dirs) {
66695 struct ctl_table_header *header;
66696 - header = __register_sysctl_table(set, path, files);
66697 + header = __register_sysctl_table(set, path, files ? files : table);
66698 if (!header) {
66699 kfree(ctl_table_arg);
66700 goto out;
66701 diff --git a/fs/proc/root.c b/fs/proc/root.c
66702 index 094e44d..085a877 100644
66703 --- a/fs/proc/root.c
66704 +++ b/fs/proc/root.c
66705 @@ -188,7 +188,15 @@ void __init proc_root_init(void)
66706 proc_mkdir("openprom", NULL);
66707 #endif
66708 proc_tty_init();
66709 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66710 +#ifdef CONFIG_GRKERNSEC_PROC_USER
66711 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66712 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66713 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66714 +#endif
66715 +#else
66716 proc_mkdir("bus", NULL);
66717 +#endif
66718 proc_sys_init();
66719 }
66720
66721 diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66722 index bf2d03f..f058f9c 100644
66723 --- a/fs/proc/stat.c
66724 +++ b/fs/proc/stat.c
66725 @@ -11,6 +11,7 @@
66726 #include <linux/irqnr.h>
66727 #include <linux/cputime.h>
66728 #include <linux/tick.h>
66729 +#include <linux/grsecurity.h>
66730
66731 #ifndef arch_irq_stat_cpu
66732 #define arch_irq_stat_cpu(cpu) 0
66733 @@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66734 u64 sum_softirq = 0;
66735 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66736 struct timespec boottime;
66737 + int unrestricted = 1;
66738 +
66739 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
66740 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66741 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66742 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66743 + && !in_group_p(grsec_proc_gid)
66744 +#endif
66745 + )
66746 + unrestricted = 0;
66747 +#endif
66748 +#endif
66749
66750 user = nice = system = idle = iowait =
66751 irq = softirq = steal = 0;
66752 @@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66753 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66754 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66755 idle += get_idle_time(i);
66756 - iowait += get_iowait_time(i);
66757 - irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66758 - softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66759 - steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66760 - guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66761 - guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66762 - sum += kstat_cpu_irqs_sum(i);
66763 - sum += arch_irq_stat_cpu(i);
66764 + if (unrestricted) {
66765 + iowait += get_iowait_time(i);
66766 + irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66767 + softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66768 + steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66769 + guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66770 + guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66771 + sum += kstat_cpu_irqs_sum(i);
66772 + sum += arch_irq_stat_cpu(i);
66773 + for (j = 0; j < NR_SOFTIRQS; j++) {
66774 + unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66775
66776 - for (j = 0; j < NR_SOFTIRQS; j++) {
66777 - unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66778 -
66779 - per_softirq_sums[j] += softirq_stat;
66780 - sum_softirq += softirq_stat;
66781 + per_softirq_sums[j] += softirq_stat;
66782 + sum_softirq += softirq_stat;
66783 + }
66784 }
66785 }
66786 - sum += arch_irq_stat();
66787 + if (unrestricted)
66788 + sum += arch_irq_stat();
66789
66790 seq_puts(p, "cpu ");
66791 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66792 @@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66793 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66794 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66795 idle = get_idle_time(i);
66796 - iowait = get_iowait_time(i);
66797 - irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66798 - softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66799 - steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66800 - guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66801 - guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66802 + if (unrestricted) {
66803 + iowait = get_iowait_time(i);
66804 + irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66805 + softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66806 + steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66807 + guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66808 + guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66809 + }
66810 seq_printf(p, "cpu%d", i);
66811 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66812 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66813 @@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66814
66815 /* sum again ? it could be updated? */
66816 for_each_irq_nr(j)
66817 - seq_put_decimal_ull(p, ' ', kstat_irqs(j));
66818 + seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
66819
66820 seq_printf(p,
66821 "\nctxt %llu\n"
66822 @@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66823 "processes %lu\n"
66824 "procs_running %lu\n"
66825 "procs_blocked %lu\n",
66826 - nr_context_switches(),
66827 + unrestricted ? nr_context_switches() : 0ULL,
66828 (unsigned long)jif,
66829 - total_forks,
66830 - nr_running(),
66831 - nr_iowait());
66832 + unrestricted ? total_forks : 0UL,
66833 + unrestricted ? nr_running() : 0UL,
66834 + unrestricted ? nr_iowait() : 0UL);
66835
66836 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66837
66838 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66839 index 4e0388c..fc6a0e1 100644
66840 --- a/fs/proc/task_mmu.c
66841 +++ b/fs/proc/task_mmu.c
66842 @@ -13,12 +13,19 @@
66843 #include <linux/swap.h>
66844 #include <linux/swapops.h>
66845 #include <linux/mmu_notifier.h>
66846 +#include <linux/grsecurity.h>
66847
66848 #include <asm/elf.h>
66849 #include <asm/uaccess.h>
66850 #include <asm/tlbflush.h>
66851 #include "internal.h"
66852
66853 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66854 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66855 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
66856 + _mm->pax_flags & MF_PAX_SEGMEXEC))
66857 +#endif
66858 +
66859 void task_mem(struct seq_file *m, struct mm_struct *mm)
66860 {
66861 unsigned long data, text, lib, swap;
66862 @@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66863 "VmExe:\t%8lu kB\n"
66864 "VmLib:\t%8lu kB\n"
66865 "VmPTE:\t%8lu kB\n"
66866 - "VmSwap:\t%8lu kB\n",
66867 - hiwater_vm << (PAGE_SHIFT-10),
66868 + "VmSwap:\t%8lu kB\n"
66869 +
66870 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66871 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66872 +#endif
66873 +
66874 + ,hiwater_vm << (PAGE_SHIFT-10),
66875 total_vm << (PAGE_SHIFT-10),
66876 mm->locked_vm << (PAGE_SHIFT-10),
66877 mm->pinned_vm << (PAGE_SHIFT-10),
66878 @@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66879 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66880 (PTRS_PER_PTE * sizeof(pte_t) *
66881 atomic_long_read(&mm->nr_ptes)) >> 10,
66882 - swap << (PAGE_SHIFT-10));
66883 + swap << (PAGE_SHIFT-10)
66884 +
66885 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66886 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66887 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66888 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66889 +#else
66890 + , mm->context.user_cs_base
66891 + , mm->context.user_cs_limit
66892 +#endif
66893 +#endif
66894 +
66895 + );
66896 }
66897
66898 unsigned long task_vsize(struct mm_struct *mm)
66899 @@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66900 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
66901 }
66902
66903 - /* We don't show the stack guard page in /proc/maps */
66904 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66905 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
66906 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
66907 +#else
66908 start = vma->vm_start;
66909 - if (stack_guard_page_start(vma, start))
66910 - start += PAGE_SIZE;
66911 end = vma->vm_end;
66912 - if (stack_guard_page_end(vma, end))
66913 - end -= PAGE_SIZE;
66914 +#endif
66915
66916 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
66917 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
66918 @@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66919 flags & VM_WRITE ? 'w' : '-',
66920 flags & VM_EXEC ? 'x' : '-',
66921 flags & VM_MAYSHARE ? 's' : 'p',
66922 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66923 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
66924 +#else
66925 pgoff,
66926 +#endif
66927 MAJOR(dev), MINOR(dev), ino);
66928
66929 /*
66930 @@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66931 */
66932 if (file) {
66933 seq_pad(m, ' ');
66934 - seq_path(m, &file->f_path, "\n");
66935 + seq_path(m, &file->f_path, "\n\\");
66936 goto done;
66937 }
66938
66939 @@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66940 * Thread stack in /proc/PID/task/TID/maps or
66941 * the main process stack.
66942 */
66943 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
66944 - vma->vm_end >= mm->start_stack)) {
66945 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
66946 + (vma->vm_start <= mm->start_stack &&
66947 + vma->vm_end >= mm->start_stack)) {
66948 name = "[stack]";
66949 } else {
66950 /* Thread stack in /proc/PID/maps */
66951 @@ -359,6 +388,12 @@ done:
66952
66953 static int show_map(struct seq_file *m, void *v, int is_pid)
66954 {
66955 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66956 + if (current->exec_id != m->exec_id) {
66957 + gr_log_badprocpid("maps");
66958 + return 0;
66959 + }
66960 +#endif
66961 show_map_vma(m, v, is_pid);
66962 m_cache_vma(m, v);
66963 return 0;
66964 @@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66965 .private = &mss,
66966 };
66967
66968 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66969 + if (current->exec_id != m->exec_id) {
66970 + gr_log_badprocpid("smaps");
66971 + return 0;
66972 + }
66973 +#endif
66974 memset(&mss, 0, sizeof mss);
66975 - mss.vma = vma;
66976 - /* mmap_sem is held in m_start */
66977 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66978 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66979 -
66980 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66981 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
66982 +#endif
66983 + mss.vma = vma;
66984 + /* mmap_sem is held in m_start */
66985 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66986 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66987 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66988 + }
66989 +#endif
66990 show_map_vma(m, vma, is_pid);
66991
66992 seq_printf(m,
66993 @@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66994 "KernelPageSize: %8lu kB\n"
66995 "MMUPageSize: %8lu kB\n"
66996 "Locked: %8lu kB\n",
66997 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66998 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
66999 +#else
67000 (vma->vm_end - vma->vm_start) >> 10,
67001 +#endif
67002 mss.resident >> 10,
67003 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
67004 mss.shared_clean >> 10,
67005 @@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67006 char buffer[64];
67007 int nid;
67008
67009 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67010 + if (current->exec_id != m->exec_id) {
67011 + gr_log_badprocpid("numa_maps");
67012 + return 0;
67013 + }
67014 +#endif
67015 +
67016 if (!mm)
67017 return 0;
67018
67019 @@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
67020 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
67021 }
67022
67023 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67024 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
67025 +#else
67026 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
67027 +#endif
67028
67029 if (file) {
67030 seq_puts(m, " file=");
67031 - seq_path(m, &file->f_path, "\n\t= ");
67032 + seq_path(m, &file->f_path, "\n\t\\= ");
67033 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
67034 seq_puts(m, " heap");
67035 } else {
67036 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
67037 index 599ec2e..f1413ae 100644
67038 --- a/fs/proc/task_nommu.c
67039 +++ b/fs/proc/task_nommu.c
67040 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
67041 else
67042 bytes += kobjsize(mm);
67043
67044 - if (current->fs && current->fs->users > 1)
67045 + if (current->fs && atomic_read(&current->fs->users) > 1)
67046 sbytes += kobjsize(current->fs);
67047 else
67048 bytes += kobjsize(current->fs);
67049 @@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
67050
67051 if (file) {
67052 seq_pad(m, ' ');
67053 - seq_path(m, &file->f_path, "");
67054 + seq_path(m, &file->f_path, "\n\\");
67055 } else if (mm) {
67056 pid_t tid = pid_of_stack(priv, vma, is_pid);
67057
67058 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
67059 index a90d6d35..d08047c 100644
67060 --- a/fs/proc/vmcore.c
67061 +++ b/fs/proc/vmcore.c
67062 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
67063 nr_bytes = count;
67064
67065 /* If pfn is not ram, return zeros for sparse dump files */
67066 - if (pfn_is_ram(pfn) == 0)
67067 - memset(buf, 0, nr_bytes);
67068 - else {
67069 + if (pfn_is_ram(pfn) == 0) {
67070 + if (userbuf) {
67071 + if (clear_user((char __force_user *)buf, nr_bytes))
67072 + return -EFAULT;
67073 + } else
67074 + memset(buf, 0, nr_bytes);
67075 + } else {
67076 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
67077 offset, userbuf);
67078 if (tmp < 0)
67079 @@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
67080 static int copy_to(void *target, void *src, size_t size, int userbuf)
67081 {
67082 if (userbuf) {
67083 - if (copy_to_user((char __user *) target, src, size))
67084 + if (copy_to_user((char __force_user *) target, src, size))
67085 return -EFAULT;
67086 } else {
67087 memcpy(target, src, size);
67088 @@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67089 if (*fpos < m->offset + m->size) {
67090 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67091 start = m->paddr + *fpos - m->offset;
67092 - tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67093 + tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67094 if (tmp < 0)
67095 return tmp;
67096 buflen -= tsz;
67097 @@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67098 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67099 size_t buflen, loff_t *fpos)
67100 {
67101 - return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67102 + return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67103 }
67104
67105 /*
67106 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67107 index d3fb2b6..43a8140 100644
67108 --- a/fs/qnx6/qnx6.h
67109 +++ b/fs/qnx6/qnx6.h
67110 @@ -74,7 +74,7 @@ enum {
67111 BYTESEX_BE,
67112 };
67113
67114 -static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67115 +static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67116 {
67117 if (sbi->s_bytesex == BYTESEX_LE)
67118 return le64_to_cpu((__force __le64)n);
67119 @@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67120 return (__force __fs64)cpu_to_be64(n);
67121 }
67122
67123 -static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67124 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67125 {
67126 if (sbi->s_bytesex == BYTESEX_LE)
67127 return le32_to_cpu((__force __le32)n);
67128 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67129 index bb2869f..d34ada8 100644
67130 --- a/fs/quota/netlink.c
67131 +++ b/fs/quota/netlink.c
67132 @@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67133 void quota_send_warning(struct kqid qid, dev_t dev,
67134 const char warntype)
67135 {
67136 - static atomic_t seq;
67137 + static atomic_unchecked_t seq;
67138 struct sk_buff *skb;
67139 void *msg_head;
67140 int ret;
67141 @@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67142 "VFS: Not enough memory to send quota warning.\n");
67143 return;
67144 }
67145 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67146 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67147 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67148 if (!msg_head) {
67149 printk(KERN_ERR
67150 diff --git a/fs/read_write.c b/fs/read_write.c
67151 index 7d9318c..51b336f 100644
67152 --- a/fs/read_write.c
67153 +++ b/fs/read_write.c
67154 @@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67155
67156 old_fs = get_fs();
67157 set_fs(get_ds());
67158 - p = (__force const char __user *)buf;
67159 + p = (const char __force_user *)buf;
67160 if (count > MAX_RW_COUNT)
67161 count = MAX_RW_COUNT;
67162 if (file->f_op->write)
67163 diff --git a/fs/readdir.c b/fs/readdir.c
67164 index 33fd922..e0d6094 100644
67165 --- a/fs/readdir.c
67166 +++ b/fs/readdir.c
67167 @@ -18,6 +18,7 @@
67168 #include <linux/security.h>
67169 #include <linux/syscalls.h>
67170 #include <linux/unistd.h>
67171 +#include <linux/namei.h>
67172
67173 #include <asm/uaccess.h>
67174
67175 @@ -71,6 +72,7 @@ struct old_linux_dirent {
67176 struct readdir_callback {
67177 struct dir_context ctx;
67178 struct old_linux_dirent __user * dirent;
67179 + struct file * file;
67180 int result;
67181 };
67182
67183 @@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
67184 buf->result = -EOVERFLOW;
67185 return -EOVERFLOW;
67186 }
67187 +
67188 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67189 + return 0;
67190 +
67191 buf->result++;
67192 dirent = buf->dirent;
67193 if (!access_ok(VERIFY_WRITE, dirent,
67194 @@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67195 if (!f.file)
67196 return -EBADF;
67197
67198 + buf.file = f.file;
67199 error = iterate_dir(f.file, &buf.ctx);
67200 if (buf.result)
67201 error = buf.result;
67202 @@ -144,6 +151,7 @@ struct getdents_callback {
67203 struct dir_context ctx;
67204 struct linux_dirent __user * current_dir;
67205 struct linux_dirent __user * previous;
67206 + struct file * file;
67207 int count;
67208 int error;
67209 };
67210 @@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67211 buf->error = -EOVERFLOW;
67212 return -EOVERFLOW;
67213 }
67214 +
67215 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67216 + return 0;
67217 +
67218 dirent = buf->previous;
67219 if (dirent) {
67220 if (__put_user(offset, &dirent->d_off))
67221 @@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67222 if (!f.file)
67223 return -EBADF;
67224
67225 + buf.file = f.file;
67226 error = iterate_dir(f.file, &buf.ctx);
67227 if (error >= 0)
67228 error = buf.error;
67229 @@ -228,6 +241,7 @@ struct getdents_callback64 {
67230 struct dir_context ctx;
67231 struct linux_dirent64 __user * current_dir;
67232 struct linux_dirent64 __user * previous;
67233 + struct file *file;
67234 int count;
67235 int error;
67236 };
67237 @@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67238 buf->error = -EINVAL; /* only used if we fail.. */
67239 if (reclen > buf->count)
67240 return -EINVAL;
67241 +
67242 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67243 + return 0;
67244 +
67245 dirent = buf->previous;
67246 if (dirent) {
67247 if (__put_user(offset, &dirent->d_off))
67248 @@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67249 if (!f.file)
67250 return -EBADF;
67251
67252 + buf.file = f.file;
67253 error = iterate_dir(f.file, &buf.ctx);
67254 if (error >= 0)
67255 error = buf.error;
67256 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67257 index 9c02d96..6562c10 100644
67258 --- a/fs/reiserfs/do_balan.c
67259 +++ b/fs/reiserfs/do_balan.c
67260 @@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67261 return;
67262 }
67263
67264 - atomic_inc(&fs_generation(tb->tb_sb));
67265 + atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67266 do_balance_starts(tb);
67267
67268 /*
67269 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67270 index aca73dd..e3c558d 100644
67271 --- a/fs/reiserfs/item_ops.c
67272 +++ b/fs/reiserfs/item_ops.c
67273 @@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67274 }
67275
67276 static struct item_operations errcatch_ops = {
67277 - errcatch_bytes_number,
67278 - errcatch_decrement_key,
67279 - errcatch_is_left_mergeable,
67280 - errcatch_print_item,
67281 - errcatch_check_item,
67282 + .bytes_number = errcatch_bytes_number,
67283 + .decrement_key = errcatch_decrement_key,
67284 + .is_left_mergeable = errcatch_is_left_mergeable,
67285 + .print_item = errcatch_print_item,
67286 + .check_item = errcatch_check_item,
67287
67288 - errcatch_create_vi,
67289 - errcatch_check_left,
67290 - errcatch_check_right,
67291 - errcatch_part_size,
67292 - errcatch_unit_num,
67293 - errcatch_print_vi
67294 + .create_vi = errcatch_create_vi,
67295 + .check_left = errcatch_check_left,
67296 + .check_right = errcatch_check_right,
67297 + .part_size = errcatch_part_size,
67298 + .unit_num = errcatch_unit_num,
67299 + .print_vi = errcatch_print_vi
67300 };
67301
67302 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67303 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67304 index 621b9f3..af527fd 100644
67305 --- a/fs/reiserfs/procfs.c
67306 +++ b/fs/reiserfs/procfs.c
67307 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67308 "SMALL_TAILS " : "NO_TAILS ",
67309 replay_only(sb) ? "REPLAY_ONLY " : "",
67310 convert_reiserfs(sb) ? "CONV " : "",
67311 - atomic_read(&r->s_generation_counter),
67312 + atomic_read_unchecked(&r->s_generation_counter),
67313 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67314 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67315 SF(s_good_search_by_key_reada), SF(s_bmaps),
67316 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67317 index 1894d96..1dfd1c2 100644
67318 --- a/fs/reiserfs/reiserfs.h
67319 +++ b/fs/reiserfs/reiserfs.h
67320 @@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67321 /* Comment? -Hans */
67322 wait_queue_head_t s_wait;
67323 /* increased by one every time the tree gets re-balanced */
67324 - atomic_t s_generation_counter;
67325 + atomic_unchecked_t s_generation_counter;
67326
67327 /* File system properties. Currently holds on-disk FS format */
67328 unsigned long s_properties;
67329 @@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67330 #define REISERFS_USER_MEM 1 /* user memory mode */
67331
67332 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67333 -#define get_generation(s) atomic_read (&fs_generation(s))
67334 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67335 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67336 #define __fs_changed(gen,s) (gen != get_generation (s))
67337 #define fs_changed(gen,s) \
67338 diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67339 index b27ef35..d9c6c18 100644
67340 --- a/fs/reiserfs/super.c
67341 +++ b/fs/reiserfs/super.c
67342 @@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67343 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67344 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67345 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67346 +#ifdef CONFIG_REISERFS_FS_XATTR
67347 + /* turn on user xattrs by default */
67348 + sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67349 +#endif
67350 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67351 sbi->s_alloc_options.preallocmin = 0;
67352 /* Preallocate by 16 blocks (17-1) at once */
67353 diff --git a/fs/select.c b/fs/select.c
67354 index 467bb1c..cf9d65a 100644
67355 --- a/fs/select.c
67356 +++ b/fs/select.c
67357 @@ -20,6 +20,7 @@
67358 #include <linux/export.h>
67359 #include <linux/slab.h>
67360 #include <linux/poll.h>
67361 +#include <linux/security.h>
67362 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67363 #include <linux/file.h>
67364 #include <linux/fdtable.h>
67365 @@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67366 struct poll_list *walk = head;
67367 unsigned long todo = nfds;
67368
67369 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67370 if (nfds > rlimit(RLIMIT_NOFILE))
67371 return -EINVAL;
67372
67373 diff --git a/fs/seq_file.c b/fs/seq_file.c
67374 index 3857b72..0b7281e 100644
67375 --- a/fs/seq_file.c
67376 +++ b/fs/seq_file.c
67377 @@ -12,6 +12,8 @@
67378 #include <linux/slab.h>
67379 #include <linux/cred.h>
67380 #include <linux/mm.h>
67381 +#include <linux/sched.h>
67382 +#include <linux/grsecurity.h>
67383
67384 #include <asm/uaccess.h>
67385 #include <asm/page.h>
67386 @@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67387
67388 static void *seq_buf_alloc(unsigned long size)
67389 {
67390 - void *buf;
67391 -
67392 - buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67393 - if (!buf && size > PAGE_SIZE)
67394 - buf = vmalloc(size);
67395 - return buf;
67396 + return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67397 }
67398
67399 /**
67400 @@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67401 #ifdef CONFIG_USER_NS
67402 p->user_ns = file->f_cred->user_ns;
67403 #endif
67404 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67405 + p->exec_id = current->exec_id;
67406 +#endif
67407
67408 /*
67409 * Wrappers around seq_open(e.g. swaps_open) need to be
67410 @@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67411 }
67412 EXPORT_SYMBOL(seq_open);
67413
67414 +
67415 +int seq_open_restrict(struct file *file, const struct seq_operations *op)
67416 +{
67417 + if (gr_proc_is_restricted())
67418 + return -EACCES;
67419 +
67420 + return seq_open(file, op);
67421 +}
67422 +EXPORT_SYMBOL(seq_open_restrict);
67423 +
67424 static int traverse(struct seq_file *m, loff_t offset)
67425 {
67426 loff_t pos = 0, index;
67427 @@ -165,7 +175,7 @@ Eoverflow:
67428 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67429 {
67430 struct seq_file *m = file->private_data;
67431 - size_t copied = 0;
67432 + ssize_t copied = 0;
67433 loff_t pos;
67434 size_t n;
67435 void *p;
67436 @@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67437 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67438 void *data)
67439 {
67440 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67441 + seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67442 int res = -ENOMEM;
67443
67444 if (op) {
67445 @@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67446 }
67447 EXPORT_SYMBOL(single_open_size);
67448
67449 +int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67450 + void *data)
67451 +{
67452 + if (gr_proc_is_restricted())
67453 + return -EACCES;
67454 +
67455 + return single_open(file, show, data);
67456 +}
67457 +EXPORT_SYMBOL(single_open_restrict);
67458 +
67459 +
67460 int single_release(struct inode *inode, struct file *file)
67461 {
67462 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67463 diff --git a/fs/splice.c b/fs/splice.c
67464 index 75c6058..770d40c 100644
67465 --- a/fs/splice.c
67466 +++ b/fs/splice.c
67467 @@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67468 pipe_lock(pipe);
67469
67470 for (;;) {
67471 - if (!pipe->readers) {
67472 + if (!atomic_read(&pipe->readers)) {
67473 send_sig(SIGPIPE, current, 0);
67474 if (!ret)
67475 ret = -EPIPE;
67476 @@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67477 page_nr++;
67478 ret += buf->len;
67479
67480 - if (pipe->files)
67481 + if (atomic_read(&pipe->files))
67482 do_wakeup = 1;
67483
67484 if (!--spd->nr_pages)
67485 @@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67486 do_wakeup = 0;
67487 }
67488
67489 - pipe->waiting_writers++;
67490 + atomic_inc(&pipe->waiting_writers);
67491 pipe_wait(pipe);
67492 - pipe->waiting_writers--;
67493 + atomic_dec(&pipe->waiting_writers);
67494 }
67495
67496 pipe_unlock(pipe);
67497 @@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67498 old_fs = get_fs();
67499 set_fs(get_ds());
67500 /* The cast to a user pointer is valid due to the set_fs() */
67501 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67502 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67503 set_fs(old_fs);
67504
67505 return res;
67506 @@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67507 old_fs = get_fs();
67508 set_fs(get_ds());
67509 /* The cast to a user pointer is valid due to the set_fs() */
67510 - res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67511 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67512 set_fs(old_fs);
67513
67514 return res;
67515 @@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67516 goto err;
67517
67518 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67519 - vec[i].iov_base = (void __user *) page_address(page);
67520 + vec[i].iov_base = (void __force_user *) page_address(page);
67521 vec[i].iov_len = this_len;
67522 spd.pages[i] = page;
67523 spd.nr_pages++;
67524 @@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67525 ops->release(pipe, buf);
67526 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67527 pipe->nrbufs--;
67528 - if (pipe->files)
67529 + if (atomic_read(&pipe->files))
67530 sd->need_wakeup = true;
67531 }
67532
67533 @@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67534 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67535 {
67536 while (!pipe->nrbufs) {
67537 - if (!pipe->writers)
67538 + if (!atomic_read(&pipe->writers))
67539 return 0;
67540
67541 - if (!pipe->waiting_writers && sd->num_spliced)
67542 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67543 return 0;
67544
67545 if (sd->flags & SPLICE_F_NONBLOCK)
67546 @@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67547 ops->release(pipe, buf);
67548 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67549 pipe->nrbufs--;
67550 - if (pipe->files)
67551 + if (atomic_read(&pipe->files))
67552 sd.need_wakeup = true;
67553 } else {
67554 buf->offset += ret;
67555 @@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67556 * out of the pipe right after the splice_to_pipe(). So set
67557 * PIPE_READERS appropriately.
67558 */
67559 - pipe->readers = 1;
67560 + atomic_set(&pipe->readers, 1);
67561
67562 current->splice_pipe = pipe;
67563 }
67564 @@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67565
67566 partial[buffers].offset = off;
67567 partial[buffers].len = plen;
67568 + partial[buffers].private = 0;
67569
67570 off = 0;
67571 len -= plen;
67572 @@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67573 ret = -ERESTARTSYS;
67574 break;
67575 }
67576 - if (!pipe->writers)
67577 + if (!atomic_read(&pipe->writers))
67578 break;
67579 - if (!pipe->waiting_writers) {
67580 + if (!atomic_read(&pipe->waiting_writers)) {
67581 if (flags & SPLICE_F_NONBLOCK) {
67582 ret = -EAGAIN;
67583 break;
67584 @@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67585 pipe_lock(pipe);
67586
67587 while (pipe->nrbufs >= pipe->buffers) {
67588 - if (!pipe->readers) {
67589 + if (!atomic_read(&pipe->readers)) {
67590 send_sig(SIGPIPE, current, 0);
67591 ret = -EPIPE;
67592 break;
67593 @@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67594 ret = -ERESTARTSYS;
67595 break;
67596 }
67597 - pipe->waiting_writers++;
67598 + atomic_inc(&pipe->waiting_writers);
67599 pipe_wait(pipe);
67600 - pipe->waiting_writers--;
67601 + atomic_dec(&pipe->waiting_writers);
67602 }
67603
67604 pipe_unlock(pipe);
67605 @@ -1818,14 +1819,14 @@ retry:
67606 pipe_double_lock(ipipe, opipe);
67607
67608 do {
67609 - if (!opipe->readers) {
67610 + if (!atomic_read(&opipe->readers)) {
67611 send_sig(SIGPIPE, current, 0);
67612 if (!ret)
67613 ret = -EPIPE;
67614 break;
67615 }
67616
67617 - if (!ipipe->nrbufs && !ipipe->writers)
67618 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67619 break;
67620
67621 /*
67622 @@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67623 pipe_double_lock(ipipe, opipe);
67624
67625 do {
67626 - if (!opipe->readers) {
67627 + if (!atomic_read(&opipe->readers)) {
67628 send_sig(SIGPIPE, current, 0);
67629 if (!ret)
67630 ret = -EPIPE;
67631 @@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67632 * return EAGAIN if we have the potential of some data in the
67633 * future, otherwise just return 0
67634 */
67635 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67636 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67637 ret = -EAGAIN;
67638
67639 pipe_unlock(ipipe);
67640 diff --git a/fs/stat.c b/fs/stat.c
67641 index ae0c3ce..9ee641c 100644
67642 --- a/fs/stat.c
67643 +++ b/fs/stat.c
67644 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67645 stat->gid = inode->i_gid;
67646 stat->rdev = inode->i_rdev;
67647 stat->size = i_size_read(inode);
67648 - stat->atime = inode->i_atime;
67649 - stat->mtime = inode->i_mtime;
67650 + if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67651 + stat->atime = inode->i_ctime;
67652 + stat->mtime = inode->i_ctime;
67653 + } else {
67654 + stat->atime = inode->i_atime;
67655 + stat->mtime = inode->i_mtime;
67656 + }
67657 stat->ctime = inode->i_ctime;
67658 stat->blksize = (1 << inode->i_blkbits);
67659 stat->blocks = inode->i_blocks;
67660 @@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67661 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67662 {
67663 struct inode *inode = path->dentry->d_inode;
67664 + int retval;
67665
67666 - if (inode->i_op->getattr)
67667 - return inode->i_op->getattr(path->mnt, path->dentry, stat);
67668 + if (inode->i_op->getattr) {
67669 + retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67670 + if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67671 + stat->atime = stat->ctime;
67672 + stat->mtime = stat->ctime;
67673 + }
67674 + return retval;
67675 + }
67676
67677 generic_fillattr(inode, stat);
67678 return 0;
67679 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67680 index 0b45ff4..847de5b 100644
67681 --- a/fs/sysfs/dir.c
67682 +++ b/fs/sysfs/dir.c
67683 @@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67684 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67685 {
67686 struct kernfs_node *parent, *kn;
67687 + const char *name;
67688 + umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67689 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67690 + const char *parent_name;
67691 +#endif
67692
67693 BUG_ON(!kobj);
67694
67695 + name = kobject_name(kobj);
67696 +
67697 if (kobj->parent)
67698 parent = kobj->parent->sd;
67699 else
67700 @@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67701 if (!parent)
67702 return -ENOENT;
67703
67704 - kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67705 - S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67706 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67707 + parent_name = parent->name;
67708 + mode = S_IRWXU;
67709 +
67710 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67711 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67712 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67713 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67714 + mode = S_IRWXU | S_IRUGO | S_IXUGO;
67715 +#endif
67716 +
67717 + kn = kernfs_create_dir_ns(parent, name,
67718 + mode, kobj, ns);
67719 if (IS_ERR(kn)) {
67720 if (PTR_ERR(kn) == -EEXIST)
67721 - sysfs_warn_dup(parent, kobject_name(kobj));
67722 + sysfs_warn_dup(parent, name);
67723 return PTR_ERR(kn);
67724 }
67725
67726 diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67727 index 69d4889..a810bd4 100644
67728 --- a/fs/sysv/sysv.h
67729 +++ b/fs/sysv/sysv.h
67730 @@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67731 #endif
67732 }
67733
67734 -static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67735 +static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67736 {
67737 if (sbi->s_bytesex == BYTESEX_PDP)
67738 return PDP_swab((__force __u32)n);
67739 diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67740 index fb08b0c..65fcc7e 100644
67741 --- a/fs/ubifs/io.c
67742 +++ b/fs/ubifs/io.c
67743 @@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67744 return err;
67745 }
67746
67747 -int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67748 +int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67749 {
67750 int err;
67751
67752 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67753 index c175b4d..8f36a16 100644
67754 --- a/fs/udf/misc.c
67755 +++ b/fs/udf/misc.c
67756 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67757
67758 u8 udf_tag_checksum(const struct tag *t)
67759 {
67760 - u8 *data = (u8 *)t;
67761 + const u8 *data = (const u8 *)t;
67762 u8 checksum = 0;
67763 int i;
67764 for (i = 0; i < sizeof(struct tag); ++i)
67765 diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67766 index 8d974c4..b82f6ec 100644
67767 --- a/fs/ufs/swab.h
67768 +++ b/fs/ufs/swab.h
67769 @@ -22,7 +22,7 @@ enum {
67770 BYTESEX_BE
67771 };
67772
67773 -static inline u64
67774 +static inline u64 __intentional_overflow(-1)
67775 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67776 {
67777 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67778 @@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67779 return (__force __fs64)cpu_to_be64(n);
67780 }
67781
67782 -static inline u32
67783 +static inline u32 __intentional_overflow(-1)
67784 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67785 {
67786 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67787 diff --git a/fs/utimes.c b/fs/utimes.c
67788 index aa138d6..5f3a811 100644
67789 --- a/fs/utimes.c
67790 +++ b/fs/utimes.c
67791 @@ -1,6 +1,7 @@
67792 #include <linux/compiler.h>
67793 #include <linux/file.h>
67794 #include <linux/fs.h>
67795 +#include <linux/security.h>
67796 #include <linux/linkage.h>
67797 #include <linux/mount.h>
67798 #include <linux/namei.h>
67799 @@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67800 }
67801 }
67802 retry_deleg:
67803 +
67804 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67805 + error = -EACCES;
67806 + goto mnt_drop_write_and_out;
67807 + }
67808 +
67809 mutex_lock(&inode->i_mutex);
67810 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67811 mutex_unlock(&inode->i_mutex);
67812 diff --git a/fs/xattr.c b/fs/xattr.c
67813 index 64e83ef..b6be154 100644
67814 --- a/fs/xattr.c
67815 +++ b/fs/xattr.c
67816 @@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67817 return rc;
67818 }
67819
67820 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67821 +ssize_t
67822 +pax_getxattr(struct dentry *dentry, void *value, size_t size)
67823 +{
67824 + struct inode *inode = dentry->d_inode;
67825 + ssize_t error;
67826 +
67827 + error = inode_permission(inode, MAY_EXEC);
67828 + if (error)
67829 + return error;
67830 +
67831 + if (inode->i_op->getxattr)
67832 + error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67833 + else
67834 + error = -EOPNOTSUPP;
67835 +
67836 + return error;
67837 +}
67838 +EXPORT_SYMBOL(pax_getxattr);
67839 +#endif
67840 +
67841 ssize_t
67842 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67843 {
67844 @@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67845 * Extended attribute SET operations
67846 */
67847 static long
67848 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
67849 +setxattr(struct path *path, const char __user *name, const void __user *value,
67850 size_t size, int flags)
67851 {
67852 int error;
67853 @@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67854 posix_acl_fix_xattr_from_user(kvalue, size);
67855 }
67856
67857 - error = vfs_setxattr(d, kname, kvalue, size, flags);
67858 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67859 + error = -EACCES;
67860 + goto out;
67861 + }
67862 +
67863 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67864 out:
67865 if (vvalue)
67866 vfree(vvalue);
67867 @@ -376,7 +402,7 @@ retry:
67868 return error;
67869 error = mnt_want_write(path.mnt);
67870 if (!error) {
67871 - error = setxattr(path.dentry, name, value, size, flags);
67872 + error = setxattr(&path, name, value, size, flags);
67873 mnt_drop_write(path.mnt);
67874 }
67875 path_put(&path);
67876 @@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67877 const void __user *,value, size_t, size, int, flags)
67878 {
67879 struct fd f = fdget(fd);
67880 - struct dentry *dentry;
67881 int error = -EBADF;
67882
67883 if (!f.file)
67884 return error;
67885 - dentry = f.file->f_path.dentry;
67886 - audit_inode(NULL, dentry, 0);
67887 + audit_inode(NULL, f.file->f_path.dentry, 0);
67888 error = mnt_want_write_file(f.file);
67889 if (!error) {
67890 - error = setxattr(dentry, name, value, size, flags);
67891 + error = setxattr(&f.file->f_path, name, value, size, flags);
67892 mnt_drop_write_file(f.file);
67893 }
67894 fdput(f);
67895 @@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
67896 * Extended attribute REMOVE operations
67897 */
67898 static long
67899 -removexattr(struct dentry *d, const char __user *name)
67900 +removexattr(struct path *path, const char __user *name)
67901 {
67902 int error;
67903 char kname[XATTR_NAME_MAX + 1];
67904 @@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
67905 if (error < 0)
67906 return error;
67907
67908 - return vfs_removexattr(d, kname);
67909 + if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
67910 + return -EACCES;
67911 +
67912 + return vfs_removexattr(path->dentry, kname);
67913 }
67914
67915 static int path_removexattr(const char __user *pathname,
67916 @@ -625,7 +652,7 @@ retry:
67917 return error;
67918 error = mnt_want_write(path.mnt);
67919 if (!error) {
67920 - error = removexattr(path.dentry, name);
67921 + error = removexattr(&path, name);
67922 mnt_drop_write(path.mnt);
67923 }
67924 path_put(&path);
67925 @@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
67926 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
67927 {
67928 struct fd f = fdget(fd);
67929 - struct dentry *dentry;
67930 + struct path *path;
67931 int error = -EBADF;
67932
67933 if (!f.file)
67934 return error;
67935 - dentry = f.file->f_path.dentry;
67936 - audit_inode(NULL, dentry, 0);
67937 + path = &f.file->f_path;
67938 + audit_inode(NULL, path->dentry, 0);
67939 error = mnt_want_write_file(f.file);
67940 if (!error) {
67941 - error = removexattr(dentry, name);
67942 + error = removexattr(path, name);
67943 mnt_drop_write_file(f.file);
67944 }
67945 fdput(f);
67946 diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
67947 index 79c9819..22226b4 100644
67948 --- a/fs/xfs/libxfs/xfs_bmap.c
67949 +++ b/fs/xfs/libxfs/xfs_bmap.c
67950 @@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
67951
67952 #else
67953 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
67954 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
67955 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
67956 #endif /* DEBUG */
67957
67958 /*
67959 diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
67960 index f1b69ed..3d0222f 100644
67961 --- a/fs/xfs/xfs_dir2_readdir.c
67962 +++ b/fs/xfs/xfs_dir2_readdir.c
67963 @@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
67964 ino = dp->d_ops->sf_get_ino(sfp, sfep);
67965 filetype = dp->d_ops->sf_get_ftype(sfep);
67966 ctx->pos = off & 0x7fffffff;
67967 - if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67968 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
67969 + char name[sfep->namelen];
67970 + memcpy(name, sfep->name, sfep->namelen);
67971 + if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
67972 + return 0;
67973 + } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67974 xfs_dir3_get_dtype(dp->i_mount, filetype)))
67975 return 0;
67976 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
67977 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
67978 index 24c926b6..8726af88 100644
67979 --- a/fs/xfs/xfs_ioctl.c
67980 +++ b/fs/xfs/xfs_ioctl.c
67981 @@ -122,7 +122,7 @@ xfs_find_handle(
67982 }
67983
67984 error = -EFAULT;
67985 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
67986 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
67987 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
67988 goto out_put;
67989
67990 diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
67991 index 6a51619..9592e1b 100644
67992 --- a/fs/xfs/xfs_linux.h
67993 +++ b/fs/xfs/xfs_linux.h
67994 @@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
67995 * of the compiler which do not like us using do_div in the middle
67996 * of large functions.
67997 */
67998 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67999 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68000 {
68001 __u32 mod;
68002
68003 @@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
68004 return 0;
68005 }
68006 #else
68007 -static inline __u32 xfs_do_div(void *a, __u32 b, int n)
68008 +static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
68009 {
68010 __u32 mod;
68011
68012 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
68013 new file mode 100644
68014 index 0000000..f27264e
68015 --- /dev/null
68016 +++ b/grsecurity/Kconfig
68017 @@ -0,0 +1,1166 @@
68018 +#
68019 +# grecurity configuration
68020 +#
68021 +menu "Memory Protections"
68022 +depends on GRKERNSEC
68023 +
68024 +config GRKERNSEC_KMEM
68025 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
68026 + default y if GRKERNSEC_CONFIG_AUTO
68027 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
68028 + help
68029 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
68030 + be written to or read from to modify or leak the contents of the running
68031 + kernel. /dev/port will also not be allowed to be opened, writing to
68032 + /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
68033 + If you have module support disabled, enabling this will close up several
68034 + ways that are currently used to insert malicious code into the running
68035 + kernel.
68036 +
68037 + Even with this feature enabled, we still highly recommend that
68038 + you use the RBAC system, as it is still possible for an attacker to
68039 + modify the running kernel through other more obscure methods.
68040 +
68041 + It is highly recommended that you say Y here if you meet all the
68042 + conditions above.
68043 +
68044 +config GRKERNSEC_VM86
68045 + bool "Restrict VM86 mode"
68046 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68047 + depends on X86_32
68048 +
68049 + help
68050 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
68051 + make use of a special execution mode on 32bit x86 processors called
68052 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
68053 + video cards and will still work with this option enabled. The purpose
68054 + of the option is to prevent exploitation of emulation errors in
68055 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
68056 + Nearly all users should be able to enable this option.
68057 +
68058 +config GRKERNSEC_IO
68059 + bool "Disable privileged I/O"
68060 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68061 + depends on X86
68062 + select RTC_CLASS
68063 + select RTC_INTF_DEV
68064 + select RTC_DRV_CMOS
68065 +
68066 + help
68067 + If you say Y here, all ioperm and iopl calls will return an error.
68068 + Ioperm and iopl can be used to modify the running kernel.
68069 + Unfortunately, some programs need this access to operate properly,
68070 + the most notable of which are XFree86 and hwclock. hwclock can be
68071 + remedied by having RTC support in the kernel, so real-time
68072 + clock support is enabled if this option is enabled, to ensure
68073 + that hwclock operates correctly. If hwclock still does not work,
68074 + either update udev or symlink /dev/rtc to /dev/rtc0.
68075 +
68076 + If you're using XFree86 or a version of Xorg from 2012 or earlier,
68077 + you may not be able to boot into a graphical environment with this
68078 + option enabled. In this case, you should use the RBAC system instead.
68079 +
68080 +config GRKERNSEC_BPF_HARDEN
68081 + bool "Harden BPF interpreter"
68082 + default y if GRKERNSEC_CONFIG_AUTO
68083 + help
68084 + Unlike previous versions of grsecurity that hardened both the BPF
68085 + interpreted code against corruption at rest as well as the JIT code
68086 + against JIT-spray attacks and attacker-controlled immediate values
68087 + for ROP, this feature will enforce disabling of the new eBPF JIT engine
68088 + and will ensure the interpreted code is read-only at rest. This feature
68089 + may be removed at a later time when eBPF stabilizes to entirely revert
68090 + back to the more secure pre-3.16 BPF interpreter/JIT.
68091 +
68092 + If you're using KERNEXEC, it's recommended that you enable this option
68093 + to supplement the hardening of the kernel.
68094 +
68095 +config GRKERNSEC_PERF_HARDEN
68096 + bool "Disable unprivileged PERF_EVENTS usage by default"
68097 + default y if GRKERNSEC_CONFIG_AUTO
68098 + depends on PERF_EVENTS
68099 + help
68100 + If you say Y here, the range of acceptable values for the
68101 + /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68102 + default to a new value: 3. When the sysctl is set to this value, no
68103 + unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68104 +
68105 + Though PERF_EVENTS can be used legitimately for performance monitoring
68106 + and low-level application profiling, it is forced on regardless of
68107 + configuration, has been at fault for several vulnerabilities, and
68108 + creates new opportunities for side channels and other information leaks.
68109 +
68110 + This feature puts PERF_EVENTS into a secure default state and permits
68111 + the administrator to change out of it temporarily if unprivileged
68112 + application profiling is needed.
68113 +
68114 +config GRKERNSEC_RAND_THREADSTACK
68115 + bool "Insert random gaps between thread stacks"
68116 + default y if GRKERNSEC_CONFIG_AUTO
68117 + depends on PAX_RANDMMAP && !PPC
68118 + help
68119 + If you say Y here, a random-sized gap will be enforced between allocated
68120 + thread stacks. Glibc's NPTL and other threading libraries that
68121 + pass MAP_STACK to the kernel for thread stack allocation are supported.
68122 + The implementation currently provides 8 bits of entropy for the gap.
68123 +
68124 + Many distributions do not compile threaded remote services with the
68125 + -fstack-check argument to GCC, causing the variable-sized stack-based
68126 + allocator, alloca(), to not probe the stack on allocation. This
68127 + permits an unbounded alloca() to skip over any guard page and potentially
68128 + modify another thread's stack reliably. An enforced random gap
68129 + reduces the reliability of such an attack and increases the chance
68130 + that such a read/write to another thread's stack instead lands in
68131 + an unmapped area, causing a crash and triggering grsecurity's
68132 + anti-bruteforcing logic.
68133 +
68134 +config GRKERNSEC_PROC_MEMMAP
68135 + bool "Harden ASLR against information leaks and entropy reduction"
68136 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68137 + depends on PAX_NOEXEC || PAX_ASLR
68138 + help
68139 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68140 + give no information about the addresses of its mappings if
68141 + PaX features that rely on random addresses are enabled on the task.
68142 + In addition to sanitizing this information and disabling other
68143 + dangerous sources of information, this option causes reads of sensitive
68144 + /proc/<pid> entries where the file descriptor was opened in a different
68145 + task than the one performing the read. Such attempts are logged.
68146 + This option also limits argv/env strings for suid/sgid binaries
68147 + to 512KB to prevent a complete exhaustion of the stack entropy provided
68148 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68149 + binaries to prevent alternative mmap layouts from being abused.
68150 +
68151 + If you use PaX it is essential that you say Y here as it closes up
68152 + several holes that make full ASLR useless locally.
68153 +
68154 +
68155 +config GRKERNSEC_KSTACKOVERFLOW
68156 + bool "Prevent kernel stack overflows"
68157 + default y if GRKERNSEC_CONFIG_AUTO
68158 + depends on !IA64 && 64BIT
68159 + help
68160 + If you say Y here, the kernel's process stacks will be allocated
68161 + with vmalloc instead of the kernel's default allocator. This
68162 + introduces guard pages that in combination with the alloca checking
68163 + of the STACKLEAK feature prevents all forms of kernel process stack
68164 + overflow abuse. Note that this is different from kernel stack
68165 + buffer overflows.
68166 +
68167 +config GRKERNSEC_BRUTE
68168 + bool "Deter exploit bruteforcing"
68169 + default y if GRKERNSEC_CONFIG_AUTO
68170 + help
68171 + If you say Y here, attempts to bruteforce exploits against forking
68172 + daemons such as apache or sshd, as well as against suid/sgid binaries
68173 + will be deterred. When a child of a forking daemon is killed by PaX
68174 + or crashes due to an illegal instruction or other suspicious signal,
68175 + the parent process will be delayed 30 seconds upon every subsequent
68176 + fork until the administrator is able to assess the situation and
68177 + restart the daemon.
68178 + In the suid/sgid case, the attempt is logged, the user has all their
68179 + existing instances of the suid/sgid binary terminated and will
68180 + be unable to execute any suid/sgid binaries for 15 minutes.
68181 +
68182 + It is recommended that you also enable signal logging in the auditing
68183 + section so that logs are generated when a process triggers a suspicious
68184 + signal.
68185 + If the sysctl option is enabled, a sysctl option with name
68186 + "deter_bruteforce" is created.
68187 +
68188 +config GRKERNSEC_MODHARDEN
68189 + bool "Harden module auto-loading"
68190 + default y if GRKERNSEC_CONFIG_AUTO
68191 + depends on MODULES
68192 + help
68193 + If you say Y here, module auto-loading in response to use of some
68194 + feature implemented by an unloaded module will be restricted to
68195 + root users. Enabling this option helps defend against attacks
68196 + by unprivileged users who abuse the auto-loading behavior to
68197 + cause a vulnerable module to load that is then exploited.
68198 +
68199 + If this option prevents a legitimate use of auto-loading for a
68200 + non-root user, the administrator can execute modprobe manually
68201 + with the exact name of the module mentioned in the alert log.
68202 + Alternatively, the administrator can add the module to the list
68203 + of modules loaded at boot by modifying init scripts.
68204 +
68205 + Modification of init scripts will most likely be needed on
68206 + Ubuntu servers with encrypted home directory support enabled,
68207 + as the first non-root user logging in will cause the ecb(aes),
68208 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68209 +
68210 +config GRKERNSEC_HIDESYM
68211 + bool "Hide kernel symbols"
68212 + default y if GRKERNSEC_CONFIG_AUTO
68213 + select PAX_USERCOPY_SLABS
68214 + help
68215 + If you say Y here, getting information on loaded modules, and
68216 + displaying all kernel symbols through a syscall will be restricted
68217 + to users with CAP_SYS_MODULE. For software compatibility reasons,
68218 + /proc/kallsyms will be restricted to the root user. The RBAC
68219 + system can hide that entry even from root.
68220 +
68221 + This option also prevents leaking of kernel addresses through
68222 + several /proc entries.
68223 +
68224 + Note that this option is only effective provided the following
68225 + conditions are met:
68226 + 1) The kernel using grsecurity is not precompiled by some distribution
68227 + 2) You have also enabled GRKERNSEC_DMESG
68228 + 3) You are using the RBAC system and hiding other files such as your
68229 + kernel image and System.map. Alternatively, enabling this option
68230 + causes the permissions on /boot, /lib/modules, and the kernel
68231 + source directory to change at compile time to prevent
68232 + reading by non-root users.
68233 + If the above conditions are met, this option will aid in providing a
68234 + useful protection against local kernel exploitation of overflows
68235 + and arbitrary read/write vulnerabilities.
68236 +
68237 + It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68238 + in addition to this feature.
68239 +
68240 +config GRKERNSEC_RANDSTRUCT
68241 + bool "Randomize layout of sensitive kernel structures"
68242 + default y if GRKERNSEC_CONFIG_AUTO
68243 + select GRKERNSEC_HIDESYM
68244 + select MODVERSIONS if MODULES
68245 + help
68246 + If you say Y here, the layouts of a number of sensitive kernel
68247 + structures (task, fs, cred, etc) and all structures composed entirely
68248 + of function pointers (aka "ops" structs) will be randomized at compile-time.
68249 + This can introduce the requirement of an additional infoleak
68250 + vulnerability for exploits targeting these structure types.
68251 +
68252 + Enabling this feature will introduce some performance impact, slightly
68253 + increase memory usage, and prevent the use of forensic tools like
68254 + Volatility against the system (unless the kernel source tree isn't
68255 + cleaned after kernel installation).
68256 +
68257 + The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68258 + It remains after a make clean to allow for external modules to be compiled
68259 + with the existing seed and will be removed by a make mrproper or
68260 + make distclean.
68261 +
68262 + Note that the implementation requires gcc 4.6.4. or newer. You may need
68263 + to install the supporting headers explicitly in addition to the normal
68264 + gcc package.
68265 +
68266 +config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68267 + bool "Use cacheline-aware structure randomization"
68268 + depends on GRKERNSEC_RANDSTRUCT
68269 + default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68270 + help
68271 + If you say Y here, the RANDSTRUCT randomization will make a best effort
68272 + at restricting randomization to cacheline-sized groups of elements. It
68273 + will further not randomize bitfields in structures. This reduces the
68274 + performance hit of RANDSTRUCT at the cost of weakened randomization.
68275 +
68276 +config GRKERNSEC_KERN_LOCKOUT
68277 + bool "Active kernel exploit response"
68278 + default y if GRKERNSEC_CONFIG_AUTO
68279 + depends on X86 || ARM || PPC || SPARC
68280 + help
68281 + If you say Y here, when a PaX alert is triggered due to suspicious
68282 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68283 + or an OOPS occurs due to bad memory accesses, instead of just
68284 + terminating the offending process (and potentially allowing
68285 + a subsequent exploit from the same user), we will take one of two
68286 + actions:
68287 + If the user was root, we will panic the system
68288 + If the user was non-root, we will log the attempt, terminate
68289 + all processes owned by the user, then prevent them from creating
68290 + any new processes until the system is restarted
68291 + This deters repeated kernel exploitation/bruteforcing attempts
68292 + and is useful for later forensics.
68293 +
68294 +config GRKERNSEC_OLD_ARM_USERLAND
68295 + bool "Old ARM userland compatibility"
68296 + depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68297 + help
68298 + If you say Y here, stubs of executable code to perform such operations
68299 + as "compare-exchange" will be placed at fixed locations in the ARM vector
68300 + table. This is unfortunately needed for old ARM userland meant to run
68301 + across a wide range of processors. Without this option enabled,
68302 + the get_tls and data memory barrier stubs will be emulated by the kernel,
68303 + which is enough for Linaro userlands or other userlands designed for v6
68304 + and newer ARM CPUs. It's recommended that you try without this option enabled
68305 + first, and only enable it if your userland does not boot (it will likely fail
68306 + at init time).
68307 +
68308 +endmenu
68309 +menu "Role Based Access Control Options"
68310 +depends on GRKERNSEC
68311 +
68312 +config GRKERNSEC_RBAC_DEBUG
68313 + bool
68314 +
68315 +config GRKERNSEC_NO_RBAC
68316 + bool "Disable RBAC system"
68317 + help
68318 + If you say Y here, the /dev/grsec device will be removed from the kernel,
68319 + preventing the RBAC system from being enabled. You should only say Y
68320 + here if you have no intention of using the RBAC system, so as to prevent
68321 + an attacker with root access from misusing the RBAC system to hide files
68322 + and processes when loadable module support and /dev/[k]mem have been
68323 + locked down.
68324 +
68325 +config GRKERNSEC_ACL_HIDEKERN
68326 + bool "Hide kernel processes"
68327 + help
68328 + If you say Y here, all kernel threads will be hidden to all
68329 + processes but those whose subject has the "view hidden processes"
68330 + flag.
68331 +
68332 +config GRKERNSEC_ACL_MAXTRIES
68333 + int "Maximum tries before password lockout"
68334 + default 3
68335 + help
68336 + This option enforces the maximum number of times a user can attempt
68337 + to authorize themselves with the grsecurity RBAC system before being
68338 + denied the ability to attempt authorization again for a specified time.
68339 + The lower the number, the harder it will be to brute-force a password.
68340 +
68341 +config GRKERNSEC_ACL_TIMEOUT
68342 + int "Time to wait after max password tries, in seconds"
68343 + default 30
68344 + help
68345 + This option specifies the time the user must wait after attempting to
68346 + authorize to the RBAC system with the maximum number of invalid
68347 + passwords. The higher the number, the harder it will be to brute-force
68348 + a password.
68349 +
68350 +endmenu
68351 +menu "Filesystem Protections"
68352 +depends on GRKERNSEC
68353 +
68354 +config GRKERNSEC_PROC
68355 + bool "Proc restrictions"
68356 + default y if GRKERNSEC_CONFIG_AUTO
68357 + help
68358 + If you say Y here, the permissions of the /proc filesystem
68359 + will be altered to enhance system security and privacy. You MUST
68360 + choose either a user only restriction or a user and group restriction.
68361 + Depending upon the option you choose, you can either restrict users to
68362 + see only the processes they themselves run, or choose a group that can
68363 + view all processes and files normally restricted to root if you choose
68364 + the "restrict to user only" option. NOTE: If you're running identd or
68365 + ntpd as a non-root user, you will have to run it as the group you
68366 + specify here.
68367 +
68368 +config GRKERNSEC_PROC_USER
68369 + bool "Restrict /proc to user only"
68370 + depends on GRKERNSEC_PROC
68371 + help
68372 + If you say Y here, non-root users will only be able to view their own
68373 + processes, and restricts them from viewing network-related information,
68374 + and viewing kernel symbol and module information.
68375 +
68376 +config GRKERNSEC_PROC_USERGROUP
68377 + bool "Allow special group"
68378 + default y if GRKERNSEC_CONFIG_AUTO
68379 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68380 + help
68381 + If you say Y here, you will be able to select a group that will be
68382 + able to view all processes and network-related information. If you've
68383 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68384 + remain hidden. This option is useful if you want to run identd as
68385 + a non-root user. The group you select may also be chosen at boot time
68386 + via "grsec_proc_gid=" on the kernel commandline.
68387 +
68388 +config GRKERNSEC_PROC_GID
68389 + int "GID for special group"
68390 + depends on GRKERNSEC_PROC_USERGROUP
68391 + default 1001
68392 +
68393 +config GRKERNSEC_PROC_ADD
68394 + bool "Additional restrictions"
68395 + default y if GRKERNSEC_CONFIG_AUTO
68396 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68397 + help
68398 + If you say Y here, additional restrictions will be placed on
68399 + /proc that keep normal users from viewing device information and
68400 + slabinfo information that could be useful for exploits.
68401 +
68402 +config GRKERNSEC_LINK
68403 + bool "Linking restrictions"
68404 + default y if GRKERNSEC_CONFIG_AUTO
68405 + help
68406 + If you say Y here, /tmp race exploits will be prevented, since users
68407 + will no longer be able to follow symlinks owned by other users in
68408 + world-writable +t directories (e.g. /tmp), unless the owner of the
68409 + symlink is the owner of the directory. users will also not be
68410 + able to hardlink to files they do not own. If the sysctl option is
68411 + enabled, a sysctl option with name "linking_restrictions" is created.
68412 +
68413 +config GRKERNSEC_SYMLINKOWN
68414 + bool "Kernel-enforced SymlinksIfOwnerMatch"
68415 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68416 + help
68417 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
68418 + that prevents it from being used as a security feature. As Apache
68419 + verifies the symlink by performing a stat() against the target of
68420 + the symlink before it is followed, an attacker can setup a symlink
68421 + to point to a same-owned file, then replace the symlink with one
68422 + that targets another user's file just after Apache "validates" the
68423 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
68424 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68425 + will be in place for the group you specify. If the sysctl option
68426 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
68427 + created.
68428 +
68429 +config GRKERNSEC_SYMLINKOWN_GID
68430 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68431 + depends on GRKERNSEC_SYMLINKOWN
68432 + default 1006
68433 + help
68434 + Setting this GID determines what group kernel-enforced
68435 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68436 + is enabled, a sysctl option with name "symlinkown_gid" is created.
68437 +
68438 +config GRKERNSEC_FIFO
68439 + bool "FIFO restrictions"
68440 + default y if GRKERNSEC_CONFIG_AUTO
68441 + help
68442 + If you say Y here, users will not be able to write to FIFOs they don't
68443 + own in world-writable +t directories (e.g. /tmp), unless the owner of
68444 + the FIFO is the same owner of the directory it's held in. If the sysctl
68445 + option is enabled, a sysctl option with name "fifo_restrictions" is
68446 + created.
68447 +
68448 +config GRKERNSEC_SYSFS_RESTRICT
68449 + bool "Sysfs/debugfs restriction"
68450 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68451 + depends on SYSFS
68452 + help
68453 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68454 + any filesystem normally mounted under it (e.g. debugfs) will be
68455 + mostly accessible only by root. These filesystems generally provide access
68456 + to hardware and debug information that isn't appropriate for unprivileged
68457 + users of the system. Sysfs and debugfs have also become a large source
68458 + of new vulnerabilities, ranging from infoleaks to local compromise.
68459 + There has been very little oversight with an eye toward security involved
68460 + in adding new exporters of information to these filesystems, so their
68461 + use is discouraged.
68462 + For reasons of compatibility, a few directories have been whitelisted
68463 + for access by non-root users:
68464 + /sys/fs/selinux
68465 + /sys/fs/fuse
68466 + /sys/devices/system/cpu
68467 +
68468 +config GRKERNSEC_ROFS
68469 + bool "Runtime read-only mount protection"
68470 + depends on SYSCTL
68471 + help
68472 + If you say Y here, a sysctl option with name "romount_protect" will
68473 + be created. By setting this option to 1 at runtime, filesystems
68474 + will be protected in the following ways:
68475 + * No new writable mounts will be allowed
68476 + * Existing read-only mounts won't be able to be remounted read/write
68477 + * Write operations will be denied on all block devices
68478 + This option acts independently of grsec_lock: once it is set to 1,
68479 + it cannot be turned off. Therefore, please be mindful of the resulting
68480 + behavior if this option is enabled in an init script on a read-only
68481 + filesystem.
68482 + Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68483 + and GRKERNSEC_IO should be enabled and module loading disabled via
68484 + config or at runtime.
68485 + This feature is mainly intended for secure embedded systems.
68486 +
68487 +
68488 +config GRKERNSEC_DEVICE_SIDECHANNEL
68489 + bool "Eliminate stat/notify-based device sidechannels"
68490 + default y if GRKERNSEC_CONFIG_AUTO
68491 + help
68492 + If you say Y here, timing analyses on block or character
68493 + devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68494 + will be thwarted for unprivileged users. If a process without
68495 + CAP_MKNOD stats such a device, the last access and last modify times
68496 + will match the device's create time. No access or modify events
68497 + will be triggered through inotify/dnotify/fanotify for such devices.
68498 + This feature will prevent attacks that may at a minimum
68499 + allow an attacker to determine the administrator's password length.
68500 +
68501 +config GRKERNSEC_CHROOT
68502 + bool "Chroot jail restrictions"
68503 + default y if GRKERNSEC_CONFIG_AUTO
68504 + help
68505 + If you say Y here, you will be able to choose several options that will
68506 + make breaking out of a chrooted jail much more difficult. If you
68507 + encounter no software incompatibilities with the following options, it
68508 + is recommended that you enable each one.
68509 +
68510 + Note that the chroot restrictions are not intended to apply to "chroots"
68511 + to directories that are simple bind mounts of the global root filesystem.
68512 + For several other reasons, a user shouldn't expect any significant
68513 + security by performing such a chroot.
68514 +
68515 +config GRKERNSEC_CHROOT_MOUNT
68516 + bool "Deny mounts"
68517 + default y if GRKERNSEC_CONFIG_AUTO
68518 + depends on GRKERNSEC_CHROOT
68519 + help
68520 + If you say Y here, processes inside a chroot will not be able to
68521 + mount or remount filesystems. If the sysctl option is enabled, a
68522 + sysctl option with name "chroot_deny_mount" is created.
68523 +
68524 +config GRKERNSEC_CHROOT_DOUBLE
68525 + bool "Deny double-chroots"
68526 + default y if GRKERNSEC_CONFIG_AUTO
68527 + depends on GRKERNSEC_CHROOT
68528 + help
68529 + If you say Y here, processes inside a chroot will not be able to chroot
68530 + again outside the chroot. This is a widely used method of breaking
68531 + out of a chroot jail and should not be allowed. If the sysctl
68532 + option is enabled, a sysctl option with name
68533 + "chroot_deny_chroot" is created.
68534 +
68535 +config GRKERNSEC_CHROOT_PIVOT
68536 + bool "Deny pivot_root in chroot"
68537 + default y if GRKERNSEC_CONFIG_AUTO
68538 + depends on GRKERNSEC_CHROOT
68539 + help
68540 + If you say Y here, processes inside a chroot will not be able to use
68541 + a function called pivot_root() that was introduced in Linux 2.3.41. It
68542 + works similar to chroot in that it changes the root filesystem. This
68543 + function could be misused in a chrooted process to attempt to break out
68544 + of the chroot, and therefore should not be allowed. If the sysctl
68545 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
68546 + created.
68547 +
68548 +config GRKERNSEC_CHROOT_CHDIR
68549 + bool "Enforce chdir(\"/\") on all chroots"
68550 + default y if GRKERNSEC_CONFIG_AUTO
68551 + depends on GRKERNSEC_CHROOT
68552 + help
68553 + If you say Y here, the current working directory of all newly-chrooted
68554 + applications will be set to the the root directory of the chroot.
68555 + The man page on chroot(2) states:
68556 + Note that this call does not change the current working
68557 + directory, so that `.' can be outside the tree rooted at
68558 + `/'. In particular, the super-user can escape from a
68559 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68560 +
68561 + It is recommended that you say Y here, since it's not known to break
68562 + any software. If the sysctl option is enabled, a sysctl option with
68563 + name "chroot_enforce_chdir" is created.
68564 +
68565 +config GRKERNSEC_CHROOT_CHMOD
68566 + bool "Deny (f)chmod +s"
68567 + default y if GRKERNSEC_CONFIG_AUTO
68568 + depends on GRKERNSEC_CHROOT
68569 + help
68570 + If you say Y here, processes inside a chroot will not be able to chmod
68571 + or fchmod files to make them have suid or sgid bits. This protects
68572 + against another published method of breaking a chroot. If the sysctl
68573 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
68574 + created.
68575 +
68576 +config GRKERNSEC_CHROOT_FCHDIR
68577 + bool "Deny fchdir and fhandle out of chroot"
68578 + default y if GRKERNSEC_CONFIG_AUTO
68579 + depends on GRKERNSEC_CHROOT
68580 + help
68581 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
68582 + to a file descriptor of the chrooting process that points to a directory
68583 + outside the filesystem will be stopped. Additionally, this option prevents
68584 + use of the recently-created syscall for opening files by a guessable "file
68585 + handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68586 + with name "chroot_deny_fchdir" is created.
68587 +
68588 +config GRKERNSEC_CHROOT_MKNOD
68589 + bool "Deny mknod"
68590 + default y if GRKERNSEC_CONFIG_AUTO
68591 + depends on GRKERNSEC_CHROOT
68592 + help
68593 + If you say Y here, processes inside a chroot will not be allowed to
68594 + mknod. The problem with using mknod inside a chroot is that it
68595 + would allow an attacker to create a device entry that is the same
68596 + as one on the physical root of your system, which could range from
68597 + anything from the console device to a device for your harddrive (which
68598 + they could then use to wipe the drive or steal data). It is recommended
68599 + that you say Y here, unless you run into software incompatibilities.
68600 + If the sysctl option is enabled, a sysctl option with name
68601 + "chroot_deny_mknod" is created.
68602 +
68603 +config GRKERNSEC_CHROOT_SHMAT
68604 + bool "Deny shmat() out of chroot"
68605 + default y if GRKERNSEC_CONFIG_AUTO
68606 + depends on GRKERNSEC_CHROOT
68607 + help
68608 + If you say Y here, processes inside a chroot will not be able to attach
68609 + to shared memory segments that were created outside of the chroot jail.
68610 + It is recommended that you say Y here. If the sysctl option is enabled,
68611 + a sysctl option with name "chroot_deny_shmat" is created.
68612 +
68613 +config GRKERNSEC_CHROOT_UNIX
68614 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
68615 + default y if GRKERNSEC_CONFIG_AUTO
68616 + depends on GRKERNSEC_CHROOT
68617 + help
68618 + If you say Y here, processes inside a chroot will not be able to
68619 + connect to abstract (meaning not belonging to a filesystem) Unix
68620 + domain sockets that were bound outside of a chroot. It is recommended
68621 + that you say Y here. If the sysctl option is enabled, a sysctl option
68622 + with name "chroot_deny_unix" is created.
68623 +
68624 +config GRKERNSEC_CHROOT_FINDTASK
68625 + bool "Protect outside processes"
68626 + default y if GRKERNSEC_CONFIG_AUTO
68627 + depends on GRKERNSEC_CHROOT
68628 + help
68629 + If you say Y here, processes inside a chroot will not be able to
68630 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68631 + getsid, or view any process outside of the chroot. If the sysctl
68632 + option is enabled, a sysctl option with name "chroot_findtask" is
68633 + created.
68634 +
68635 +config GRKERNSEC_CHROOT_NICE
68636 + bool "Restrict priority changes"
68637 + default y if GRKERNSEC_CONFIG_AUTO
68638 + depends on GRKERNSEC_CHROOT
68639 + help
68640 + If you say Y here, processes inside a chroot will not be able to raise
68641 + the priority of processes in the chroot, or alter the priority of
68642 + processes outside the chroot. This provides more security than simply
68643 + removing CAP_SYS_NICE from the process' capability set. If the
68644 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68645 + is created.
68646 +
68647 +config GRKERNSEC_CHROOT_SYSCTL
68648 + bool "Deny sysctl writes"
68649 + default y if GRKERNSEC_CONFIG_AUTO
68650 + depends on GRKERNSEC_CHROOT
68651 + help
68652 + If you say Y here, an attacker in a chroot will not be able to
68653 + write to sysctl entries, either by sysctl(2) or through a /proc
68654 + interface. It is strongly recommended that you say Y here. If the
68655 + sysctl option is enabled, a sysctl option with name
68656 + "chroot_deny_sysctl" is created.
68657 +
68658 +config GRKERNSEC_CHROOT_CAPS
68659 + bool "Capability restrictions"
68660 + default y if GRKERNSEC_CONFIG_AUTO
68661 + depends on GRKERNSEC_CHROOT
68662 + help
68663 + If you say Y here, the capabilities on all processes within a
68664 + chroot jail will be lowered to stop module insertion, raw i/o,
68665 + system and net admin tasks, rebooting the system, modifying immutable
68666 + files, modifying IPC owned by another, and changing the system time.
68667 + This is left an option because it can break some apps. Disable this
68668 + if your chrooted apps are having problems performing those kinds of
68669 + tasks. If the sysctl option is enabled, a sysctl option with
68670 + name "chroot_caps" is created.
68671 +
68672 +config GRKERNSEC_CHROOT_INITRD
68673 + bool "Exempt initrd tasks from restrictions"
68674 + default y if GRKERNSEC_CONFIG_AUTO
68675 + depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68676 + help
68677 + If you say Y here, tasks started prior to init will be exempted from
68678 + grsecurity's chroot restrictions. This option is mainly meant to
68679 + resolve Plymouth's performing privileged operations unnecessarily
68680 + in a chroot.
68681 +
68682 +endmenu
68683 +menu "Kernel Auditing"
68684 +depends on GRKERNSEC
68685 +
68686 +config GRKERNSEC_AUDIT_GROUP
68687 + bool "Single group for auditing"
68688 + help
68689 + If you say Y here, the exec and chdir logging features will only operate
68690 + on a group you specify. This option is recommended if you only want to
68691 + watch certain users instead of having a large amount of logs from the
68692 + entire system. If the sysctl option is enabled, a sysctl option with
68693 + name "audit_group" is created.
68694 +
68695 +config GRKERNSEC_AUDIT_GID
68696 + int "GID for auditing"
68697 + depends on GRKERNSEC_AUDIT_GROUP
68698 + default 1007
68699 +
68700 +config GRKERNSEC_EXECLOG
68701 + bool "Exec logging"
68702 + help
68703 + If you say Y here, all execve() calls will be logged (since the
68704 + other exec*() calls are frontends to execve(), all execution
68705 + will be logged). Useful for shell-servers that like to keep track
68706 + of their users. If the sysctl option is enabled, a sysctl option with
68707 + name "exec_logging" is created.
68708 + WARNING: This option when enabled will produce a LOT of logs, especially
68709 + on an active system.
68710 +
68711 +config GRKERNSEC_RESLOG
68712 + bool "Resource logging"
68713 + default y if GRKERNSEC_CONFIG_AUTO
68714 + help
68715 + If you say Y here, all attempts to overstep resource limits will
68716 + be logged with the resource name, the requested size, and the current
68717 + limit. It is highly recommended that you say Y here. If the sysctl
68718 + option is enabled, a sysctl option with name "resource_logging" is
68719 + created. If the RBAC system is enabled, the sysctl value is ignored.
68720 +
68721 +config GRKERNSEC_CHROOT_EXECLOG
68722 + bool "Log execs within chroot"
68723 + help
68724 + If you say Y here, all executions inside a chroot jail will be logged
68725 + to syslog. This can cause a large amount of logs if certain
68726 + applications (eg. djb's daemontools) are installed on the system, and
68727 + is therefore left as an option. If the sysctl option is enabled, a
68728 + sysctl option with name "chroot_execlog" is created.
68729 +
68730 +config GRKERNSEC_AUDIT_PTRACE
68731 + bool "Ptrace logging"
68732 + help
68733 + If you say Y here, all attempts to attach to a process via ptrace
68734 + will be logged. If the sysctl option is enabled, a sysctl option
68735 + with name "audit_ptrace" is created.
68736 +
68737 +config GRKERNSEC_AUDIT_CHDIR
68738 + bool "Chdir logging"
68739 + help
68740 + If you say Y here, all chdir() calls will be logged. If the sysctl
68741 + option is enabled, a sysctl option with name "audit_chdir" is created.
68742 +
68743 +config GRKERNSEC_AUDIT_MOUNT
68744 + bool "(Un)Mount logging"
68745 + help
68746 + If you say Y here, all mounts and unmounts will be logged. If the
68747 + sysctl option is enabled, a sysctl option with name "audit_mount" is
68748 + created.
68749 +
68750 +config GRKERNSEC_SIGNAL
68751 + bool "Signal logging"
68752 + default y if GRKERNSEC_CONFIG_AUTO
68753 + help
68754 + If you say Y here, certain important signals will be logged, such as
68755 + SIGSEGV, which will as a result inform you of when a error in a program
68756 + occurred, which in some cases could mean a possible exploit attempt.
68757 + If the sysctl option is enabled, a sysctl option with name
68758 + "signal_logging" is created.
68759 +
68760 +config GRKERNSEC_FORKFAIL
68761 + bool "Fork failure logging"
68762 + help
68763 + If you say Y here, all failed fork() attempts will be logged.
68764 + This could suggest a fork bomb, or someone attempting to overstep
68765 + their process limit. If the sysctl option is enabled, a sysctl option
68766 + with name "forkfail_logging" is created.
68767 +
68768 +config GRKERNSEC_TIME
68769 + bool "Time change logging"
68770 + default y if GRKERNSEC_CONFIG_AUTO
68771 + help
68772 + If you say Y here, any changes of the system clock will be logged.
68773 + If the sysctl option is enabled, a sysctl option with name
68774 + "timechange_logging" is created.
68775 +
68776 +config GRKERNSEC_PROC_IPADDR
68777 + bool "/proc/<pid>/ipaddr support"
68778 + default y if GRKERNSEC_CONFIG_AUTO
68779 + help
68780 + If you say Y here, a new entry will be added to each /proc/<pid>
68781 + directory that contains the IP address of the person using the task.
68782 + The IP is carried across local TCP and AF_UNIX stream sockets.
68783 + This information can be useful for IDS/IPSes to perform remote response
68784 + to a local attack. The entry is readable by only the owner of the
68785 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68786 + the RBAC system), and thus does not create privacy concerns.
68787 +
68788 +config GRKERNSEC_RWXMAP_LOG
68789 + bool 'Denied RWX mmap/mprotect logging'
68790 + default y if GRKERNSEC_CONFIG_AUTO
68791 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68792 + help
68793 + If you say Y here, calls to mmap() and mprotect() with explicit
68794 + usage of PROT_WRITE and PROT_EXEC together will be logged when
68795 + denied by the PAX_MPROTECT feature. This feature will also
68796 + log other problematic scenarios that can occur when PAX_MPROTECT
68797 + is enabled on a binary, like textrels and PT_GNU_STACK. If the
68798 + sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68799 + is created.
68800 +
68801 +endmenu
68802 +
68803 +menu "Executable Protections"
68804 +depends on GRKERNSEC
68805 +
68806 +config GRKERNSEC_DMESG
68807 + bool "Dmesg(8) restriction"
68808 + default y if GRKERNSEC_CONFIG_AUTO
68809 + help
68810 + If you say Y here, non-root users will not be able to use dmesg(8)
68811 + to view the contents of the kernel's circular log buffer.
68812 + The kernel's log buffer often contains kernel addresses and other
68813 + identifying information useful to an attacker in fingerprinting a
68814 + system for a targeted exploit.
68815 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
68816 + created.
68817 +
68818 +config GRKERNSEC_HARDEN_PTRACE
68819 + bool "Deter ptrace-based process snooping"
68820 + default y if GRKERNSEC_CONFIG_AUTO
68821 + help
68822 + If you say Y here, TTY sniffers and other malicious monitoring
68823 + programs implemented through ptrace will be defeated. If you
68824 + have been using the RBAC system, this option has already been
68825 + enabled for several years for all users, with the ability to make
68826 + fine-grained exceptions.
68827 +
68828 + This option only affects the ability of non-root users to ptrace
68829 + processes that are not a descendent of the ptracing process.
68830 + This means that strace ./binary and gdb ./binary will still work,
68831 + but attaching to arbitrary processes will not. If the sysctl
68832 + option is enabled, a sysctl option with name "harden_ptrace" is
68833 + created.
68834 +
68835 +config GRKERNSEC_PTRACE_READEXEC
68836 + bool "Require read access to ptrace sensitive binaries"
68837 + default y if GRKERNSEC_CONFIG_AUTO
68838 + help
68839 + If you say Y here, unprivileged users will not be able to ptrace unreadable
68840 + binaries. This option is useful in environments that
68841 + remove the read bits (e.g. file mode 4711) from suid binaries to
68842 + prevent infoleaking of their contents. This option adds
68843 + consistency to the use of that file mode, as the binary could normally
68844 + be read out when run without privileges while ptracing.
68845 +
68846 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68847 + is created.
68848 +
68849 +config GRKERNSEC_SETXID
68850 + bool "Enforce consistent multithreaded privileges"
68851 + default y if GRKERNSEC_CONFIG_AUTO
68852 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68853 + help
68854 + If you say Y here, a change from a root uid to a non-root uid
68855 + in a multithreaded application will cause the resulting uids,
68856 + gids, supplementary groups, and capabilities in that thread
68857 + to be propagated to the other threads of the process. In most
68858 + cases this is unnecessary, as glibc will emulate this behavior
68859 + on behalf of the application. Other libcs do not act in the
68860 + same way, allowing the other threads of the process to continue
68861 + running with root privileges. If the sysctl option is enabled,
68862 + a sysctl option with name "consistent_setxid" is created.
68863 +
68864 +config GRKERNSEC_HARDEN_IPC
68865 + bool "Disallow access to overly-permissive IPC objects"
68866 + default y if GRKERNSEC_CONFIG_AUTO
68867 + depends on SYSVIPC
68868 + help
68869 + If you say Y here, access to overly-permissive IPC objects (shared
68870 + memory, message queues, and semaphores) will be denied for processes
68871 + given the following criteria beyond normal permission checks:
68872 + 1) If the IPC object is world-accessible and the euid doesn't match
68873 + that of the creator or current uid for the IPC object
68874 + 2) If the IPC object is group-accessible and the egid doesn't
68875 + match that of the creator or current gid for the IPC object
68876 + It's a common error to grant too much permission to these objects,
68877 + with impact ranging from denial of service and information leaking to
68878 + privilege escalation. This feature was developed in response to
68879 + research by Tim Brown:
68880 + http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
68881 + who found hundreds of such insecure usages. Processes with
68882 + CAP_IPC_OWNER are still permitted to access these IPC objects.
68883 + If the sysctl option is enabled, a sysctl option with name
68884 + "harden_ipc" is created.
68885 +
68886 +config GRKERNSEC_TPE
68887 + bool "Trusted Path Execution (TPE)"
68888 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68889 + help
68890 + If you say Y here, you will be able to choose a gid to add to the
68891 + supplementary groups of users you want to mark as "untrusted."
68892 + These users will not be able to execute any files that are not in
68893 + root-owned directories writable only by root. If the sysctl option
68894 + is enabled, a sysctl option with name "tpe" is created.
68895 +
68896 +config GRKERNSEC_TPE_ALL
68897 + bool "Partially restrict all non-root users"
68898 + depends on GRKERNSEC_TPE
68899 + help
68900 + If you say Y here, all non-root users will be covered under
68901 + a weaker TPE restriction. This is separate from, and in addition to,
68902 + the main TPE options that you have selected elsewhere. Thus, if a
68903 + "trusted" GID is chosen, this restriction applies to even that GID.
68904 + Under this restriction, all non-root users will only be allowed to
68905 + execute files in directories they own that are not group or
68906 + world-writable, or in directories owned by root and writable only by
68907 + root. If the sysctl option is enabled, a sysctl option with name
68908 + "tpe_restrict_all" is created.
68909 +
68910 +config GRKERNSEC_TPE_INVERT
68911 + bool "Invert GID option"
68912 + depends on GRKERNSEC_TPE
68913 + help
68914 + If you say Y here, the group you specify in the TPE configuration will
68915 + decide what group TPE restrictions will be *disabled* for. This
68916 + option is useful if you want TPE restrictions to be applied to most
68917 + users on the system. If the sysctl option is enabled, a sysctl option
68918 + with name "tpe_invert" is created. Unlike other sysctl options, this
68919 + entry will default to on for backward-compatibility.
68920 +
68921 +config GRKERNSEC_TPE_GID
68922 + int
68923 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
68924 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
68925 +
68926 +config GRKERNSEC_TPE_UNTRUSTED_GID
68927 + int "GID for TPE-untrusted users"
68928 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
68929 + default 1005
68930 + help
68931 + Setting this GID determines what group TPE restrictions will be
68932 + *enabled* for. If the sysctl option is enabled, a sysctl option
68933 + with name "tpe_gid" is created.
68934 +
68935 +config GRKERNSEC_TPE_TRUSTED_GID
68936 + int "GID for TPE-trusted users"
68937 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
68938 + default 1005
68939 + help
68940 + Setting this GID determines what group TPE restrictions will be
68941 + *disabled* for. If the sysctl option is enabled, a sysctl option
68942 + with name "tpe_gid" is created.
68943 +
68944 +endmenu
68945 +menu "Network Protections"
68946 +depends on GRKERNSEC
68947 +
68948 +config GRKERNSEC_BLACKHOLE
68949 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
68950 + default y if GRKERNSEC_CONFIG_AUTO
68951 + depends on NET
68952 + help
68953 + If you say Y here, neither TCP resets nor ICMP
68954 + destination-unreachable packets will be sent in response to packets
68955 + sent to ports for which no associated listening process exists.
68956 + It will also prevent the sending of ICMP protocol unreachable packets
68957 + in response to packets with unknown protocols.
68958 + This feature supports both IPV4 and IPV6 and exempts the
68959 + loopback interface from blackholing. Enabling this feature
68960 + makes a host more resilient to DoS attacks and reduces network
68961 + visibility against scanners.
68962 +
68963 + The blackhole feature as-implemented is equivalent to the FreeBSD
68964 + blackhole feature, as it prevents RST responses to all packets, not
68965 + just SYNs. Under most application behavior this causes no
68966 + problems, but applications (like haproxy) may not close certain
68967 + connections in a way that cleanly terminates them on the remote
68968 + end, leaving the remote host in LAST_ACK state. Because of this
68969 + side-effect and to prevent intentional LAST_ACK DoSes, this
68970 + feature also adds automatic mitigation against such attacks.
68971 + The mitigation drastically reduces the amount of time a socket
68972 + can spend in LAST_ACK state. If you're using haproxy and not
68973 + all servers it connects to have this option enabled, consider
68974 + disabling this feature on the haproxy host.
68975 +
68976 + If the sysctl option is enabled, two sysctl options with names
68977 + "ip_blackhole" and "lastack_retries" will be created.
68978 + While "ip_blackhole" takes the standard zero/non-zero on/off
68979 + toggle, "lastack_retries" uses the same kinds of values as
68980 + "tcp_retries1" and "tcp_retries2". The default value of 4
68981 + prevents a socket from lasting more than 45 seconds in LAST_ACK
68982 + state.
68983 +
68984 +config GRKERNSEC_NO_SIMULT_CONNECT
68985 + bool "Disable TCP Simultaneous Connect"
68986 + default y if GRKERNSEC_CONFIG_AUTO
68987 + depends on NET
68988 + help
68989 + If you say Y here, a feature by Willy Tarreau will be enabled that
68990 + removes a weakness in Linux's strict implementation of TCP that
68991 + allows two clients to connect to each other without either entering
68992 + a listening state. The weakness allows an attacker to easily prevent
68993 + a client from connecting to a known server provided the source port
68994 + for the connection is guessed correctly.
68995 +
68996 + As the weakness could be used to prevent an antivirus or IPS from
68997 + fetching updates, or prevent an SSL gateway from fetching a CRL,
68998 + it should be eliminated by enabling this option. Though Linux is
68999 + one of few operating systems supporting simultaneous connect, it
69000 + has no legitimate use in practice and is rarely supported by firewalls.
69001 +
69002 +config GRKERNSEC_SOCKET
69003 + bool "Socket restrictions"
69004 + depends on NET
69005 + help
69006 + If you say Y here, you will be able to choose from several options.
69007 + If you assign a GID on your system and add it to the supplementary
69008 + groups of users you want to restrict socket access to, this patch
69009 + will perform up to three things, based on the option(s) you choose.
69010 +
69011 +config GRKERNSEC_SOCKET_ALL
69012 + bool "Deny any sockets to group"
69013 + depends on GRKERNSEC_SOCKET
69014 + help
69015 + If you say Y here, you will be able to choose a GID of whose users will
69016 + be unable to connect to other hosts from your machine or run server
69017 + applications from your machine. If the sysctl option is enabled, a
69018 + sysctl option with name "socket_all" is created.
69019 +
69020 +config GRKERNSEC_SOCKET_ALL_GID
69021 + int "GID to deny all sockets for"
69022 + depends on GRKERNSEC_SOCKET_ALL
69023 + default 1004
69024 + help
69025 + Here you can choose the GID to disable socket access for. Remember to
69026 + add the users you want socket access disabled for to the GID
69027 + specified here. If the sysctl option is enabled, a sysctl option
69028 + with name "socket_all_gid" is created.
69029 +
69030 +config GRKERNSEC_SOCKET_CLIENT
69031 + bool "Deny client sockets to group"
69032 + depends on GRKERNSEC_SOCKET
69033 + help
69034 + If you say Y here, you will be able to choose a GID of whose users will
69035 + be unable to connect to other hosts from your machine, but will be
69036 + able to run servers. If this option is enabled, all users in the group
69037 + you specify will have to use passive mode when initiating ftp transfers
69038 + from the shell on your machine. If the sysctl option is enabled, a
69039 + sysctl option with name "socket_client" is created.
69040 +
69041 +config GRKERNSEC_SOCKET_CLIENT_GID
69042 + int "GID to deny client sockets for"
69043 + depends on GRKERNSEC_SOCKET_CLIENT
69044 + default 1003
69045 + help
69046 + Here you can choose the GID to disable client socket access for.
69047 + Remember to add the users you want client socket access disabled for to
69048 + the GID specified here. If the sysctl option is enabled, a sysctl
69049 + option with name "socket_client_gid" is created.
69050 +
69051 +config GRKERNSEC_SOCKET_SERVER
69052 + bool "Deny server sockets to group"
69053 + depends on GRKERNSEC_SOCKET
69054 + help
69055 + If you say Y here, you will be able to choose a GID of whose users will
69056 + be unable to run server applications from your machine. If the sysctl
69057 + option is enabled, a sysctl option with name "socket_server" is created.
69058 +
69059 +config GRKERNSEC_SOCKET_SERVER_GID
69060 + int "GID to deny server sockets for"
69061 + depends on GRKERNSEC_SOCKET_SERVER
69062 + default 1002
69063 + help
69064 + Here you can choose the GID to disable server socket access for.
69065 + Remember to add the users you want server socket access disabled for to
69066 + the GID specified here. If the sysctl option is enabled, a sysctl
69067 + option with name "socket_server_gid" is created.
69068 +
69069 +endmenu
69070 +
69071 +menu "Physical Protections"
69072 +depends on GRKERNSEC
69073 +
69074 +config GRKERNSEC_DENYUSB
69075 + bool "Deny new USB connections after toggle"
69076 + default y if GRKERNSEC_CONFIG_AUTO
69077 + depends on SYSCTL && USB_SUPPORT
69078 + help
69079 + If you say Y here, a new sysctl option with name "deny_new_usb"
69080 + will be created. Setting its value to 1 will prevent any new
69081 + USB devices from being recognized by the OS. Any attempted USB
69082 + device insertion will be logged. This option is intended to be
69083 + used against custom USB devices designed to exploit vulnerabilities
69084 + in various USB device drivers.
69085 +
69086 + For greatest effectiveness, this sysctl should be set after any
69087 + relevant init scripts. This option is safe to enable in distros
69088 + as each user can choose whether or not to toggle the sysctl.
69089 +
69090 +config GRKERNSEC_DENYUSB_FORCE
69091 + bool "Reject all USB devices not connected at boot"
69092 + select USB
69093 + depends on GRKERNSEC_DENYUSB
69094 + help
69095 + If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69096 + that doesn't involve a sysctl entry. This option should only be
69097 + enabled if you're sure you want to deny all new USB connections
69098 + at runtime and don't want to modify init scripts. This should not
69099 + be enabled by distros. It forces the core USB code to be built
69100 + into the kernel image so that all devices connected at boot time
69101 + can be recognized and new USB device connections can be prevented
69102 + prior to init running.
69103 +
69104 +endmenu
69105 +
69106 +menu "Sysctl Support"
69107 +depends on GRKERNSEC && SYSCTL
69108 +
69109 +config GRKERNSEC_SYSCTL
69110 + bool "Sysctl support"
69111 + default y if GRKERNSEC_CONFIG_AUTO
69112 + help
69113 + If you say Y here, you will be able to change the options that
69114 + grsecurity runs with at bootup, without having to recompile your
69115 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69116 + to enable (1) or disable (0) various features. All the sysctl entries
69117 + are mutable until the "grsec_lock" entry is set to a non-zero value.
69118 + All features enabled in the kernel configuration are disabled at boot
69119 + if you do not say Y to the "Turn on features by default" option.
69120 + All options should be set at startup, and the grsec_lock entry should
69121 + be set to a non-zero value after all the options are set.
69122 + *THIS IS EXTREMELY IMPORTANT*
69123 +
69124 +config GRKERNSEC_SYSCTL_DISTRO
69125 + bool "Extra sysctl support for distro makers (READ HELP)"
69126 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69127 + help
69128 + If you say Y here, additional sysctl options will be created
69129 + for features that affect processes running as root. Therefore,
69130 + it is critical when using this option that the grsec_lock entry be
69131 + enabled after boot. Only distros with prebuilt kernel packages
69132 + with this option enabled that can ensure grsec_lock is enabled
69133 + after boot should use this option.
69134 + *Failure to set grsec_lock after boot makes all grsec features
69135 + this option covers useless*
69136 +
69137 + Currently this option creates the following sysctl entries:
69138 + "Disable Privileged I/O": "disable_priv_io"
69139 +
69140 +config GRKERNSEC_SYSCTL_ON
69141 + bool "Turn on features by default"
69142 + default y if GRKERNSEC_CONFIG_AUTO
69143 + depends on GRKERNSEC_SYSCTL
69144 + help
69145 + If you say Y here, instead of having all features enabled in the
69146 + kernel configuration disabled at boot time, the features will be
69147 + enabled at boot time. It is recommended you say Y here unless
69148 + there is some reason you would want all sysctl-tunable features to
69149 + be disabled by default. As mentioned elsewhere, it is important
69150 + to enable the grsec_lock entry once you have finished modifying
69151 + the sysctl entries.
69152 +
69153 +endmenu
69154 +menu "Logging Options"
69155 +depends on GRKERNSEC
69156 +
69157 +config GRKERNSEC_FLOODTIME
69158 + int "Seconds in between log messages (minimum)"
69159 + default 10
69160 + help
69161 + This option allows you to enforce the number of seconds between
69162 + grsecurity log messages. The default should be suitable for most
69163 + people, however, if you choose to change it, choose a value small enough
69164 + to allow informative logs to be produced, but large enough to
69165 + prevent flooding.
69166 +
69167 + Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69168 + any rate limiting on grsecurity log messages.
69169 +
69170 +config GRKERNSEC_FLOODBURST
69171 + int "Number of messages in a burst (maximum)"
69172 + default 6
69173 + help
69174 + This option allows you to choose the maximum number of messages allowed
69175 + within the flood time interval you chose in a separate option. The
69176 + default should be suitable for most people, however if you find that
69177 + many of your logs are being interpreted as flooding, you may want to
69178 + raise this value.
69179 +
69180 + Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69181 + any rate limiting on grsecurity log messages.
69182 +
69183 +endmenu
69184 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69185 new file mode 100644
69186 index 0000000..30ababb
69187 --- /dev/null
69188 +++ b/grsecurity/Makefile
69189 @@ -0,0 +1,54 @@
69190 +# grsecurity – access control and security hardening for Linux
69191 +# All code in this directory and various hooks located throughout the Linux kernel are
69192 +# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69193 +# http://www.grsecurity.net spender@grsecurity.net
69194 +#
69195 +# This program is free software; you can redistribute it and/or
69196 +# modify it under the terms of the GNU General Public License version 2
69197 +# as published by the Free Software Foundation.
69198 +#
69199 +# This program is distributed in the hope that it will be useful,
69200 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
69201 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69202 +# GNU General Public License for more details.
69203 +#
69204 +# You should have received a copy of the GNU General Public License
69205 +# along with this program; if not, write to the Free Software
69206 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69207 +
69208 +KBUILD_CFLAGS += -Werror
69209 +
69210 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69211 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
69212 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69213 + grsec_usb.o grsec_ipc.o grsec_proc.o
69214 +
69215 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69216 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69217 + gracl_learn.o grsec_log.o gracl_policy.o
69218 +ifdef CONFIG_COMPAT
69219 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69220 +endif
69221 +
69222 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69223 +
69224 +ifdef CONFIG_NET
69225 +obj-y += grsec_sock.o
69226 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69227 +endif
69228 +
69229 +ifndef CONFIG_GRKERNSEC
69230 +obj-y += grsec_disabled.o
69231 +endif
69232 +
69233 +ifdef CONFIG_GRKERNSEC_HIDESYM
69234 +extra-y := grsec_hidesym.o
69235 +$(obj)/grsec_hidesym.o:
69236 + @-chmod -f 500 /boot
69237 + @-chmod -f 500 /lib/modules
69238 + @-chmod -f 500 /lib64/modules
69239 + @-chmod -f 500 /lib32/modules
69240 + @-chmod -f 700 .
69241 + @-chmod -f 700 $(objtree)
69242 + @echo ' grsec: protected kernel image paths'
69243 +endif
69244 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69245 new file mode 100644
69246 index 0000000..6ae3aa0
69247 --- /dev/null
69248 +++ b/grsecurity/gracl.c
69249 @@ -0,0 +1,2703 @@
69250 +#include <linux/kernel.h>
69251 +#include <linux/module.h>
69252 +#include <linux/sched.h>
69253 +#include <linux/mm.h>
69254 +#include <linux/file.h>
69255 +#include <linux/fs.h>
69256 +#include <linux/namei.h>
69257 +#include <linux/mount.h>
69258 +#include <linux/tty.h>
69259 +#include <linux/proc_fs.h>
69260 +#include <linux/lglock.h>
69261 +#include <linux/slab.h>
69262 +#include <linux/vmalloc.h>
69263 +#include <linux/types.h>
69264 +#include <linux/sysctl.h>
69265 +#include <linux/netdevice.h>
69266 +#include <linux/ptrace.h>
69267 +#include <linux/gracl.h>
69268 +#include <linux/gralloc.h>
69269 +#include <linux/security.h>
69270 +#include <linux/grinternal.h>
69271 +#include <linux/pid_namespace.h>
69272 +#include <linux/stop_machine.h>
69273 +#include <linux/fdtable.h>
69274 +#include <linux/percpu.h>
69275 +#include <linux/lglock.h>
69276 +#include <linux/hugetlb.h>
69277 +#include <linux/posix-timers.h>
69278 +#include <linux/prefetch.h>
69279 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69280 +#include <linux/magic.h>
69281 +#include <linux/pagemap.h>
69282 +#include "../fs/btrfs/async-thread.h"
69283 +#include "../fs/btrfs/ctree.h"
69284 +#include "../fs/btrfs/btrfs_inode.h"
69285 +#endif
69286 +#include "../fs/mount.h"
69287 +
69288 +#include <asm/uaccess.h>
69289 +#include <asm/errno.h>
69290 +#include <asm/mman.h>
69291 +
69292 +#define FOR_EACH_ROLE_START(role) \
69293 + role = running_polstate.role_list; \
69294 + while (role) {
69295 +
69296 +#define FOR_EACH_ROLE_END(role) \
69297 + role = role->prev; \
69298 + }
69299 +
69300 +extern struct path gr_real_root;
69301 +
69302 +static struct gr_policy_state running_polstate;
69303 +struct gr_policy_state *polstate = &running_polstate;
69304 +extern struct gr_alloc_state *current_alloc_state;
69305 +
69306 +extern char *gr_shared_page[4];
69307 +DEFINE_RWLOCK(gr_inode_lock);
69308 +
69309 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
69310 +
69311 +#ifdef CONFIG_NET
69312 +extern struct vfsmount *sock_mnt;
69313 +#endif
69314 +
69315 +extern struct vfsmount *pipe_mnt;
69316 +extern struct vfsmount *shm_mnt;
69317 +
69318 +#ifdef CONFIG_HUGETLBFS
69319 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69320 +#endif
69321 +
69322 +extern u16 acl_sp_role_value;
69323 +extern struct acl_object_label *fakefs_obj_rw;
69324 +extern struct acl_object_label *fakefs_obj_rwx;
69325 +
69326 +int gr_acl_is_enabled(void)
69327 +{
69328 + return (gr_status & GR_READY);
69329 +}
69330 +
69331 +void gr_enable_rbac_system(void)
69332 +{
69333 + pax_open_kernel();
69334 + gr_status |= GR_READY;
69335 + pax_close_kernel();
69336 +}
69337 +
69338 +int gr_rbac_disable(void *unused)
69339 +{
69340 + pax_open_kernel();
69341 + gr_status &= ~GR_READY;
69342 + pax_close_kernel();
69343 +
69344 + return 0;
69345 +}
69346 +
69347 +static inline dev_t __get_dev(const struct dentry *dentry)
69348 +{
69349 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69350 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69351 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
69352 + else
69353 +#endif
69354 + return dentry->d_sb->s_dev;
69355 +}
69356 +
69357 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69358 +{
69359 + return __get_dev(dentry);
69360 +}
69361 +
69362 +static char gr_task_roletype_to_char(struct task_struct *task)
69363 +{
69364 + switch (task->role->roletype &
69365 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69366 + GR_ROLE_SPECIAL)) {
69367 + case GR_ROLE_DEFAULT:
69368 + return 'D';
69369 + case GR_ROLE_USER:
69370 + return 'U';
69371 + case GR_ROLE_GROUP:
69372 + return 'G';
69373 + case GR_ROLE_SPECIAL:
69374 + return 'S';
69375 + }
69376 +
69377 + return 'X';
69378 +}
69379 +
69380 +char gr_roletype_to_char(void)
69381 +{
69382 + return gr_task_roletype_to_char(current);
69383 +}
69384 +
69385 +__inline__ int
69386 +gr_acl_tpe_check(void)
69387 +{
69388 + if (unlikely(!(gr_status & GR_READY)))
69389 + return 0;
69390 + if (current->role->roletype & GR_ROLE_TPE)
69391 + return 1;
69392 + else
69393 + return 0;
69394 +}
69395 +
69396 +int
69397 +gr_handle_rawio(const struct inode *inode)
69398 +{
69399 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69400 + if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69401 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69402 + !capable(CAP_SYS_RAWIO))
69403 + return 1;
69404 +#endif
69405 + return 0;
69406 +}
69407 +
69408 +int
69409 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69410 +{
69411 + if (likely(lena != lenb))
69412 + return 0;
69413 +
69414 + return !memcmp(a, b, lena);
69415 +}
69416 +
69417 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69418 +{
69419 + *buflen -= namelen;
69420 + if (*buflen < 0)
69421 + return -ENAMETOOLONG;
69422 + *buffer -= namelen;
69423 + memcpy(*buffer, str, namelen);
69424 + return 0;
69425 +}
69426 +
69427 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69428 +{
69429 + return prepend(buffer, buflen, name->name, name->len);
69430 +}
69431 +
69432 +static int prepend_path(const struct path *path, struct path *root,
69433 + char **buffer, int *buflen)
69434 +{
69435 + struct dentry *dentry = path->dentry;
69436 + struct vfsmount *vfsmnt = path->mnt;
69437 + struct mount *mnt = real_mount(vfsmnt);
69438 + bool slash = false;
69439 + int error = 0;
69440 +
69441 + while (dentry != root->dentry || vfsmnt != root->mnt) {
69442 + struct dentry * parent;
69443 +
69444 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69445 + /* Global root? */
69446 + if (!mnt_has_parent(mnt)) {
69447 + goto out;
69448 + }
69449 + dentry = mnt->mnt_mountpoint;
69450 + mnt = mnt->mnt_parent;
69451 + vfsmnt = &mnt->mnt;
69452 + continue;
69453 + }
69454 + parent = dentry->d_parent;
69455 + prefetch(parent);
69456 + spin_lock(&dentry->d_lock);
69457 + error = prepend_name(buffer, buflen, &dentry->d_name);
69458 + spin_unlock(&dentry->d_lock);
69459 + if (!error)
69460 + error = prepend(buffer, buflen, "/", 1);
69461 + if (error)
69462 + break;
69463 +
69464 + slash = true;
69465 + dentry = parent;
69466 + }
69467 +
69468 +out:
69469 + if (!error && !slash)
69470 + error = prepend(buffer, buflen, "/", 1);
69471 +
69472 + return error;
69473 +}
69474 +
69475 +/* this must be called with mount_lock and rename_lock held */
69476 +
69477 +static char *__our_d_path(const struct path *path, struct path *root,
69478 + char *buf, int buflen)
69479 +{
69480 + char *res = buf + buflen;
69481 + int error;
69482 +
69483 + prepend(&res, &buflen, "\0", 1);
69484 + error = prepend_path(path, root, &res, &buflen);
69485 + if (error)
69486 + return ERR_PTR(error);
69487 +
69488 + return res;
69489 +}
69490 +
69491 +static char *
69492 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69493 +{
69494 + char *retval;
69495 +
69496 + retval = __our_d_path(path, root, buf, buflen);
69497 + if (unlikely(IS_ERR(retval)))
69498 + retval = strcpy(buf, "<path too long>");
69499 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69500 + retval[1] = '\0';
69501 +
69502 + return retval;
69503 +}
69504 +
69505 +static char *
69506 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69507 + char *buf, int buflen)
69508 +{
69509 + struct path path;
69510 + char *res;
69511 +
69512 + path.dentry = (struct dentry *)dentry;
69513 + path.mnt = (struct vfsmount *)vfsmnt;
69514 +
69515 + /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69516 + by the RBAC system */
69517 + res = gen_full_path(&path, &gr_real_root, buf, buflen);
69518 +
69519 + return res;
69520 +}
69521 +
69522 +static char *
69523 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69524 + char *buf, int buflen)
69525 +{
69526 + char *res;
69527 + struct path path;
69528 + struct path root;
69529 + struct task_struct *reaper = init_pid_ns.child_reaper;
69530 +
69531 + path.dentry = (struct dentry *)dentry;
69532 + path.mnt = (struct vfsmount *)vfsmnt;
69533 +
69534 + /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69535 + get_fs_root(reaper->fs, &root);
69536 +
69537 + read_seqlock_excl(&mount_lock);
69538 + write_seqlock(&rename_lock);
69539 + res = gen_full_path(&path, &root, buf, buflen);
69540 + write_sequnlock(&rename_lock);
69541 + read_sequnlock_excl(&mount_lock);
69542 +
69543 + path_put(&root);
69544 + return res;
69545 +}
69546 +
69547 +char *
69548 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69549 +{
69550 + char *ret;
69551 + read_seqlock_excl(&mount_lock);
69552 + write_seqlock(&rename_lock);
69553 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69554 + PAGE_SIZE);
69555 + write_sequnlock(&rename_lock);
69556 + read_sequnlock_excl(&mount_lock);
69557 + return ret;
69558 +}
69559 +
69560 +static char *
69561 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69562 +{
69563 + char *ret;
69564 + char *buf;
69565 + int buflen;
69566 +
69567 + read_seqlock_excl(&mount_lock);
69568 + write_seqlock(&rename_lock);
69569 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69570 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69571 + buflen = (int)(ret - buf);
69572 + if (buflen >= 5)
69573 + prepend(&ret, &buflen, "/proc", 5);
69574 + else
69575 + ret = strcpy(buf, "<path too long>");
69576 + write_sequnlock(&rename_lock);
69577 + read_sequnlock_excl(&mount_lock);
69578 + return ret;
69579 +}
69580 +
69581 +char *
69582 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69583 +{
69584 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69585 + PAGE_SIZE);
69586 +}
69587 +
69588 +char *
69589 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69590 +{
69591 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69592 + PAGE_SIZE);
69593 +}
69594 +
69595 +char *
69596 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69597 +{
69598 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69599 + PAGE_SIZE);
69600 +}
69601 +
69602 +char *
69603 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69604 +{
69605 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69606 + PAGE_SIZE);
69607 +}
69608 +
69609 +char *
69610 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69611 +{
69612 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69613 + PAGE_SIZE);
69614 +}
69615 +
69616 +__inline__ __u32
69617 +to_gr_audit(const __u32 reqmode)
69618 +{
69619 + /* masks off auditable permission flags, then shifts them to create
69620 + auditing flags, and adds the special case of append auditing if
69621 + we're requesting write */
69622 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69623 +}
69624 +
69625 +struct acl_role_label *
69626 +__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69627 + const gid_t gid)
69628 +{
69629 + unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69630 + struct acl_role_label *match;
69631 + struct role_allowed_ip *ipp;
69632 + unsigned int x;
69633 + u32 curr_ip = task->signal->saved_ip;
69634 +
69635 + match = state->acl_role_set.r_hash[index];
69636 +
69637 + while (match) {
69638 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69639 + for (x = 0; x < match->domain_child_num; x++) {
69640 + if (match->domain_children[x] == uid)
69641 + goto found;
69642 + }
69643 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69644 + break;
69645 + match = match->next;
69646 + }
69647 +found:
69648 + if (match == NULL) {
69649 + try_group:
69650 + index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69651 + match = state->acl_role_set.r_hash[index];
69652 +
69653 + while (match) {
69654 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69655 + for (x = 0; x < match->domain_child_num; x++) {
69656 + if (match->domain_children[x] == gid)
69657 + goto found2;
69658 + }
69659 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69660 + break;
69661 + match = match->next;
69662 + }
69663 +found2:
69664 + if (match == NULL)
69665 + match = state->default_role;
69666 + if (match->allowed_ips == NULL)
69667 + return match;
69668 + else {
69669 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69670 + if (likely
69671 + ((ntohl(curr_ip) & ipp->netmask) ==
69672 + (ntohl(ipp->addr) & ipp->netmask)))
69673 + return match;
69674 + }
69675 + match = state->default_role;
69676 + }
69677 + } else if (match->allowed_ips == NULL) {
69678 + return match;
69679 + } else {
69680 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69681 + if (likely
69682 + ((ntohl(curr_ip) & ipp->netmask) ==
69683 + (ntohl(ipp->addr) & ipp->netmask)))
69684 + return match;
69685 + }
69686 + goto try_group;
69687 + }
69688 +
69689 + return match;
69690 +}
69691 +
69692 +static struct acl_role_label *
69693 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69694 + const gid_t gid)
69695 +{
69696 + return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69697 +}
69698 +
69699 +struct acl_subject_label *
69700 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69701 + const struct acl_role_label *role)
69702 +{
69703 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69704 + struct acl_subject_label *match;
69705 +
69706 + match = role->subj_hash[index];
69707 +
69708 + while (match && (match->inode != ino || match->device != dev ||
69709 + (match->mode & GR_DELETED))) {
69710 + match = match->next;
69711 + }
69712 +
69713 + if (match && !(match->mode & GR_DELETED))
69714 + return match;
69715 + else
69716 + return NULL;
69717 +}
69718 +
69719 +struct acl_subject_label *
69720 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69721 + const struct acl_role_label *role)
69722 +{
69723 + unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69724 + struct acl_subject_label *match;
69725 +
69726 + match = role->subj_hash[index];
69727 +
69728 + while (match && (match->inode != ino || match->device != dev ||
69729 + !(match->mode & GR_DELETED))) {
69730 + match = match->next;
69731 + }
69732 +
69733 + if (match && (match->mode & GR_DELETED))
69734 + return match;
69735 + else
69736 + return NULL;
69737 +}
69738 +
69739 +static struct acl_object_label *
69740 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69741 + const struct acl_subject_label *subj)
69742 +{
69743 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69744 + struct acl_object_label *match;
69745 +
69746 + match = subj->obj_hash[index];
69747 +
69748 + while (match && (match->inode != ino || match->device != dev ||
69749 + (match->mode & GR_DELETED))) {
69750 + match = match->next;
69751 + }
69752 +
69753 + if (match && !(match->mode & GR_DELETED))
69754 + return match;
69755 + else
69756 + return NULL;
69757 +}
69758 +
69759 +static struct acl_object_label *
69760 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69761 + const struct acl_subject_label *subj)
69762 +{
69763 + unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69764 + struct acl_object_label *match;
69765 +
69766 + match = subj->obj_hash[index];
69767 +
69768 + while (match && (match->inode != ino || match->device != dev ||
69769 + !(match->mode & GR_DELETED))) {
69770 + match = match->next;
69771 + }
69772 +
69773 + if (match && (match->mode & GR_DELETED))
69774 + return match;
69775 +
69776 + match = subj->obj_hash[index];
69777 +
69778 + while (match && (match->inode != ino || match->device != dev ||
69779 + (match->mode & GR_DELETED))) {
69780 + match = match->next;
69781 + }
69782 +
69783 + if (match && !(match->mode & GR_DELETED))
69784 + return match;
69785 + else
69786 + return NULL;
69787 +}
69788 +
69789 +struct name_entry *
69790 +__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69791 +{
69792 + unsigned int len = strlen(name);
69793 + unsigned int key = full_name_hash(name, len);
69794 + unsigned int index = key % state->name_set.n_size;
69795 + struct name_entry *match;
69796 +
69797 + match = state->name_set.n_hash[index];
69798 +
69799 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69800 + match = match->next;
69801 +
69802 + return match;
69803 +}
69804 +
69805 +static struct name_entry *
69806 +lookup_name_entry(const char *name)
69807 +{
69808 + return __lookup_name_entry(&running_polstate, name);
69809 +}
69810 +
69811 +static struct name_entry *
69812 +lookup_name_entry_create(const char *name)
69813 +{
69814 + unsigned int len = strlen(name);
69815 + unsigned int key = full_name_hash(name, len);
69816 + unsigned int index = key % running_polstate.name_set.n_size;
69817 + struct name_entry *match;
69818 +
69819 + match = running_polstate.name_set.n_hash[index];
69820 +
69821 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69822 + !match->deleted))
69823 + match = match->next;
69824 +
69825 + if (match && match->deleted)
69826 + return match;
69827 +
69828 + match = running_polstate.name_set.n_hash[index];
69829 +
69830 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69831 + match->deleted))
69832 + match = match->next;
69833 +
69834 + if (match && !match->deleted)
69835 + return match;
69836 + else
69837 + return NULL;
69838 +}
69839 +
69840 +static struct inodev_entry *
69841 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
69842 +{
69843 + unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69844 + struct inodev_entry *match;
69845 +
69846 + match = running_polstate.inodev_set.i_hash[index];
69847 +
69848 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69849 + match = match->next;
69850 +
69851 + return match;
69852 +}
69853 +
69854 +void
69855 +__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69856 +{
69857 + unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69858 + state->inodev_set.i_size);
69859 + struct inodev_entry **curr;
69860 +
69861 + entry->prev = NULL;
69862 +
69863 + curr = &state->inodev_set.i_hash[index];
69864 + if (*curr != NULL)
69865 + (*curr)->prev = entry;
69866 +
69867 + entry->next = *curr;
69868 + *curr = entry;
69869 +
69870 + return;
69871 +}
69872 +
69873 +static void
69874 +insert_inodev_entry(struct inodev_entry *entry)
69875 +{
69876 + __insert_inodev_entry(&running_polstate, entry);
69877 +}
69878 +
69879 +void
69880 +insert_acl_obj_label(struct acl_object_label *obj,
69881 + struct acl_subject_label *subj)
69882 +{
69883 + unsigned int index =
69884 + gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
69885 + struct acl_object_label **curr;
69886 +
69887 + obj->prev = NULL;
69888 +
69889 + curr = &subj->obj_hash[index];
69890 + if (*curr != NULL)
69891 + (*curr)->prev = obj;
69892 +
69893 + obj->next = *curr;
69894 + *curr = obj;
69895 +
69896 + return;
69897 +}
69898 +
69899 +void
69900 +insert_acl_subj_label(struct acl_subject_label *obj,
69901 + struct acl_role_label *role)
69902 +{
69903 + unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
69904 + struct acl_subject_label **curr;
69905 +
69906 + obj->prev = NULL;
69907 +
69908 + curr = &role->subj_hash[index];
69909 + if (*curr != NULL)
69910 + (*curr)->prev = obj;
69911 +
69912 + obj->next = *curr;
69913 + *curr = obj;
69914 +
69915 + return;
69916 +}
69917 +
69918 +/* derived from glibc fnmatch() 0: match, 1: no match*/
69919 +
69920 +static int
69921 +glob_match(const char *p, const char *n)
69922 +{
69923 + char c;
69924 +
69925 + while ((c = *p++) != '\0') {
69926 + switch (c) {
69927 + case '?':
69928 + if (*n == '\0')
69929 + return 1;
69930 + else if (*n == '/')
69931 + return 1;
69932 + break;
69933 + case '\\':
69934 + if (*n != c)
69935 + return 1;
69936 + break;
69937 + case '*':
69938 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
69939 + if (*n == '/')
69940 + return 1;
69941 + else if (c == '?') {
69942 + if (*n == '\0')
69943 + return 1;
69944 + else
69945 + ++n;
69946 + }
69947 + }
69948 + if (c == '\0') {
69949 + return 0;
69950 + } else {
69951 + const char *endp;
69952 +
69953 + if ((endp = strchr(n, '/')) == NULL)
69954 + endp = n + strlen(n);
69955 +
69956 + if (c == '[') {
69957 + for (--p; n < endp; ++n)
69958 + if (!glob_match(p, n))
69959 + return 0;
69960 + } else if (c == '/') {
69961 + while (*n != '\0' && *n != '/')
69962 + ++n;
69963 + if (*n == '/' && !glob_match(p, n + 1))
69964 + return 0;
69965 + } else {
69966 + for (--p; n < endp; ++n)
69967 + if (*n == c && !glob_match(p, n))
69968 + return 0;
69969 + }
69970 +
69971 + return 1;
69972 + }
69973 + case '[':
69974 + {
69975 + int not;
69976 + char cold;
69977 +
69978 + if (*n == '\0' || *n == '/')
69979 + return 1;
69980 +
69981 + not = (*p == '!' || *p == '^');
69982 + if (not)
69983 + ++p;
69984 +
69985 + c = *p++;
69986 + for (;;) {
69987 + unsigned char fn = (unsigned char)*n;
69988 +
69989 + if (c == '\0')
69990 + return 1;
69991 + else {
69992 + if (c == fn)
69993 + goto matched;
69994 + cold = c;
69995 + c = *p++;
69996 +
69997 + if (c == '-' && *p != ']') {
69998 + unsigned char cend = *p++;
69999 +
70000 + if (cend == '\0')
70001 + return 1;
70002 +
70003 + if (cold <= fn && fn <= cend)
70004 + goto matched;
70005 +
70006 + c = *p++;
70007 + }
70008 + }
70009 +
70010 + if (c == ']')
70011 + break;
70012 + }
70013 + if (!not)
70014 + return 1;
70015 + break;
70016 + matched:
70017 + while (c != ']') {
70018 + if (c == '\0')
70019 + return 1;
70020 +
70021 + c = *p++;
70022 + }
70023 + if (not)
70024 + return 1;
70025 + }
70026 + break;
70027 + default:
70028 + if (c != *n)
70029 + return 1;
70030 + }
70031 +
70032 + ++n;
70033 + }
70034 +
70035 + if (*n == '\0')
70036 + return 0;
70037 +
70038 + if (*n == '/')
70039 + return 0;
70040 +
70041 + return 1;
70042 +}
70043 +
70044 +static struct acl_object_label *
70045 +chk_glob_label(struct acl_object_label *globbed,
70046 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
70047 +{
70048 + struct acl_object_label *tmp;
70049 +
70050 + if (*path == NULL)
70051 + *path = gr_to_filename_nolock(dentry, mnt);
70052 +
70053 + tmp = globbed;
70054 +
70055 + while (tmp) {
70056 + if (!glob_match(tmp->filename, *path))
70057 + return tmp;
70058 + tmp = tmp->next;
70059 + }
70060 +
70061 + return NULL;
70062 +}
70063 +
70064 +static struct acl_object_label *
70065 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70066 + const ino_t curr_ino, const dev_t curr_dev,
70067 + const struct acl_subject_label *subj, char **path, const int checkglob)
70068 +{
70069 + struct acl_subject_label *tmpsubj;
70070 + struct acl_object_label *retval;
70071 + struct acl_object_label *retval2;
70072 +
70073 + tmpsubj = (struct acl_subject_label *) subj;
70074 + read_lock(&gr_inode_lock);
70075 + do {
70076 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
70077 + if (retval) {
70078 + if (checkglob && retval->globbed) {
70079 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
70080 + if (retval2)
70081 + retval = retval2;
70082 + }
70083 + break;
70084 + }
70085 + } while ((tmpsubj = tmpsubj->parent_subject));
70086 + read_unlock(&gr_inode_lock);
70087 +
70088 + return retval;
70089 +}
70090 +
70091 +static __inline__ struct acl_object_label *
70092 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70093 + struct dentry *curr_dentry,
70094 + const struct acl_subject_label *subj, char **path, const int checkglob)
70095 +{
70096 + int newglob = checkglob;
70097 + ino_t inode;
70098 + dev_t device;
70099 +
70100 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70101 + as we don't want a / * rule to match instead of the / object
70102 + don't do this for create lookups that call this function though, since they're looking up
70103 + on the parent and thus need globbing checks on all paths
70104 + */
70105 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70106 + newglob = GR_NO_GLOB;
70107 +
70108 + spin_lock(&curr_dentry->d_lock);
70109 + inode = curr_dentry->d_inode->i_ino;
70110 + device = __get_dev(curr_dentry);
70111 + spin_unlock(&curr_dentry->d_lock);
70112 +
70113 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70114 +}
70115 +
70116 +#ifdef CONFIG_HUGETLBFS
70117 +static inline bool
70118 +is_hugetlbfs_mnt(const struct vfsmount *mnt)
70119 +{
70120 + int i;
70121 + for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70122 + if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70123 + return true;
70124 + }
70125 +
70126 + return false;
70127 +}
70128 +#endif
70129 +
70130 +static struct acl_object_label *
70131 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70132 + const struct acl_subject_label *subj, char *path, const int checkglob)
70133 +{
70134 + struct dentry *dentry = (struct dentry *) l_dentry;
70135 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70136 + struct mount *real_mnt = real_mount(mnt);
70137 + struct acl_object_label *retval;
70138 + struct dentry *parent;
70139 +
70140 + read_seqlock_excl(&mount_lock);
70141 + write_seqlock(&rename_lock);
70142 +
70143 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70144 +#ifdef CONFIG_NET
70145 + mnt == sock_mnt ||
70146 +#endif
70147 +#ifdef CONFIG_HUGETLBFS
70148 + (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70149 +#endif
70150 + /* ignore Eric Biederman */
70151 + IS_PRIVATE(l_dentry->d_inode))) {
70152 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70153 + goto out;
70154 + }
70155 +
70156 + for (;;) {
70157 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70158 + break;
70159 +
70160 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70161 + if (!mnt_has_parent(real_mnt))
70162 + break;
70163 +
70164 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70165 + if (retval != NULL)
70166 + goto out;
70167 +
70168 + dentry = real_mnt->mnt_mountpoint;
70169 + real_mnt = real_mnt->mnt_parent;
70170 + mnt = &real_mnt->mnt;
70171 + continue;
70172 + }
70173 +
70174 + parent = dentry->d_parent;
70175 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70176 + if (retval != NULL)
70177 + goto out;
70178 +
70179 + dentry = parent;
70180 + }
70181 +
70182 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70183 +
70184 + /* gr_real_root is pinned so we don't have to hold a reference */
70185 + if (retval == NULL)
70186 + retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70187 +out:
70188 + write_sequnlock(&rename_lock);
70189 + read_sequnlock_excl(&mount_lock);
70190 +
70191 + BUG_ON(retval == NULL);
70192 +
70193 + return retval;
70194 +}
70195 +
70196 +static __inline__ struct acl_object_label *
70197 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70198 + const struct acl_subject_label *subj)
70199 +{
70200 + char *path = NULL;
70201 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70202 +}
70203 +
70204 +static __inline__ struct acl_object_label *
70205 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70206 + const struct acl_subject_label *subj)
70207 +{
70208 + char *path = NULL;
70209 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70210 +}
70211 +
70212 +static __inline__ struct acl_object_label *
70213 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70214 + const struct acl_subject_label *subj, char *path)
70215 +{
70216 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70217 +}
70218 +
70219 +struct acl_subject_label *
70220 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70221 + const struct acl_role_label *role)
70222 +{
70223 + struct dentry *dentry = (struct dentry *) l_dentry;
70224 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70225 + struct mount *real_mnt = real_mount(mnt);
70226 + struct acl_subject_label *retval;
70227 + struct dentry *parent;
70228 +
70229 + read_seqlock_excl(&mount_lock);
70230 + write_seqlock(&rename_lock);
70231 +
70232 + for (;;) {
70233 + if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70234 + break;
70235 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70236 + if (!mnt_has_parent(real_mnt))
70237 + break;
70238 +
70239 + spin_lock(&dentry->d_lock);
70240 + read_lock(&gr_inode_lock);
70241 + retval =
70242 + lookup_acl_subj_label(dentry->d_inode->i_ino,
70243 + __get_dev(dentry), role);
70244 + read_unlock(&gr_inode_lock);
70245 + spin_unlock(&dentry->d_lock);
70246 + if (retval != NULL)
70247 + goto out;
70248 +
70249 + dentry = real_mnt->mnt_mountpoint;
70250 + real_mnt = real_mnt->mnt_parent;
70251 + mnt = &real_mnt->mnt;
70252 + continue;
70253 + }
70254 +
70255 + spin_lock(&dentry->d_lock);
70256 + read_lock(&gr_inode_lock);
70257 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70258 + __get_dev(dentry), role);
70259 + read_unlock(&gr_inode_lock);
70260 + parent = dentry->d_parent;
70261 + spin_unlock(&dentry->d_lock);
70262 +
70263 + if (retval != NULL)
70264 + goto out;
70265 +
70266 + dentry = parent;
70267 + }
70268 +
70269 + spin_lock(&dentry->d_lock);
70270 + read_lock(&gr_inode_lock);
70271 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70272 + __get_dev(dentry), role);
70273 + read_unlock(&gr_inode_lock);
70274 + spin_unlock(&dentry->d_lock);
70275 +
70276 + if (unlikely(retval == NULL)) {
70277 + /* gr_real_root is pinned, we don't need to hold a reference */
70278 + read_lock(&gr_inode_lock);
70279 + retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70280 + __get_dev(gr_real_root.dentry), role);
70281 + read_unlock(&gr_inode_lock);
70282 + }
70283 +out:
70284 + write_sequnlock(&rename_lock);
70285 + read_sequnlock_excl(&mount_lock);
70286 +
70287 + BUG_ON(retval == NULL);
70288 +
70289 + return retval;
70290 +}
70291 +
70292 +void
70293 +assign_special_role(const char *rolename)
70294 +{
70295 + struct acl_object_label *obj;
70296 + struct acl_role_label *r;
70297 + struct acl_role_label *assigned = NULL;
70298 + struct task_struct *tsk;
70299 + struct file *filp;
70300 +
70301 + FOR_EACH_ROLE_START(r)
70302 + if (!strcmp(rolename, r->rolename) &&
70303 + (r->roletype & GR_ROLE_SPECIAL)) {
70304 + assigned = r;
70305 + break;
70306 + }
70307 + FOR_EACH_ROLE_END(r)
70308 +
70309 + if (!assigned)
70310 + return;
70311 +
70312 + read_lock(&tasklist_lock);
70313 + read_lock(&grsec_exec_file_lock);
70314 +
70315 + tsk = current->real_parent;
70316 + if (tsk == NULL)
70317 + goto out_unlock;
70318 +
70319 + filp = tsk->exec_file;
70320 + if (filp == NULL)
70321 + goto out_unlock;
70322 +
70323 + tsk->is_writable = 0;
70324 + tsk->inherited = 0;
70325 +
70326 + tsk->acl_sp_role = 1;
70327 + tsk->acl_role_id = ++acl_sp_role_value;
70328 + tsk->role = assigned;
70329 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70330 +
70331 + /* ignore additional mmap checks for processes that are writable
70332 + by the default ACL */
70333 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70334 + if (unlikely(obj->mode & GR_WRITE))
70335 + tsk->is_writable = 1;
70336 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70337 + if (unlikely(obj->mode & GR_WRITE))
70338 + tsk->is_writable = 1;
70339 +
70340 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70341 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70342 + tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70343 +#endif
70344 +
70345 +out_unlock:
70346 + read_unlock(&grsec_exec_file_lock);
70347 + read_unlock(&tasklist_lock);
70348 + return;
70349 +}
70350 +
70351 +
70352 +static void
70353 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70354 +{
70355 + struct task_struct *task = current;
70356 + const struct cred *cred = current_cred();
70357 +
70358 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70359 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70360 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70361 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70362 +
70363 + return;
70364 +}
70365 +
70366 +static void
70367 +gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70368 +{
70369 + struct task_struct *task = current;
70370 + const struct cred *cred = current_cred();
70371 +
70372 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70373 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70374 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70375 + 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70376 +
70377 + return;
70378 +}
70379 +
70380 +static void
70381 +gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70382 +{
70383 + struct task_struct *task = current;
70384 + const struct cred *cred = current_cred();
70385 +
70386 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70387 + GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70388 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70389 + 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70390 +
70391 + return;
70392 +}
70393 +
70394 +static void
70395 +gr_set_proc_res(struct task_struct *task)
70396 +{
70397 + struct acl_subject_label *proc;
70398 + unsigned short i;
70399 +
70400 + proc = task->acl;
70401 +
70402 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70403 + return;
70404 +
70405 + for (i = 0; i < RLIM_NLIMITS; i++) {
70406 + if (!(proc->resmask & (1U << i)))
70407 + continue;
70408 +
70409 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70410 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70411 +
70412 + if (i == RLIMIT_CPU)
70413 + update_rlimit_cpu(task, proc->res[i].rlim_cur);
70414 + }
70415 +
70416 + return;
70417 +}
70418 +
70419 +/* both of the below must be called with
70420 + rcu_read_lock();
70421 + read_lock(&tasklist_lock);
70422 + read_lock(&grsec_exec_file_lock);
70423 +*/
70424 +
70425 +struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
70426 +{
70427 + char *tmpname;
70428 + struct acl_subject_label *tmpsubj;
70429 + struct file *filp;
70430 + struct name_entry *nmatch;
70431 +
70432 + filp = task->exec_file;
70433 + if (filp == NULL)
70434 + return NULL;
70435 +
70436 + /* the following is to apply the correct subject
70437 + on binaries running when the RBAC system
70438 + is enabled, when the binaries have been
70439 + replaced or deleted since their execution
70440 + -----
70441 + when the RBAC system starts, the inode/dev
70442 + from exec_file will be one the RBAC system
70443 + is unaware of. It only knows the inode/dev
70444 + of the present file on disk, or the absence
70445 + of it.
70446 + */
70447 +
70448 + if (filename)
70449 + nmatch = __lookup_name_entry(state, filename);
70450 + else {
70451 + preempt_disable();
70452 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70453 +
70454 + nmatch = __lookup_name_entry(state, tmpname);
70455 + preempt_enable();
70456 + }
70457 + tmpsubj = NULL;
70458 + if (nmatch) {
70459 + if (nmatch->deleted)
70460 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70461 + else
70462 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70463 + }
70464 + /* this also works for the reload case -- if we don't match a potentially inherited subject
70465 + then we fall back to a normal lookup based on the binary's ino/dev
70466 + */
70467 + if (tmpsubj == NULL)
70468 + tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70469 +
70470 + return tmpsubj;
70471 +}
70472 +
70473 +static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
70474 +{
70475 + return __gr_get_subject_for_task(&running_polstate, task, filename);
70476 +}
70477 +
70478 +void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70479 +{
70480 + struct acl_object_label *obj;
70481 + struct file *filp;
70482 +
70483 + filp = task->exec_file;
70484 +
70485 + task->acl = subj;
70486 + task->is_writable = 0;
70487 + /* ignore additional mmap checks for processes that are writable
70488 + by the default ACL */
70489 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70490 + if (unlikely(obj->mode & GR_WRITE))
70491 + task->is_writable = 1;
70492 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70493 + if (unlikely(obj->mode & GR_WRITE))
70494 + task->is_writable = 1;
70495 +
70496 + gr_set_proc_res(task);
70497 +
70498 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70499 + 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);
70500 +#endif
70501 +}
70502 +
70503 +static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70504 +{
70505 + __gr_apply_subject_to_task(&running_polstate, task, subj);
70506 +}
70507 +
70508 +__u32
70509 +gr_search_file(const struct dentry * dentry, const __u32 mode,
70510 + const struct vfsmount * mnt)
70511 +{
70512 + __u32 retval = mode;
70513 + struct acl_subject_label *curracl;
70514 + struct acl_object_label *currobj;
70515 +
70516 + if (unlikely(!(gr_status & GR_READY)))
70517 + return (mode & ~GR_AUDITS);
70518 +
70519 + curracl = current->acl;
70520 +
70521 + currobj = chk_obj_label(dentry, mnt, curracl);
70522 + retval = currobj->mode & mode;
70523 +
70524 + /* if we're opening a specified transfer file for writing
70525 + (e.g. /dev/initctl), then transfer our role to init
70526 + */
70527 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70528 + current->role->roletype & GR_ROLE_PERSIST)) {
70529 + struct task_struct *task = init_pid_ns.child_reaper;
70530 +
70531 + if (task->role != current->role) {
70532 + struct acl_subject_label *subj;
70533 +
70534 + task->acl_sp_role = 0;
70535 + task->acl_role_id = current->acl_role_id;
70536 + task->role = current->role;
70537 + rcu_read_lock();
70538 + read_lock(&grsec_exec_file_lock);
70539 + subj = gr_get_subject_for_task(task, NULL);
70540 + gr_apply_subject_to_task(task, subj);
70541 + read_unlock(&grsec_exec_file_lock);
70542 + rcu_read_unlock();
70543 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70544 + }
70545 + }
70546 +
70547 + if (unlikely
70548 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70549 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70550 + __u32 new_mode = mode;
70551 +
70552 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70553 +
70554 + retval = new_mode;
70555 +
70556 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70557 + new_mode |= GR_INHERIT;
70558 +
70559 + if (!(mode & GR_NOLEARN))
70560 + gr_log_learn(dentry, mnt, new_mode);
70561 + }
70562 +
70563 + return retval;
70564 +}
70565 +
70566 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70567 + const struct dentry *parent,
70568 + const struct vfsmount *mnt)
70569 +{
70570 + struct name_entry *match;
70571 + struct acl_object_label *matchpo;
70572 + struct acl_subject_label *curracl;
70573 + char *path;
70574 +
70575 + if (unlikely(!(gr_status & GR_READY)))
70576 + return NULL;
70577 +
70578 + preempt_disable();
70579 + path = gr_to_filename_rbac(new_dentry, mnt);
70580 + match = lookup_name_entry_create(path);
70581 +
70582 + curracl = current->acl;
70583 +
70584 + if (match) {
70585 + read_lock(&gr_inode_lock);
70586 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70587 + read_unlock(&gr_inode_lock);
70588 +
70589 + if (matchpo) {
70590 + preempt_enable();
70591 + return matchpo;
70592 + }
70593 + }
70594 +
70595 + // lookup parent
70596 +
70597 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70598 +
70599 + preempt_enable();
70600 + return matchpo;
70601 +}
70602 +
70603 +__u32
70604 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70605 + const struct vfsmount * mnt, const __u32 mode)
70606 +{
70607 + struct acl_object_label *matchpo;
70608 + __u32 retval;
70609 +
70610 + if (unlikely(!(gr_status & GR_READY)))
70611 + return (mode & ~GR_AUDITS);
70612 +
70613 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
70614 +
70615 + retval = matchpo->mode & mode;
70616 +
70617 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70618 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70619 + __u32 new_mode = mode;
70620 +
70621 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70622 +
70623 + gr_log_learn(new_dentry, mnt, new_mode);
70624 + return new_mode;
70625 + }
70626 +
70627 + return retval;
70628 +}
70629 +
70630 +__u32
70631 +gr_check_link(const struct dentry * new_dentry,
70632 + const struct dentry * parent_dentry,
70633 + const struct vfsmount * parent_mnt,
70634 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70635 +{
70636 + struct acl_object_label *obj;
70637 + __u32 oldmode, newmode;
70638 + __u32 needmode;
70639 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70640 + GR_DELETE | GR_INHERIT;
70641 +
70642 + if (unlikely(!(gr_status & GR_READY)))
70643 + return (GR_CREATE | GR_LINK);
70644 +
70645 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70646 + oldmode = obj->mode;
70647 +
70648 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70649 + newmode = obj->mode;
70650 +
70651 + needmode = newmode & checkmodes;
70652 +
70653 + // old name for hardlink must have at least the permissions of the new name
70654 + if ((oldmode & needmode) != needmode)
70655 + goto bad;
70656 +
70657 + // if old name had restrictions/auditing, make sure the new name does as well
70658 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70659 +
70660 + // don't allow hardlinking of suid/sgid/fcapped files without permission
70661 + if (is_privileged_binary(old_dentry))
70662 + needmode |= GR_SETID;
70663 +
70664 + if ((newmode & needmode) != needmode)
70665 + goto bad;
70666 +
70667 + // enforce minimum permissions
70668 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70669 + return newmode;
70670 +bad:
70671 + needmode = oldmode;
70672 + if (is_privileged_binary(old_dentry))
70673 + needmode |= GR_SETID;
70674 +
70675 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70676 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70677 + return (GR_CREATE | GR_LINK);
70678 + } else if (newmode & GR_SUPPRESS)
70679 + return GR_SUPPRESS;
70680 + else
70681 + return 0;
70682 +}
70683 +
70684 +int
70685 +gr_check_hidden_task(const struct task_struct *task)
70686 +{
70687 + if (unlikely(!(gr_status & GR_READY)))
70688 + return 0;
70689 +
70690 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70691 + return 1;
70692 +
70693 + return 0;
70694 +}
70695 +
70696 +int
70697 +gr_check_protected_task(const struct task_struct *task)
70698 +{
70699 + if (unlikely(!(gr_status & GR_READY) || !task))
70700 + return 0;
70701 +
70702 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70703 + task->acl != current->acl)
70704 + return 1;
70705 +
70706 + return 0;
70707 +}
70708 +
70709 +int
70710 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70711 +{
70712 + struct task_struct *p;
70713 + int ret = 0;
70714 +
70715 + if (unlikely(!(gr_status & GR_READY) || !pid))
70716 + return ret;
70717 +
70718 + read_lock(&tasklist_lock);
70719 + do_each_pid_task(pid, type, p) {
70720 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70721 + p->acl != current->acl) {
70722 + ret = 1;
70723 + goto out;
70724 + }
70725 + } while_each_pid_task(pid, type, p);
70726 +out:
70727 + read_unlock(&tasklist_lock);
70728 +
70729 + return ret;
70730 +}
70731 +
70732 +void
70733 +gr_copy_label(struct task_struct *tsk)
70734 +{
70735 + struct task_struct *p = current;
70736 +
70737 + tsk->inherited = p->inherited;
70738 + tsk->acl_sp_role = 0;
70739 + tsk->acl_role_id = p->acl_role_id;
70740 + tsk->acl = p->acl;
70741 + tsk->role = p->role;
70742 + tsk->signal->used_accept = 0;
70743 + tsk->signal->curr_ip = p->signal->curr_ip;
70744 + tsk->signal->saved_ip = p->signal->saved_ip;
70745 + if (p->exec_file)
70746 + get_file(p->exec_file);
70747 + tsk->exec_file = p->exec_file;
70748 + tsk->is_writable = p->is_writable;
70749 + if (unlikely(p->signal->used_accept)) {
70750 + p->signal->curr_ip = 0;
70751 + p->signal->saved_ip = 0;
70752 + }
70753 +
70754 + return;
70755 +}
70756 +
70757 +extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70758 +
70759 +int
70760 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70761 +{
70762 + unsigned int i;
70763 + __u16 num;
70764 + uid_t *uidlist;
70765 + uid_t curuid;
70766 + int realok = 0;
70767 + int effectiveok = 0;
70768 + int fsok = 0;
70769 + uid_t globalreal, globaleffective, globalfs;
70770 +
70771 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70772 + struct user_struct *user;
70773 +
70774 + if (!uid_valid(real))
70775 + goto skipit;
70776 +
70777 + /* find user based on global namespace */
70778 +
70779 + globalreal = GR_GLOBAL_UID(real);
70780 +
70781 + user = find_user(make_kuid(&init_user_ns, globalreal));
70782 + if (user == NULL)
70783 + goto skipit;
70784 +
70785 + if (gr_process_kernel_setuid_ban(user)) {
70786 + /* for find_user */
70787 + free_uid(user);
70788 + return 1;
70789 + }
70790 +
70791 + /* for find_user */
70792 + free_uid(user);
70793 +
70794 +skipit:
70795 +#endif
70796 +
70797 + if (unlikely(!(gr_status & GR_READY)))
70798 + return 0;
70799 +
70800 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70801 + gr_log_learn_uid_change(real, effective, fs);
70802 +
70803 + num = current->acl->user_trans_num;
70804 + uidlist = current->acl->user_transitions;
70805 +
70806 + if (uidlist == NULL)
70807 + return 0;
70808 +
70809 + if (!uid_valid(real)) {
70810 + realok = 1;
70811 + globalreal = (uid_t)-1;
70812 + } else {
70813 + globalreal = GR_GLOBAL_UID(real);
70814 + }
70815 + if (!uid_valid(effective)) {
70816 + effectiveok = 1;
70817 + globaleffective = (uid_t)-1;
70818 + } else {
70819 + globaleffective = GR_GLOBAL_UID(effective);
70820 + }
70821 + if (!uid_valid(fs)) {
70822 + fsok = 1;
70823 + globalfs = (uid_t)-1;
70824 + } else {
70825 + globalfs = GR_GLOBAL_UID(fs);
70826 + }
70827 +
70828 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
70829 + for (i = 0; i < num; i++) {
70830 + curuid = uidlist[i];
70831 + if (globalreal == curuid)
70832 + realok = 1;
70833 + if (globaleffective == curuid)
70834 + effectiveok = 1;
70835 + if (globalfs == curuid)
70836 + fsok = 1;
70837 + }
70838 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
70839 + for (i = 0; i < num; i++) {
70840 + curuid = uidlist[i];
70841 + if (globalreal == curuid)
70842 + break;
70843 + if (globaleffective == curuid)
70844 + break;
70845 + if (globalfs == curuid)
70846 + break;
70847 + }
70848 + /* not in deny list */
70849 + if (i == num) {
70850 + realok = 1;
70851 + effectiveok = 1;
70852 + fsok = 1;
70853 + }
70854 + }
70855 +
70856 + if (realok && effectiveok && fsok)
70857 + return 0;
70858 + else {
70859 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70860 + return 1;
70861 + }
70862 +}
70863 +
70864 +int
70865 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70866 +{
70867 + unsigned int i;
70868 + __u16 num;
70869 + gid_t *gidlist;
70870 + gid_t curgid;
70871 + int realok = 0;
70872 + int effectiveok = 0;
70873 + int fsok = 0;
70874 + gid_t globalreal, globaleffective, globalfs;
70875 +
70876 + if (unlikely(!(gr_status & GR_READY)))
70877 + return 0;
70878 +
70879 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70880 + gr_log_learn_gid_change(real, effective, fs);
70881 +
70882 + num = current->acl->group_trans_num;
70883 + gidlist = current->acl->group_transitions;
70884 +
70885 + if (gidlist == NULL)
70886 + return 0;
70887 +
70888 + if (!gid_valid(real)) {
70889 + realok = 1;
70890 + globalreal = (gid_t)-1;
70891 + } else {
70892 + globalreal = GR_GLOBAL_GID(real);
70893 + }
70894 + if (!gid_valid(effective)) {
70895 + effectiveok = 1;
70896 + globaleffective = (gid_t)-1;
70897 + } else {
70898 + globaleffective = GR_GLOBAL_GID(effective);
70899 + }
70900 + if (!gid_valid(fs)) {
70901 + fsok = 1;
70902 + globalfs = (gid_t)-1;
70903 + } else {
70904 + globalfs = GR_GLOBAL_GID(fs);
70905 + }
70906 +
70907 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
70908 + for (i = 0; i < num; i++) {
70909 + curgid = gidlist[i];
70910 + if (globalreal == curgid)
70911 + realok = 1;
70912 + if (globaleffective == curgid)
70913 + effectiveok = 1;
70914 + if (globalfs == curgid)
70915 + fsok = 1;
70916 + }
70917 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
70918 + for (i = 0; i < num; i++) {
70919 + curgid = gidlist[i];
70920 + if (globalreal == curgid)
70921 + break;
70922 + if (globaleffective == curgid)
70923 + break;
70924 + if (globalfs == curgid)
70925 + break;
70926 + }
70927 + /* not in deny list */
70928 + if (i == num) {
70929 + realok = 1;
70930 + effectiveok = 1;
70931 + fsok = 1;
70932 + }
70933 + }
70934 +
70935 + if (realok && effectiveok && fsok)
70936 + return 0;
70937 + else {
70938 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70939 + return 1;
70940 + }
70941 +}
70942 +
70943 +extern int gr_acl_is_capable(const int cap);
70944 +
70945 +void
70946 +gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
70947 +{
70948 + struct acl_role_label *role = task->role;
70949 + struct acl_subject_label *subj = NULL;
70950 + struct acl_object_label *obj;
70951 + struct file *filp;
70952 + uid_t uid;
70953 + gid_t gid;
70954 +
70955 + if (unlikely(!(gr_status & GR_READY)))
70956 + return;
70957 +
70958 + uid = GR_GLOBAL_UID(kuid);
70959 + gid = GR_GLOBAL_GID(kgid);
70960 +
70961 + filp = task->exec_file;
70962 +
70963 + /* kernel process, we'll give them the kernel role */
70964 + if (unlikely(!filp)) {
70965 + task->role = running_polstate.kernel_role;
70966 + task->acl = running_polstate.kernel_role->root_label;
70967 + return;
70968 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
70969 + /* save the current ip at time of role lookup so that the proper
70970 + IP will be learned for role_allowed_ip */
70971 + task->signal->saved_ip = task->signal->curr_ip;
70972 + role = lookup_acl_role_label(task, uid, gid);
70973 + }
70974 +
70975 + /* don't change the role if we're not a privileged process */
70976 + if (role && task->role != role &&
70977 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
70978 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
70979 + return;
70980 +
70981 + /* perform subject lookup in possibly new role
70982 + we can use this result below in the case where role == task->role
70983 + */
70984 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
70985 +
70986 + /* if we changed uid/gid, but result in the same role
70987 + and are using inheritance, don't lose the inherited subject
70988 + if current subject is other than what normal lookup
70989 + would result in, we arrived via inheritance, don't
70990 + lose subject
70991 + */
70992 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
70993 + (subj == task->acl)))
70994 + task->acl = subj;
70995 +
70996 + /* leave task->inherited unaffected */
70997 +
70998 + task->role = role;
70999 +
71000 + task->is_writable = 0;
71001 +
71002 + /* ignore additional mmap checks for processes that are writable
71003 + by the default ACL */
71004 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71005 + if (unlikely(obj->mode & GR_WRITE))
71006 + task->is_writable = 1;
71007 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71008 + if (unlikely(obj->mode & GR_WRITE))
71009 + task->is_writable = 1;
71010 +
71011 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71012 + 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);
71013 +#endif
71014 +
71015 + gr_set_proc_res(task);
71016 +
71017 + return;
71018 +}
71019 +
71020 +int
71021 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
71022 + const int unsafe_flags)
71023 +{
71024 + struct task_struct *task = current;
71025 + struct acl_subject_label *newacl;
71026 + struct acl_object_label *obj;
71027 + __u32 retmode;
71028 +
71029 + if (unlikely(!(gr_status & GR_READY)))
71030 + return 0;
71031 +
71032 + newacl = chk_subj_label(dentry, mnt, task->role);
71033 +
71034 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
71035 + did an exec
71036 + */
71037 + rcu_read_lock();
71038 + read_lock(&tasklist_lock);
71039 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
71040 + (task->parent->acl->mode & GR_POVERRIDE))) {
71041 + read_unlock(&tasklist_lock);
71042 + rcu_read_unlock();
71043 + goto skip_check;
71044 + }
71045 + read_unlock(&tasklist_lock);
71046 + rcu_read_unlock();
71047 +
71048 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
71049 + !(task->role->roletype & GR_ROLE_GOD) &&
71050 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
71051 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71052 + if (unsafe_flags & LSM_UNSAFE_SHARE)
71053 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
71054 + else
71055 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
71056 + return -EACCES;
71057 + }
71058 +
71059 +skip_check:
71060 +
71061 + obj = chk_obj_label(dentry, mnt, task->acl);
71062 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
71063 +
71064 + if (!(task->acl->mode & GR_INHERITLEARN) &&
71065 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
71066 + if (obj->nested)
71067 + task->acl = obj->nested;
71068 + else
71069 + task->acl = newacl;
71070 + task->inherited = 0;
71071 + } else {
71072 + task->inherited = 1;
71073 + if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
71074 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
71075 + }
71076 +
71077 + task->is_writable = 0;
71078 +
71079 + /* ignore additional mmap checks for processes that are writable
71080 + by the default ACL */
71081 + obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
71082 + if (unlikely(obj->mode & GR_WRITE))
71083 + task->is_writable = 1;
71084 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
71085 + if (unlikely(obj->mode & GR_WRITE))
71086 + task->is_writable = 1;
71087 +
71088 + gr_set_proc_res(task);
71089 +
71090 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71091 + 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);
71092 +#endif
71093 + return 0;
71094 +}
71095 +
71096 +/* always called with valid inodev ptr */
71097 +static void
71098 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
71099 +{
71100 + struct acl_object_label *matchpo;
71101 + struct acl_subject_label *matchps;
71102 + struct acl_subject_label *subj;
71103 + struct acl_role_label *role;
71104 + unsigned int x;
71105 +
71106 + FOR_EACH_ROLE_START(role)
71107 + FOR_EACH_SUBJECT_START(role, subj, x)
71108 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71109 + matchpo->mode |= GR_DELETED;
71110 + FOR_EACH_SUBJECT_END(subj,x)
71111 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
71112 + /* nested subjects aren't in the role's subj_hash table */
71113 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71114 + matchpo->mode |= GR_DELETED;
71115 + FOR_EACH_NESTED_SUBJECT_END(subj)
71116 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71117 + matchps->mode |= GR_DELETED;
71118 + FOR_EACH_ROLE_END(role)
71119 +
71120 + inodev->nentry->deleted = 1;
71121 +
71122 + return;
71123 +}
71124 +
71125 +void
71126 +gr_handle_delete(const ino_t ino, const dev_t dev)
71127 +{
71128 + struct inodev_entry *inodev;
71129 +
71130 + if (unlikely(!(gr_status & GR_READY)))
71131 + return;
71132 +
71133 + write_lock(&gr_inode_lock);
71134 + inodev = lookup_inodev_entry(ino, dev);
71135 + if (inodev != NULL)
71136 + do_handle_delete(inodev, ino, dev);
71137 + write_unlock(&gr_inode_lock);
71138 +
71139 + return;
71140 +}
71141 +
71142 +static void
71143 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
71144 + const ino_t newinode, const dev_t newdevice,
71145 + struct acl_subject_label *subj)
71146 +{
71147 + unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71148 + struct acl_object_label *match;
71149 +
71150 + match = subj->obj_hash[index];
71151 +
71152 + while (match && (match->inode != oldinode ||
71153 + match->device != olddevice ||
71154 + !(match->mode & GR_DELETED)))
71155 + match = match->next;
71156 +
71157 + if (match && (match->inode == oldinode)
71158 + && (match->device == olddevice)
71159 + && (match->mode & GR_DELETED)) {
71160 + if (match->prev == NULL) {
71161 + subj->obj_hash[index] = match->next;
71162 + if (match->next != NULL)
71163 + match->next->prev = NULL;
71164 + } else {
71165 + match->prev->next = match->next;
71166 + if (match->next != NULL)
71167 + match->next->prev = match->prev;
71168 + }
71169 + match->prev = NULL;
71170 + match->next = NULL;
71171 + match->inode = newinode;
71172 + match->device = newdevice;
71173 + match->mode &= ~GR_DELETED;
71174 +
71175 + insert_acl_obj_label(match, subj);
71176 + }
71177 +
71178 + return;
71179 +}
71180 +
71181 +static void
71182 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
71183 + const ino_t newinode, const dev_t newdevice,
71184 + struct acl_role_label *role)
71185 +{
71186 + unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71187 + struct acl_subject_label *match;
71188 +
71189 + match = role->subj_hash[index];
71190 +
71191 + while (match && (match->inode != oldinode ||
71192 + match->device != olddevice ||
71193 + !(match->mode & GR_DELETED)))
71194 + match = match->next;
71195 +
71196 + if (match && (match->inode == oldinode)
71197 + && (match->device == olddevice)
71198 + && (match->mode & GR_DELETED)) {
71199 + if (match->prev == NULL) {
71200 + role->subj_hash[index] = match->next;
71201 + if (match->next != NULL)
71202 + match->next->prev = NULL;
71203 + } else {
71204 + match->prev->next = match->next;
71205 + if (match->next != NULL)
71206 + match->next->prev = match->prev;
71207 + }
71208 + match->prev = NULL;
71209 + match->next = NULL;
71210 + match->inode = newinode;
71211 + match->device = newdevice;
71212 + match->mode &= ~GR_DELETED;
71213 +
71214 + insert_acl_subj_label(match, role);
71215 + }
71216 +
71217 + return;
71218 +}
71219 +
71220 +static void
71221 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71222 + const ino_t newinode, const dev_t newdevice)
71223 +{
71224 + unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71225 + struct inodev_entry *match;
71226 +
71227 + match = running_polstate.inodev_set.i_hash[index];
71228 +
71229 + while (match && (match->nentry->inode != oldinode ||
71230 + match->nentry->device != olddevice || !match->nentry->deleted))
71231 + match = match->next;
71232 +
71233 + if (match && (match->nentry->inode == oldinode)
71234 + && (match->nentry->device == olddevice) &&
71235 + match->nentry->deleted) {
71236 + if (match->prev == NULL) {
71237 + running_polstate.inodev_set.i_hash[index] = match->next;
71238 + if (match->next != NULL)
71239 + match->next->prev = NULL;
71240 + } else {
71241 + match->prev->next = match->next;
71242 + if (match->next != NULL)
71243 + match->next->prev = match->prev;
71244 + }
71245 + match->prev = NULL;
71246 + match->next = NULL;
71247 + match->nentry->inode = newinode;
71248 + match->nentry->device = newdevice;
71249 + match->nentry->deleted = 0;
71250 +
71251 + insert_inodev_entry(match);
71252 + }
71253 +
71254 + return;
71255 +}
71256 +
71257 +static void
71258 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71259 +{
71260 + struct acl_subject_label *subj;
71261 + struct acl_role_label *role;
71262 + unsigned int x;
71263 +
71264 + FOR_EACH_ROLE_START(role)
71265 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71266 +
71267 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
71268 + if ((subj->inode == ino) && (subj->device == dev)) {
71269 + subj->inode = ino;
71270 + subj->device = dev;
71271 + }
71272 + /* nested subjects aren't in the role's subj_hash table */
71273 + update_acl_obj_label(matchn->inode, matchn->device,
71274 + ino, dev, subj);
71275 + FOR_EACH_NESTED_SUBJECT_END(subj)
71276 + FOR_EACH_SUBJECT_START(role, subj, x)
71277 + update_acl_obj_label(matchn->inode, matchn->device,
71278 + ino, dev, subj);
71279 + FOR_EACH_SUBJECT_END(subj,x)
71280 + FOR_EACH_ROLE_END(role)
71281 +
71282 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71283 +
71284 + return;
71285 +}
71286 +
71287 +static void
71288 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71289 + const struct vfsmount *mnt)
71290 +{
71291 + ino_t ino = dentry->d_inode->i_ino;
71292 + dev_t dev = __get_dev(dentry);
71293 +
71294 + __do_handle_create(matchn, ino, dev);
71295 +
71296 + return;
71297 +}
71298 +
71299 +void
71300 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71301 +{
71302 + struct name_entry *matchn;
71303 +
71304 + if (unlikely(!(gr_status & GR_READY)))
71305 + return;
71306 +
71307 + preempt_disable();
71308 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71309 +
71310 + if (unlikely((unsigned long)matchn)) {
71311 + write_lock(&gr_inode_lock);
71312 + do_handle_create(matchn, dentry, mnt);
71313 + write_unlock(&gr_inode_lock);
71314 + }
71315 + preempt_enable();
71316 +
71317 + return;
71318 +}
71319 +
71320 +void
71321 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71322 +{
71323 + struct name_entry *matchn;
71324 +
71325 + if (unlikely(!(gr_status & GR_READY)))
71326 + return;
71327 +
71328 + preempt_disable();
71329 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71330 +
71331 + if (unlikely((unsigned long)matchn)) {
71332 + write_lock(&gr_inode_lock);
71333 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71334 + write_unlock(&gr_inode_lock);
71335 + }
71336 + preempt_enable();
71337 +
71338 + return;
71339 +}
71340 +
71341 +void
71342 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71343 + struct dentry *old_dentry,
71344 + struct dentry *new_dentry,
71345 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71346 +{
71347 + struct name_entry *matchn;
71348 + struct name_entry *matchn2 = NULL;
71349 + struct inodev_entry *inodev;
71350 + struct inode *inode = new_dentry->d_inode;
71351 + ino_t old_ino = old_dentry->d_inode->i_ino;
71352 + dev_t old_dev = __get_dev(old_dentry);
71353 + unsigned int exchange = flags & RENAME_EXCHANGE;
71354 +
71355 + /* vfs_rename swaps the name and parent link for old_dentry and
71356 + new_dentry
71357 + at this point, old_dentry has the new name, parent link, and inode
71358 + for the renamed file
71359 + if a file is being replaced by a rename, new_dentry has the inode
71360 + and name for the replaced file
71361 + */
71362 +
71363 + if (unlikely(!(gr_status & GR_READY)))
71364 + return;
71365 +
71366 + preempt_disable();
71367 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71368 +
71369 + /* exchange cases:
71370 + a filename exists for the source, but not dest
71371 + do a recreate on source
71372 + a filename exists for the dest, but not source
71373 + do a recreate on dest
71374 + a filename exists for both source and dest
71375 + delete source and dest, then create source and dest
71376 + a filename exists for neither source nor dest
71377 + no updates needed
71378 +
71379 + the name entry lookups get us the old inode/dev associated with
71380 + each name, so do the deletes first (if possible) so that when
71381 + we do the create, we pick up on the right entries
71382 + */
71383 +
71384 + if (exchange)
71385 + matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71386 +
71387 + /* we wouldn't have to check d_inode if it weren't for
71388 + NFS silly-renaming
71389 + */
71390 +
71391 + write_lock(&gr_inode_lock);
71392 + if (unlikely((replace || exchange) && inode)) {
71393 + ino_t new_ino = inode->i_ino;
71394 + dev_t new_dev = __get_dev(new_dentry);
71395 +
71396 + inodev = lookup_inodev_entry(new_ino, new_dev);
71397 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71398 + do_handle_delete(inodev, new_ino, new_dev);
71399 + }
71400 +
71401 + inodev = lookup_inodev_entry(old_ino, old_dev);
71402 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71403 + do_handle_delete(inodev, old_ino, old_dev);
71404 +
71405 + if (unlikely(matchn != NULL))
71406 + do_handle_create(matchn, old_dentry, mnt);
71407 +
71408 + if (unlikely(matchn2 != NULL))
71409 + do_handle_create(matchn2, new_dentry, mnt);
71410 +
71411 + write_unlock(&gr_inode_lock);
71412 + preempt_enable();
71413 +
71414 + return;
71415 +}
71416 +
71417 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71418 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71419 + [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71420 + [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71421 + [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71422 + [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71423 + [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71424 + [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71425 + [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71426 + [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71427 + [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71428 + [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71429 + [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71430 + [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71431 + [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71432 + [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71433 + [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71434 + [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71435 +};
71436 +
71437 +void
71438 +gr_learn_resource(const struct task_struct *task,
71439 + const int res, const unsigned long wanted, const int gt)
71440 +{
71441 + struct acl_subject_label *acl;
71442 + const struct cred *cred;
71443 +
71444 + if (unlikely((gr_status & GR_READY) &&
71445 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71446 + goto skip_reslog;
71447 +
71448 + gr_log_resource(task, res, wanted, gt);
71449 +skip_reslog:
71450 +
71451 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71452 + return;
71453 +
71454 + acl = task->acl;
71455 +
71456 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71457 + !(acl->resmask & (1U << (unsigned short) res))))
71458 + return;
71459 +
71460 + if (wanted >= acl->res[res].rlim_cur) {
71461 + unsigned long res_add;
71462 +
71463 + res_add = wanted + res_learn_bumps[res];
71464 +
71465 + acl->res[res].rlim_cur = res_add;
71466 +
71467 + if (wanted > acl->res[res].rlim_max)
71468 + acl->res[res].rlim_max = res_add;
71469 +
71470 + /* only log the subject filename, since resource logging is supported for
71471 + single-subject learning only */
71472 + rcu_read_lock();
71473 + cred = __task_cred(task);
71474 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71475 + task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71476 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71477 + "", (unsigned long) res, &task->signal->saved_ip);
71478 + rcu_read_unlock();
71479 + }
71480 +
71481 + return;
71482 +}
71483 +EXPORT_SYMBOL_GPL(gr_learn_resource);
71484 +#endif
71485 +
71486 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71487 +void
71488 +pax_set_initial_flags(struct linux_binprm *bprm)
71489 +{
71490 + struct task_struct *task = current;
71491 + struct acl_subject_label *proc;
71492 + unsigned long flags;
71493 +
71494 + if (unlikely(!(gr_status & GR_READY)))
71495 + return;
71496 +
71497 + flags = pax_get_flags(task);
71498 +
71499 + proc = task->acl;
71500 +
71501 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71502 + flags &= ~MF_PAX_PAGEEXEC;
71503 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71504 + flags &= ~MF_PAX_SEGMEXEC;
71505 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71506 + flags &= ~MF_PAX_RANDMMAP;
71507 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71508 + flags &= ~MF_PAX_EMUTRAMP;
71509 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71510 + flags &= ~MF_PAX_MPROTECT;
71511 +
71512 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71513 + flags |= MF_PAX_PAGEEXEC;
71514 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71515 + flags |= MF_PAX_SEGMEXEC;
71516 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71517 + flags |= MF_PAX_RANDMMAP;
71518 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71519 + flags |= MF_PAX_EMUTRAMP;
71520 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71521 + flags |= MF_PAX_MPROTECT;
71522 +
71523 + pax_set_flags(task, flags);
71524 +
71525 + return;
71526 +}
71527 +#endif
71528 +
71529 +int
71530 +gr_handle_proc_ptrace(struct task_struct *task)
71531 +{
71532 + struct file *filp;
71533 + struct task_struct *tmp = task;
71534 + struct task_struct *curtemp = current;
71535 + __u32 retmode;
71536 +
71537 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71538 + if (unlikely(!(gr_status & GR_READY)))
71539 + return 0;
71540 +#endif
71541 +
71542 + read_lock(&tasklist_lock);
71543 + read_lock(&grsec_exec_file_lock);
71544 + filp = task->exec_file;
71545 +
71546 + while (task_pid_nr(tmp) > 0) {
71547 + if (tmp == curtemp)
71548 + break;
71549 + tmp = tmp->real_parent;
71550 + }
71551 +
71552 + if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71553 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71554 + read_unlock(&grsec_exec_file_lock);
71555 + read_unlock(&tasklist_lock);
71556 + return 1;
71557 + }
71558 +
71559 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71560 + if (!(gr_status & GR_READY)) {
71561 + read_unlock(&grsec_exec_file_lock);
71562 + read_unlock(&tasklist_lock);
71563 + return 0;
71564 + }
71565 +#endif
71566 +
71567 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71568 + read_unlock(&grsec_exec_file_lock);
71569 + read_unlock(&tasklist_lock);
71570 +
71571 + if (retmode & GR_NOPTRACE)
71572 + return 1;
71573 +
71574 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71575 + && (current->acl != task->acl || (current->acl != current->role->root_label
71576 + && task_pid_nr(current) != task_pid_nr(task))))
71577 + return 1;
71578 +
71579 + return 0;
71580 +}
71581 +
71582 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71583 +{
71584 + if (unlikely(!(gr_status & GR_READY)))
71585 + return;
71586 +
71587 + if (!(current->role->roletype & GR_ROLE_GOD))
71588 + return;
71589 +
71590 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71591 + p->role->rolename, gr_task_roletype_to_char(p),
71592 + p->acl->filename);
71593 +}
71594 +
71595 +int
71596 +gr_handle_ptrace(struct task_struct *task, const long request)
71597 +{
71598 + struct task_struct *tmp = task;
71599 + struct task_struct *curtemp = current;
71600 + __u32 retmode;
71601 +
71602 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71603 + if (unlikely(!(gr_status & GR_READY)))
71604 + return 0;
71605 +#endif
71606 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71607 + read_lock(&tasklist_lock);
71608 + while (task_pid_nr(tmp) > 0) {
71609 + if (tmp == curtemp)
71610 + break;
71611 + tmp = tmp->real_parent;
71612 + }
71613 +
71614 + if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71615 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71616 + read_unlock(&tasklist_lock);
71617 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71618 + return 1;
71619 + }
71620 + read_unlock(&tasklist_lock);
71621 + }
71622 +
71623 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71624 + if (!(gr_status & GR_READY))
71625 + return 0;
71626 +#endif
71627 +
71628 + read_lock(&grsec_exec_file_lock);
71629 + if (unlikely(!task->exec_file)) {
71630 + read_unlock(&grsec_exec_file_lock);
71631 + return 0;
71632 + }
71633 +
71634 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71635 + read_unlock(&grsec_exec_file_lock);
71636 +
71637 + if (retmode & GR_NOPTRACE) {
71638 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71639 + return 1;
71640 + }
71641 +
71642 + if (retmode & GR_PTRACERD) {
71643 + switch (request) {
71644 + case PTRACE_SEIZE:
71645 + case PTRACE_POKETEXT:
71646 + case PTRACE_POKEDATA:
71647 + case PTRACE_POKEUSR:
71648 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71649 + case PTRACE_SETREGS:
71650 + case PTRACE_SETFPREGS:
71651 +#endif
71652 +#ifdef CONFIG_X86
71653 + case PTRACE_SETFPXREGS:
71654 +#endif
71655 +#ifdef CONFIG_ALTIVEC
71656 + case PTRACE_SETVRREGS:
71657 +#endif
71658 + return 1;
71659 + default:
71660 + return 0;
71661 + }
71662 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
71663 + !(current->role->roletype & GR_ROLE_GOD) &&
71664 + (current->acl != task->acl)) {
71665 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71666 + return 1;
71667 + }
71668 +
71669 + return 0;
71670 +}
71671 +
71672 +static int is_writable_mmap(const struct file *filp)
71673 +{
71674 + struct task_struct *task = current;
71675 + struct acl_object_label *obj, *obj2;
71676 +
71677 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71678 + !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))) {
71679 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71680 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71681 + task->role->root_label);
71682 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71683 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71684 + return 1;
71685 + }
71686 + }
71687 + return 0;
71688 +}
71689 +
71690 +int
71691 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71692 +{
71693 + __u32 mode;
71694 +
71695 + if (unlikely(!file || !(prot & PROT_EXEC)))
71696 + return 1;
71697 +
71698 + if (is_writable_mmap(file))
71699 + return 0;
71700 +
71701 + mode =
71702 + gr_search_file(file->f_path.dentry,
71703 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71704 + file->f_path.mnt);
71705 +
71706 + if (!gr_tpe_allow(file))
71707 + return 0;
71708 +
71709 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71710 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71711 + return 0;
71712 + } else if (unlikely(!(mode & GR_EXEC))) {
71713 + return 0;
71714 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71715 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71716 + return 1;
71717 + }
71718 +
71719 + return 1;
71720 +}
71721 +
71722 +int
71723 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71724 +{
71725 + __u32 mode;
71726 +
71727 + if (unlikely(!file || !(prot & PROT_EXEC)))
71728 + return 1;
71729 +
71730 + if (is_writable_mmap(file))
71731 + return 0;
71732 +
71733 + mode =
71734 + gr_search_file(file->f_path.dentry,
71735 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71736 + file->f_path.mnt);
71737 +
71738 + if (!gr_tpe_allow(file))
71739 + return 0;
71740 +
71741 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71742 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71743 + return 0;
71744 + } else if (unlikely(!(mode & GR_EXEC))) {
71745 + return 0;
71746 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71747 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71748 + return 1;
71749 + }
71750 +
71751 + return 1;
71752 +}
71753 +
71754 +void
71755 +gr_acl_handle_psacct(struct task_struct *task, const long code)
71756 +{
71757 + unsigned long runtime, cputime;
71758 + cputime_t utime, stime;
71759 + unsigned int wday, cday;
71760 + __u8 whr, chr;
71761 + __u8 wmin, cmin;
71762 + __u8 wsec, csec;
71763 + struct timespec curtime, starttime;
71764 +
71765 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71766 + !(task->acl->mode & GR_PROCACCT)))
71767 + return;
71768 +
71769 + curtime = ns_to_timespec(ktime_get_ns());
71770 + starttime = ns_to_timespec(task->start_time);
71771 + runtime = curtime.tv_sec - starttime.tv_sec;
71772 + wday = runtime / (60 * 60 * 24);
71773 + runtime -= wday * (60 * 60 * 24);
71774 + whr = runtime / (60 * 60);
71775 + runtime -= whr * (60 * 60);
71776 + wmin = runtime / 60;
71777 + runtime -= wmin * 60;
71778 + wsec = runtime;
71779 +
71780 + task_cputime(task, &utime, &stime);
71781 + cputime = cputime_to_secs(utime + stime);
71782 + cday = cputime / (60 * 60 * 24);
71783 + cputime -= cday * (60 * 60 * 24);
71784 + chr = cputime / (60 * 60);
71785 + cputime -= chr * (60 * 60);
71786 + cmin = cputime / 60;
71787 + cputime -= cmin * 60;
71788 + csec = cputime;
71789 +
71790 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71791 +
71792 + return;
71793 +}
71794 +
71795 +#ifdef CONFIG_TASKSTATS
71796 +int gr_is_taskstats_denied(int pid)
71797 +{
71798 + struct task_struct *task;
71799 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71800 + const struct cred *cred;
71801 +#endif
71802 + int ret = 0;
71803 +
71804 + /* restrict taskstats viewing to un-chrooted root users
71805 + who have the 'view' subject flag if the RBAC system is enabled
71806 + */
71807 +
71808 + rcu_read_lock();
71809 + read_lock(&tasklist_lock);
71810 + task = find_task_by_vpid(pid);
71811 + if (task) {
71812 +#ifdef CONFIG_GRKERNSEC_CHROOT
71813 + if (proc_is_chrooted(task))
71814 + ret = -EACCES;
71815 +#endif
71816 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71817 + cred = __task_cred(task);
71818 +#ifdef CONFIG_GRKERNSEC_PROC_USER
71819 + if (gr_is_global_nonroot(cred->uid))
71820 + ret = -EACCES;
71821 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71822 + if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71823 + ret = -EACCES;
71824 +#endif
71825 +#endif
71826 + if (gr_status & GR_READY) {
71827 + if (!(task->acl->mode & GR_VIEW))
71828 + ret = -EACCES;
71829 + }
71830 + } else
71831 + ret = -ENOENT;
71832 +
71833 + read_unlock(&tasklist_lock);
71834 + rcu_read_unlock();
71835 +
71836 + return ret;
71837 +}
71838 +#endif
71839 +
71840 +/* AUXV entries are filled via a descendant of search_binary_handler
71841 + after we've already applied the subject for the target
71842 +*/
71843 +int gr_acl_enable_at_secure(void)
71844 +{
71845 + if (unlikely(!(gr_status & GR_READY)))
71846 + return 0;
71847 +
71848 + if (current->acl->mode & GR_ATSECURE)
71849 + return 1;
71850 +
71851 + return 0;
71852 +}
71853 +
71854 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71855 +{
71856 + struct task_struct *task = current;
71857 + struct dentry *dentry = file->f_path.dentry;
71858 + struct vfsmount *mnt = file->f_path.mnt;
71859 + struct acl_object_label *obj, *tmp;
71860 + struct acl_subject_label *subj;
71861 + unsigned int bufsize;
71862 + int is_not_root;
71863 + char *path;
71864 + dev_t dev = __get_dev(dentry);
71865 +
71866 + if (unlikely(!(gr_status & GR_READY)))
71867 + return 1;
71868 +
71869 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71870 + return 1;
71871 +
71872 + /* ignore Eric Biederman */
71873 + if (IS_PRIVATE(dentry->d_inode))
71874 + return 1;
71875 +
71876 + subj = task->acl;
71877 + read_lock(&gr_inode_lock);
71878 + do {
71879 + obj = lookup_acl_obj_label(ino, dev, subj);
71880 + if (obj != NULL) {
71881 + read_unlock(&gr_inode_lock);
71882 + return (obj->mode & GR_FIND) ? 1 : 0;
71883 + }
71884 + } while ((subj = subj->parent_subject));
71885 + read_unlock(&gr_inode_lock);
71886 +
71887 + /* this is purely an optimization since we're looking for an object
71888 + for the directory we're doing a readdir on
71889 + if it's possible for any globbed object to match the entry we're
71890 + filling into the directory, then the object we find here will be
71891 + an anchor point with attached globbed objects
71892 + */
71893 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
71894 + if (obj->globbed == NULL)
71895 + return (obj->mode & GR_FIND) ? 1 : 0;
71896 +
71897 + is_not_root = ((obj->filename[0] == '/') &&
71898 + (obj->filename[1] == '\0')) ? 0 : 1;
71899 + bufsize = PAGE_SIZE - namelen - is_not_root;
71900 +
71901 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
71902 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
71903 + return 1;
71904 +
71905 + preempt_disable();
71906 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
71907 + bufsize);
71908 +
71909 + bufsize = strlen(path);
71910 +
71911 + /* if base is "/", don't append an additional slash */
71912 + if (is_not_root)
71913 + *(path + bufsize) = '/';
71914 + memcpy(path + bufsize + is_not_root, name, namelen);
71915 + *(path + bufsize + namelen + is_not_root) = '\0';
71916 +
71917 + tmp = obj->globbed;
71918 + while (tmp) {
71919 + if (!glob_match(tmp->filename, path)) {
71920 + preempt_enable();
71921 + return (tmp->mode & GR_FIND) ? 1 : 0;
71922 + }
71923 + tmp = tmp->next;
71924 + }
71925 + preempt_enable();
71926 + return (obj->mode & GR_FIND) ? 1 : 0;
71927 +}
71928 +
71929 +void gr_put_exec_file(struct task_struct *task)
71930 +{
71931 + struct file *filp;
71932 +
71933 + write_lock(&grsec_exec_file_lock);
71934 + filp = task->exec_file;
71935 + task->exec_file = NULL;
71936 + write_unlock(&grsec_exec_file_lock);
71937 +
71938 + if (filp)
71939 + fput(filp);
71940 +
71941 + return;
71942 +}
71943 +
71944 +
71945 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
71946 +EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
71947 +#endif
71948 +#ifdef CONFIG_SECURITY
71949 +EXPORT_SYMBOL_GPL(gr_check_user_change);
71950 +EXPORT_SYMBOL_GPL(gr_check_group_change);
71951 +#endif
71952 +
71953 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
71954 new file mode 100644
71955 index 0000000..18ffbbd
71956 --- /dev/null
71957 +++ b/grsecurity/gracl_alloc.c
71958 @@ -0,0 +1,105 @@
71959 +#include <linux/kernel.h>
71960 +#include <linux/mm.h>
71961 +#include <linux/slab.h>
71962 +#include <linux/vmalloc.h>
71963 +#include <linux/gracl.h>
71964 +#include <linux/grsecurity.h>
71965 +
71966 +static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
71967 +struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
71968 +
71969 +static __inline__ int
71970 +alloc_pop(void)
71971 +{
71972 + if (current_alloc_state->alloc_stack_next == 1)
71973 + return 0;
71974 +
71975 + kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
71976 +
71977 + current_alloc_state->alloc_stack_next--;
71978 +
71979 + return 1;
71980 +}
71981 +
71982 +static __inline__ int
71983 +alloc_push(void *buf)
71984 +{
71985 + if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
71986 + return 1;
71987 +
71988 + current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
71989 +
71990 + current_alloc_state->alloc_stack_next++;
71991 +
71992 + return 0;
71993 +}
71994 +
71995 +void *
71996 +acl_alloc(unsigned long len)
71997 +{
71998 + void *ret = NULL;
71999 +
72000 + if (!len || len > PAGE_SIZE)
72001 + goto out;
72002 +
72003 + ret = kmalloc(len, GFP_KERNEL);
72004 +
72005 + if (ret) {
72006 + if (alloc_push(ret)) {
72007 + kfree(ret);
72008 + ret = NULL;
72009 + }
72010 + }
72011 +
72012 +out:
72013 + return ret;
72014 +}
72015 +
72016 +void *
72017 +acl_alloc_num(unsigned long num, unsigned long len)
72018 +{
72019 + if (!len || (num > (PAGE_SIZE / len)))
72020 + return NULL;
72021 +
72022 + return acl_alloc(num * len);
72023 +}
72024 +
72025 +void
72026 +acl_free_all(void)
72027 +{
72028 + if (!current_alloc_state->alloc_stack)
72029 + return;
72030 +
72031 + while (alloc_pop()) ;
72032 +
72033 + if (current_alloc_state->alloc_stack) {
72034 + if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
72035 + kfree(current_alloc_state->alloc_stack);
72036 + else
72037 + vfree(current_alloc_state->alloc_stack);
72038 + }
72039 +
72040 + current_alloc_state->alloc_stack = NULL;
72041 + current_alloc_state->alloc_stack_size = 1;
72042 + current_alloc_state->alloc_stack_next = 1;
72043 +
72044 + return;
72045 +}
72046 +
72047 +int
72048 +acl_alloc_stack_init(unsigned long size)
72049 +{
72050 + if ((size * sizeof (void *)) <= PAGE_SIZE)
72051 + current_alloc_state->alloc_stack =
72052 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
72053 + else
72054 + current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
72055 +
72056 + current_alloc_state->alloc_stack_size = size;
72057 + current_alloc_state->alloc_stack_next = 1;
72058 +
72059 + if (!current_alloc_state->alloc_stack)
72060 + return 0;
72061 + else
72062 + return 1;
72063 +}
72064 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
72065 new file mode 100644
72066 index 0000000..1a94c11
72067 --- /dev/null
72068 +++ b/grsecurity/gracl_cap.c
72069 @@ -0,0 +1,127 @@
72070 +#include <linux/kernel.h>
72071 +#include <linux/module.h>
72072 +#include <linux/sched.h>
72073 +#include <linux/gracl.h>
72074 +#include <linux/grsecurity.h>
72075 +#include <linux/grinternal.h>
72076 +
72077 +extern const char *captab_log[];
72078 +extern int captab_log_entries;
72079 +
72080 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
72081 +{
72082 + struct acl_subject_label *curracl;
72083 +
72084 + if (!gr_acl_is_enabled())
72085 + return 1;
72086 +
72087 + curracl = task->acl;
72088 +
72089 + if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72090 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72091 + task->role->roletype, GR_GLOBAL_UID(cred->uid),
72092 + GR_GLOBAL_GID(cred->gid), task->exec_file ?
72093 + gr_to_filename(task->exec_file->f_path.dentry,
72094 + task->exec_file->f_path.mnt) : curracl->filename,
72095 + curracl->filename, 0UL,
72096 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72097 + return 1;
72098 + }
72099 +
72100 + return 0;
72101 +}
72102 +
72103 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72104 +{
72105 + struct acl_subject_label *curracl;
72106 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72107 + kernel_cap_t cap_audit = __cap_empty_set;
72108 +
72109 + if (!gr_acl_is_enabled())
72110 + return 1;
72111 +
72112 + curracl = task->acl;
72113 +
72114 + cap_drop = curracl->cap_lower;
72115 + cap_mask = curracl->cap_mask;
72116 + cap_audit = curracl->cap_invert_audit;
72117 +
72118 + while ((curracl = curracl->parent_subject)) {
72119 + /* if the cap isn't specified in the current computed mask but is specified in the
72120 + current level subject, and is lowered in the current level subject, then add
72121 + it to the set of dropped capabilities
72122 + otherwise, add the current level subject's mask to the current computed mask
72123 + */
72124 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72125 + cap_raise(cap_mask, cap);
72126 + if (cap_raised(curracl->cap_lower, cap))
72127 + cap_raise(cap_drop, cap);
72128 + if (cap_raised(curracl->cap_invert_audit, cap))
72129 + cap_raise(cap_audit, cap);
72130 + }
72131 + }
72132 +
72133 + if (!cap_raised(cap_drop, cap)) {
72134 + if (cap_raised(cap_audit, cap))
72135 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72136 + return 1;
72137 + }
72138 +
72139 + /* only learn the capability use if the process has the capability in the
72140 + general case, the two uses in sys.c of gr_learn_cap are an exception
72141 + to this rule to ensure any role transition involves what the full-learned
72142 + policy believes in a privileged process
72143 + */
72144 + if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72145 + return 1;
72146 +
72147 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72148 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72149 +
72150 + return 0;
72151 +}
72152 +
72153 +int
72154 +gr_acl_is_capable(const int cap)
72155 +{
72156 + return gr_task_acl_is_capable(current, current_cred(), cap);
72157 +}
72158 +
72159 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72160 +{
72161 + struct acl_subject_label *curracl;
72162 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72163 +
72164 + if (!gr_acl_is_enabled())
72165 + return 1;
72166 +
72167 + curracl = task->acl;
72168 +
72169 + cap_drop = curracl->cap_lower;
72170 + cap_mask = curracl->cap_mask;
72171 +
72172 + while ((curracl = curracl->parent_subject)) {
72173 + /* if the cap isn't specified in the current computed mask but is specified in the
72174 + current level subject, and is lowered in the current level subject, then add
72175 + it to the set of dropped capabilities
72176 + otherwise, add the current level subject's mask to the current computed mask
72177 + */
72178 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72179 + cap_raise(cap_mask, cap);
72180 + if (cap_raised(curracl->cap_lower, cap))
72181 + cap_raise(cap_drop, cap);
72182 + }
72183 + }
72184 +
72185 + if (!cap_raised(cap_drop, cap))
72186 + return 1;
72187 +
72188 + return 0;
72189 +}
72190 +
72191 +int
72192 +gr_acl_is_capable_nolog(const int cap)
72193 +{
72194 + return gr_task_acl_is_capable_nolog(current, cap);
72195 +}
72196 +
72197 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72198 new file mode 100644
72199 index 0000000..ca25605
72200 --- /dev/null
72201 +++ b/grsecurity/gracl_compat.c
72202 @@ -0,0 +1,270 @@
72203 +#include <linux/kernel.h>
72204 +#include <linux/gracl.h>
72205 +#include <linux/compat.h>
72206 +#include <linux/gracl_compat.h>
72207 +
72208 +#include <asm/uaccess.h>
72209 +
72210 +int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72211 +{
72212 + struct gr_arg_wrapper_compat uwrapcompat;
72213 +
72214 + if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72215 + return -EFAULT;
72216 +
72217 + if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72218 + (uwrapcompat.version != 0x2901)) ||
72219 + (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72220 + return -EINVAL;
72221 +
72222 + uwrap->arg = compat_ptr(uwrapcompat.arg);
72223 + uwrap->version = uwrapcompat.version;
72224 + uwrap->size = sizeof(struct gr_arg);
72225 +
72226 + return 0;
72227 +}
72228 +
72229 +int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72230 +{
72231 + struct gr_arg_compat argcompat;
72232 +
72233 + if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72234 + return -EFAULT;
72235 +
72236 + arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72237 + arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72238 + arg->role_db.num_roles = argcompat.role_db.num_roles;
72239 + arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72240 + arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72241 + arg->role_db.num_objects = argcompat.role_db.num_objects;
72242 +
72243 + memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72244 + memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72245 + memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72246 + memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72247 + arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72248 + arg->segv_device = argcompat.segv_device;
72249 + arg->segv_inode = argcompat.segv_inode;
72250 + arg->segv_uid = argcompat.segv_uid;
72251 + arg->num_sprole_pws = argcompat.num_sprole_pws;
72252 + arg->mode = argcompat.mode;
72253 +
72254 + return 0;
72255 +}
72256 +
72257 +int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72258 +{
72259 + struct acl_object_label_compat objcompat;
72260 +
72261 + if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72262 + return -EFAULT;
72263 +
72264 + obj->filename = compat_ptr(objcompat.filename);
72265 + obj->inode = objcompat.inode;
72266 + obj->device = objcompat.device;
72267 + obj->mode = objcompat.mode;
72268 +
72269 + obj->nested = compat_ptr(objcompat.nested);
72270 + obj->globbed = compat_ptr(objcompat.globbed);
72271 +
72272 + obj->prev = compat_ptr(objcompat.prev);
72273 + obj->next = compat_ptr(objcompat.next);
72274 +
72275 + return 0;
72276 +}
72277 +
72278 +int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72279 +{
72280 + unsigned int i;
72281 + struct acl_subject_label_compat subjcompat;
72282 +
72283 + if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72284 + return -EFAULT;
72285 +
72286 + subj->filename = compat_ptr(subjcompat.filename);
72287 + subj->inode = subjcompat.inode;
72288 + subj->device = subjcompat.device;
72289 + subj->mode = subjcompat.mode;
72290 + subj->cap_mask = subjcompat.cap_mask;
72291 + subj->cap_lower = subjcompat.cap_lower;
72292 + subj->cap_invert_audit = subjcompat.cap_invert_audit;
72293 +
72294 + for (i = 0; i < GR_NLIMITS; i++) {
72295 + if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72296 + subj->res[i].rlim_cur = RLIM_INFINITY;
72297 + else
72298 + subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72299 + if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72300 + subj->res[i].rlim_max = RLIM_INFINITY;
72301 + else
72302 + subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72303 + }
72304 + subj->resmask = subjcompat.resmask;
72305 +
72306 + subj->user_trans_type = subjcompat.user_trans_type;
72307 + subj->group_trans_type = subjcompat.group_trans_type;
72308 + subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72309 + subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72310 + subj->user_trans_num = subjcompat.user_trans_num;
72311 + subj->group_trans_num = subjcompat.group_trans_num;
72312 +
72313 + memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72314 + memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72315 + subj->ip_type = subjcompat.ip_type;
72316 + subj->ips = compat_ptr(subjcompat.ips);
72317 + subj->ip_num = subjcompat.ip_num;
72318 + subj->inaddr_any_override = subjcompat.inaddr_any_override;
72319 +
72320 + subj->crashes = subjcompat.crashes;
72321 + subj->expires = subjcompat.expires;
72322 +
72323 + subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72324 + subj->hash = compat_ptr(subjcompat.hash);
72325 + subj->prev = compat_ptr(subjcompat.prev);
72326 + subj->next = compat_ptr(subjcompat.next);
72327 +
72328 + subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72329 + subj->obj_hash_size = subjcompat.obj_hash_size;
72330 + subj->pax_flags = subjcompat.pax_flags;
72331 +
72332 + return 0;
72333 +}
72334 +
72335 +int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72336 +{
72337 + struct acl_role_label_compat rolecompat;
72338 +
72339 + if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72340 + return -EFAULT;
72341 +
72342 + role->rolename = compat_ptr(rolecompat.rolename);
72343 + role->uidgid = rolecompat.uidgid;
72344 + role->roletype = rolecompat.roletype;
72345 +
72346 + role->auth_attempts = rolecompat.auth_attempts;
72347 + role->expires = rolecompat.expires;
72348 +
72349 + role->root_label = compat_ptr(rolecompat.root_label);
72350 + role->hash = compat_ptr(rolecompat.hash);
72351 +
72352 + role->prev = compat_ptr(rolecompat.prev);
72353 + role->next = compat_ptr(rolecompat.next);
72354 +
72355 + role->transitions = compat_ptr(rolecompat.transitions);
72356 + role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72357 + role->domain_children = compat_ptr(rolecompat.domain_children);
72358 + role->domain_child_num = rolecompat.domain_child_num;
72359 +
72360 + role->umask = rolecompat.umask;
72361 +
72362 + role->subj_hash = compat_ptr(rolecompat.subj_hash);
72363 + role->subj_hash_size = rolecompat.subj_hash_size;
72364 +
72365 + return 0;
72366 +}
72367 +
72368 +int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72369 +{
72370 + struct role_allowed_ip_compat roleip_compat;
72371 +
72372 + if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72373 + return -EFAULT;
72374 +
72375 + roleip->addr = roleip_compat.addr;
72376 + roleip->netmask = roleip_compat.netmask;
72377 +
72378 + roleip->prev = compat_ptr(roleip_compat.prev);
72379 + roleip->next = compat_ptr(roleip_compat.next);
72380 +
72381 + return 0;
72382 +}
72383 +
72384 +int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72385 +{
72386 + struct role_transition_compat trans_compat;
72387 +
72388 + if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72389 + return -EFAULT;
72390 +
72391 + trans->rolename = compat_ptr(trans_compat.rolename);
72392 +
72393 + trans->prev = compat_ptr(trans_compat.prev);
72394 + trans->next = compat_ptr(trans_compat.next);
72395 +
72396 + return 0;
72397 +
72398 +}
72399 +
72400 +int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72401 +{
72402 + struct gr_hash_struct_compat hash_compat;
72403 +
72404 + if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72405 + return -EFAULT;
72406 +
72407 + hash->table = compat_ptr(hash_compat.table);
72408 + hash->nametable = compat_ptr(hash_compat.nametable);
72409 + hash->first = compat_ptr(hash_compat.first);
72410 +
72411 + hash->table_size = hash_compat.table_size;
72412 + hash->used_size = hash_compat.used_size;
72413 +
72414 + hash->type = hash_compat.type;
72415 +
72416 + return 0;
72417 +}
72418 +
72419 +int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72420 +{
72421 + compat_uptr_t ptrcompat;
72422 +
72423 + if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72424 + return -EFAULT;
72425 +
72426 + *(void **)ptr = compat_ptr(ptrcompat);
72427 +
72428 + return 0;
72429 +}
72430 +
72431 +int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72432 +{
72433 + struct acl_ip_label_compat ip_compat;
72434 +
72435 + if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72436 + return -EFAULT;
72437 +
72438 + ip->iface = compat_ptr(ip_compat.iface);
72439 + ip->addr = ip_compat.addr;
72440 + ip->netmask = ip_compat.netmask;
72441 + ip->low = ip_compat.low;
72442 + ip->high = ip_compat.high;
72443 + ip->mode = ip_compat.mode;
72444 + ip->type = ip_compat.type;
72445 +
72446 + memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72447 +
72448 + ip->prev = compat_ptr(ip_compat.prev);
72449 + ip->next = compat_ptr(ip_compat.next);
72450 +
72451 + return 0;
72452 +}
72453 +
72454 +int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72455 +{
72456 + struct sprole_pw_compat pw_compat;
72457 +
72458 + if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72459 + return -EFAULT;
72460 +
72461 + pw->rolename = compat_ptr(pw_compat.rolename);
72462 + memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72463 + memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72464 +
72465 + return 0;
72466 +}
72467 +
72468 +size_t get_gr_arg_wrapper_size_compat(void)
72469 +{
72470 + return sizeof(struct gr_arg_wrapper_compat);
72471 +}
72472 +
72473 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72474 new file mode 100644
72475 index 0000000..8ee8e4f
72476 --- /dev/null
72477 +++ b/grsecurity/gracl_fs.c
72478 @@ -0,0 +1,447 @@
72479 +#include <linux/kernel.h>
72480 +#include <linux/sched.h>
72481 +#include <linux/types.h>
72482 +#include <linux/fs.h>
72483 +#include <linux/file.h>
72484 +#include <linux/stat.h>
72485 +#include <linux/grsecurity.h>
72486 +#include <linux/grinternal.h>
72487 +#include <linux/gracl.h>
72488 +
72489 +umode_t
72490 +gr_acl_umask(void)
72491 +{
72492 + if (unlikely(!gr_acl_is_enabled()))
72493 + return 0;
72494 +
72495 + return current->role->umask;
72496 +}
72497 +
72498 +__u32
72499 +gr_acl_handle_hidden_file(const struct dentry * dentry,
72500 + const struct vfsmount * mnt)
72501 +{
72502 + __u32 mode;
72503 +
72504 + if (unlikely(d_is_negative(dentry)))
72505 + return GR_FIND;
72506 +
72507 + mode =
72508 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72509 +
72510 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72511 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72512 + return mode;
72513 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72514 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72515 + return 0;
72516 + } else if (unlikely(!(mode & GR_FIND)))
72517 + return 0;
72518 +
72519 + return GR_FIND;
72520 +}
72521 +
72522 +__u32
72523 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72524 + int acc_mode)
72525 +{
72526 + __u32 reqmode = GR_FIND;
72527 + __u32 mode;
72528 +
72529 + if (unlikely(d_is_negative(dentry)))
72530 + return reqmode;
72531 +
72532 + if (acc_mode & MAY_APPEND)
72533 + reqmode |= GR_APPEND;
72534 + else if (acc_mode & MAY_WRITE)
72535 + reqmode |= GR_WRITE;
72536 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72537 + reqmode |= GR_READ;
72538 +
72539 + mode =
72540 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72541 + mnt);
72542 +
72543 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72544 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72545 + reqmode & GR_READ ? " reading" : "",
72546 + reqmode & GR_WRITE ? " writing" : reqmode &
72547 + GR_APPEND ? " appending" : "");
72548 + return reqmode;
72549 + } else
72550 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72551 + {
72552 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72553 + reqmode & GR_READ ? " reading" : "",
72554 + reqmode & GR_WRITE ? " writing" : reqmode &
72555 + GR_APPEND ? " appending" : "");
72556 + return 0;
72557 + } else if (unlikely((mode & reqmode) != reqmode))
72558 + return 0;
72559 +
72560 + return reqmode;
72561 +}
72562 +
72563 +__u32
72564 +gr_acl_handle_creat(const struct dentry * dentry,
72565 + const struct dentry * p_dentry,
72566 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72567 + const int imode)
72568 +{
72569 + __u32 reqmode = GR_WRITE | GR_CREATE;
72570 + __u32 mode;
72571 +
72572 + if (acc_mode & MAY_APPEND)
72573 + reqmode |= GR_APPEND;
72574 + // if a directory was required or the directory already exists, then
72575 + // don't count this open as a read
72576 + if ((acc_mode & MAY_READ) &&
72577 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72578 + reqmode |= GR_READ;
72579 + if ((open_flags & O_CREAT) &&
72580 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72581 + reqmode |= GR_SETID;
72582 +
72583 + mode =
72584 + gr_check_create(dentry, p_dentry, p_mnt,
72585 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72586 +
72587 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72588 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72589 + reqmode & GR_READ ? " reading" : "",
72590 + reqmode & GR_WRITE ? " writing" : reqmode &
72591 + GR_APPEND ? " appending" : "");
72592 + return reqmode;
72593 + } else
72594 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72595 + {
72596 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72597 + reqmode & GR_READ ? " reading" : "",
72598 + reqmode & GR_WRITE ? " writing" : reqmode &
72599 + GR_APPEND ? " appending" : "");
72600 + return 0;
72601 + } else if (unlikely((mode & reqmode) != reqmode))
72602 + return 0;
72603 +
72604 + return reqmode;
72605 +}
72606 +
72607 +__u32
72608 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72609 + const int fmode)
72610 +{
72611 + __u32 mode, reqmode = GR_FIND;
72612 +
72613 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72614 + reqmode |= GR_EXEC;
72615 + if (fmode & S_IWOTH)
72616 + reqmode |= GR_WRITE;
72617 + if (fmode & S_IROTH)
72618 + reqmode |= GR_READ;
72619 +
72620 + mode =
72621 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72622 + mnt);
72623 +
72624 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72625 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72626 + reqmode & GR_READ ? " reading" : "",
72627 + reqmode & GR_WRITE ? " writing" : "",
72628 + reqmode & GR_EXEC ? " executing" : "");
72629 + return reqmode;
72630 + } else
72631 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72632 + {
72633 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72634 + reqmode & GR_READ ? " reading" : "",
72635 + reqmode & GR_WRITE ? " writing" : "",
72636 + reqmode & GR_EXEC ? " executing" : "");
72637 + return 0;
72638 + } else if (unlikely((mode & reqmode) != reqmode))
72639 + return 0;
72640 +
72641 + return reqmode;
72642 +}
72643 +
72644 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72645 +{
72646 + __u32 mode;
72647 +
72648 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72649 +
72650 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72651 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72652 + return mode;
72653 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72654 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72655 + return 0;
72656 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72657 + return 0;
72658 +
72659 + return (reqmode);
72660 +}
72661 +
72662 +__u32
72663 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72664 +{
72665 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72666 +}
72667 +
72668 +__u32
72669 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72670 +{
72671 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72672 +}
72673 +
72674 +__u32
72675 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72676 +{
72677 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72678 +}
72679 +
72680 +__u32
72681 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72682 +{
72683 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72684 +}
72685 +
72686 +__u32
72687 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72688 + umode_t *modeptr)
72689 +{
72690 + umode_t mode;
72691 +
72692 + *modeptr &= ~gr_acl_umask();
72693 + mode = *modeptr;
72694 +
72695 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72696 + return 1;
72697 +
72698 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72699 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72700 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72701 + GR_CHMOD_ACL_MSG);
72702 + } else {
72703 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72704 + }
72705 +}
72706 +
72707 +__u32
72708 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72709 +{
72710 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72711 +}
72712 +
72713 +__u32
72714 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72715 +{
72716 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72717 +}
72718 +
72719 +__u32
72720 +gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72721 +{
72722 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72723 +}
72724 +
72725 +__u32
72726 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72727 +{
72728 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72729 +}
72730 +
72731 +__u32
72732 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72733 +{
72734 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72735 + GR_UNIXCONNECT_ACL_MSG);
72736 +}
72737 +
72738 +/* hardlinks require at minimum create and link permission,
72739 + any additional privilege required is based on the
72740 + privilege of the file being linked to
72741 +*/
72742 +__u32
72743 +gr_acl_handle_link(const struct dentry * new_dentry,
72744 + const struct dentry * parent_dentry,
72745 + const struct vfsmount * parent_mnt,
72746 + const struct dentry * old_dentry,
72747 + const struct vfsmount * old_mnt, const struct filename *to)
72748 +{
72749 + __u32 mode;
72750 + __u32 needmode = GR_CREATE | GR_LINK;
72751 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72752 +
72753 + mode =
72754 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72755 + old_mnt);
72756 +
72757 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72758 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72759 + return mode;
72760 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72761 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72762 + return 0;
72763 + } else if (unlikely((mode & needmode) != needmode))
72764 + return 0;
72765 +
72766 + return 1;
72767 +}
72768 +
72769 +__u32
72770 +gr_acl_handle_symlink(const struct dentry * new_dentry,
72771 + const struct dentry * parent_dentry,
72772 + const struct vfsmount * parent_mnt, const struct filename *from)
72773 +{
72774 + __u32 needmode = GR_WRITE | GR_CREATE;
72775 + __u32 mode;
72776 +
72777 + mode =
72778 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
72779 + GR_CREATE | GR_AUDIT_CREATE |
72780 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72781 +
72782 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72783 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72784 + return mode;
72785 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72786 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72787 + return 0;
72788 + } else if (unlikely((mode & needmode) != needmode))
72789 + return 0;
72790 +
72791 + return (GR_WRITE | GR_CREATE);
72792 +}
72793 +
72794 +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)
72795 +{
72796 + __u32 mode;
72797 +
72798 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72799 +
72800 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72801 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72802 + return mode;
72803 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72804 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72805 + return 0;
72806 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
72807 + return 0;
72808 +
72809 + return (reqmode);
72810 +}
72811 +
72812 +__u32
72813 +gr_acl_handle_mknod(const struct dentry * new_dentry,
72814 + const struct dentry * parent_dentry,
72815 + const struct vfsmount * parent_mnt,
72816 + const int mode)
72817 +{
72818 + __u32 reqmode = GR_WRITE | GR_CREATE;
72819 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72820 + reqmode |= GR_SETID;
72821 +
72822 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72823 + reqmode, GR_MKNOD_ACL_MSG);
72824 +}
72825 +
72826 +__u32
72827 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
72828 + const struct dentry *parent_dentry,
72829 + const struct vfsmount *parent_mnt)
72830 +{
72831 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72832 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72833 +}
72834 +
72835 +#define RENAME_CHECK_SUCCESS(old, new) \
72836 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72837 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72838 +
72839 +int
72840 +gr_acl_handle_rename(struct dentry *new_dentry,
72841 + struct dentry *parent_dentry,
72842 + const struct vfsmount *parent_mnt,
72843 + struct dentry *old_dentry,
72844 + struct inode *old_parent_inode,
72845 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72846 +{
72847 + __u32 comp1, comp2;
72848 + int error = 0;
72849 +
72850 + if (unlikely(!gr_acl_is_enabled()))
72851 + return 0;
72852 +
72853 + if (flags & RENAME_EXCHANGE) {
72854 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72855 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72856 + GR_SUPPRESS, parent_mnt);
72857 + comp2 =
72858 + gr_search_file(old_dentry,
72859 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72860 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72861 + } else if (d_is_negative(new_dentry)) {
72862 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
72863 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
72864 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
72865 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
72866 + GR_DELETE | GR_AUDIT_DELETE |
72867 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72868 + GR_SUPPRESS, old_mnt);
72869 + } else {
72870 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72871 + GR_CREATE | GR_DELETE |
72872 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
72873 + GR_AUDIT_READ | GR_AUDIT_WRITE |
72874 + GR_SUPPRESS, parent_mnt);
72875 + comp2 =
72876 + gr_search_file(old_dentry,
72877 + GR_READ | GR_WRITE | GR_AUDIT_READ |
72878 + GR_DELETE | GR_AUDIT_DELETE |
72879 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72880 + }
72881 +
72882 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
72883 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
72884 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72885 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
72886 + && !(comp2 & GR_SUPPRESS)) {
72887 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72888 + error = -EACCES;
72889 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
72890 + error = -EACCES;
72891 +
72892 + return error;
72893 +}
72894 +
72895 +void
72896 +gr_acl_handle_exit(void)
72897 +{
72898 + u16 id;
72899 + char *rolename;
72900 +
72901 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
72902 + !(current->role->roletype & GR_ROLE_PERSIST))) {
72903 + id = current->acl_role_id;
72904 + rolename = current->role->rolename;
72905 + gr_set_acls(1);
72906 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
72907 + }
72908 +
72909 + gr_put_exec_file(current);
72910 + return;
72911 +}
72912 +
72913 +int
72914 +gr_acl_handle_procpidmem(const struct task_struct *task)
72915 +{
72916 + if (unlikely(!gr_acl_is_enabled()))
72917 + return 0;
72918 +
72919 + if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
72920 + !(current->acl->mode & GR_POVERRIDE) &&
72921 + !(current->role->roletype & GR_ROLE_GOD))
72922 + return -EACCES;
72923 +
72924 + return 0;
72925 +}
72926 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
72927 new file mode 100644
72928 index 0000000..f056b81
72929 --- /dev/null
72930 +++ b/grsecurity/gracl_ip.c
72931 @@ -0,0 +1,386 @@
72932 +#include <linux/kernel.h>
72933 +#include <asm/uaccess.h>
72934 +#include <asm/errno.h>
72935 +#include <net/sock.h>
72936 +#include <linux/file.h>
72937 +#include <linux/fs.h>
72938 +#include <linux/net.h>
72939 +#include <linux/in.h>
72940 +#include <linux/skbuff.h>
72941 +#include <linux/ip.h>
72942 +#include <linux/udp.h>
72943 +#include <linux/types.h>
72944 +#include <linux/sched.h>
72945 +#include <linux/netdevice.h>
72946 +#include <linux/inetdevice.h>
72947 +#include <linux/gracl.h>
72948 +#include <linux/grsecurity.h>
72949 +#include <linux/grinternal.h>
72950 +
72951 +#define GR_BIND 0x01
72952 +#define GR_CONNECT 0x02
72953 +#define GR_INVERT 0x04
72954 +#define GR_BINDOVERRIDE 0x08
72955 +#define GR_CONNECTOVERRIDE 0x10
72956 +#define GR_SOCK_FAMILY 0x20
72957 +
72958 +static const char * gr_protocols[IPPROTO_MAX] = {
72959 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
72960 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
72961 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
72962 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
72963 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
72964 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
72965 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
72966 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
72967 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
72968 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
72969 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
72970 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
72971 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
72972 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
72973 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
72974 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
72975 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
72976 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
72977 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
72978 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
72979 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
72980 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
72981 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
72982 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
72983 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
72984 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
72985 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
72986 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
72987 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
72988 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
72989 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
72990 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
72991 + };
72992 +
72993 +static const char * gr_socktypes[SOCK_MAX] = {
72994 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
72995 + "unknown:7", "unknown:8", "unknown:9", "packet"
72996 + };
72997 +
72998 +static const char * gr_sockfamilies[AF_MAX+1] = {
72999 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
73000 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
73001 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
73002 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
73003 + };
73004 +
73005 +const char *
73006 +gr_proto_to_name(unsigned char proto)
73007 +{
73008 + return gr_protocols[proto];
73009 +}
73010 +
73011 +const char *
73012 +gr_socktype_to_name(unsigned char type)
73013 +{
73014 + return gr_socktypes[type];
73015 +}
73016 +
73017 +const char *
73018 +gr_sockfamily_to_name(unsigned char family)
73019 +{
73020 + return gr_sockfamilies[family];
73021 +}
73022 +
73023 +extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
73024 +
73025 +int
73026 +gr_search_socket(const int domain, const int type, const int protocol)
73027 +{
73028 + struct acl_subject_label *curr;
73029 + const struct cred *cred = current_cred();
73030 +
73031 + if (unlikely(!gr_acl_is_enabled()))
73032 + goto exit;
73033 +
73034 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
73035 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
73036 + goto exit; // let the kernel handle it
73037 +
73038 + curr = current->acl;
73039 +
73040 + if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
73041 + /* the family is allowed, if this is PF_INET allow it only if
73042 + the extra sock type/protocol checks pass */
73043 + if (domain == PF_INET)
73044 + goto inet_check;
73045 + goto exit;
73046 + } else {
73047 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73048 + __u32 fakeip = 0;
73049 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73050 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
73051 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73052 + gr_to_filename(current->exec_file->f_path.dentry,
73053 + current->exec_file->f_path.mnt) :
73054 + curr->filename, curr->filename,
73055 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
73056 + &current->signal->saved_ip);
73057 + goto exit;
73058 + }
73059 + goto exit_fail;
73060 + }
73061 +
73062 +inet_check:
73063 + /* the rest of this checking is for IPv4 only */
73064 + if (!curr->ips)
73065 + goto exit;
73066 +
73067 + if ((curr->ip_type & (1U << type)) &&
73068 + (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
73069 + goto exit;
73070 +
73071 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73072 + /* we don't place acls on raw sockets , and sometimes
73073 + dgram/ip sockets are opened for ioctl and not
73074 + bind/connect, so we'll fake a bind learn log */
73075 + if (type == SOCK_RAW || type == SOCK_PACKET) {
73076 + __u32 fakeip = 0;
73077 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73078 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
73079 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73080 + gr_to_filename(current->exec_file->f_path.dentry,
73081 + current->exec_file->f_path.mnt) :
73082 + curr->filename, curr->filename,
73083 + &fakeip, 0, type,
73084 + protocol, GR_CONNECT, &current->signal->saved_ip);
73085 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
73086 + __u32 fakeip = 0;
73087 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73088 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
73089 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73090 + gr_to_filename(current->exec_file->f_path.dentry,
73091 + current->exec_file->f_path.mnt) :
73092 + curr->filename, curr->filename,
73093 + &fakeip, 0, type,
73094 + protocol, GR_BIND, &current->signal->saved_ip);
73095 + }
73096 + /* we'll log when they use connect or bind */
73097 + goto exit;
73098 + }
73099 +
73100 +exit_fail:
73101 + if (domain == PF_INET)
73102 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73103 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
73104 + else if (rcu_access_pointer(net_families[domain]) != NULL)
73105 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73106 + gr_socktype_to_name(type), protocol);
73107 +
73108 + return 0;
73109 +exit:
73110 + return 1;
73111 +}
73112 +
73113 +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)
73114 +{
73115 + if ((ip->mode & mode) &&
73116 + (ip_port >= ip->low) &&
73117 + (ip_port <= ip->high) &&
73118 + ((ntohl(ip_addr) & our_netmask) ==
73119 + (ntohl(our_addr) & our_netmask))
73120 + && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73121 + && (ip->type & (1U << type))) {
73122 + if (ip->mode & GR_INVERT)
73123 + return 2; // specifically denied
73124 + else
73125 + return 1; // allowed
73126 + }
73127 +
73128 + return 0; // not specifically allowed, may continue parsing
73129 +}
73130 +
73131 +static int
73132 +gr_search_connectbind(const int full_mode, struct sock *sk,
73133 + struct sockaddr_in *addr, const int type)
73134 +{
73135 + char iface[IFNAMSIZ] = {0};
73136 + struct acl_subject_label *curr;
73137 + struct acl_ip_label *ip;
73138 + struct inet_sock *isk;
73139 + struct net_device *dev;
73140 + struct in_device *idev;
73141 + unsigned long i;
73142 + int ret;
73143 + int mode = full_mode & (GR_BIND | GR_CONNECT);
73144 + __u32 ip_addr = 0;
73145 + __u32 our_addr;
73146 + __u32 our_netmask;
73147 + char *p;
73148 + __u16 ip_port = 0;
73149 + const struct cred *cred = current_cred();
73150 +
73151 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73152 + return 0;
73153 +
73154 + curr = current->acl;
73155 + isk = inet_sk(sk);
73156 +
73157 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73158 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73159 + addr->sin_addr.s_addr = curr->inaddr_any_override;
73160 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73161 + struct sockaddr_in saddr;
73162 + int err;
73163 +
73164 + saddr.sin_family = AF_INET;
73165 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
73166 + saddr.sin_port = isk->inet_sport;
73167 +
73168 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73169 + if (err)
73170 + return err;
73171 +
73172 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73173 + if (err)
73174 + return err;
73175 + }
73176 +
73177 + if (!curr->ips)
73178 + return 0;
73179 +
73180 + ip_addr = addr->sin_addr.s_addr;
73181 + ip_port = ntohs(addr->sin_port);
73182 +
73183 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73184 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73185 + current->role->roletype, GR_GLOBAL_UID(cred->uid),
73186 + GR_GLOBAL_GID(cred->gid), current->exec_file ?
73187 + gr_to_filename(current->exec_file->f_path.dentry,
73188 + current->exec_file->f_path.mnt) :
73189 + curr->filename, curr->filename,
73190 + &ip_addr, ip_port, type,
73191 + sk->sk_protocol, mode, &current->signal->saved_ip);
73192 + return 0;
73193 + }
73194 +
73195 + for (i = 0; i < curr->ip_num; i++) {
73196 + ip = *(curr->ips + i);
73197 + if (ip->iface != NULL) {
73198 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
73199 + p = strchr(iface, ':');
73200 + if (p != NULL)
73201 + *p = '\0';
73202 + dev = dev_get_by_name(sock_net(sk), iface);
73203 + if (dev == NULL)
73204 + continue;
73205 + idev = in_dev_get(dev);
73206 + if (idev == NULL) {
73207 + dev_put(dev);
73208 + continue;
73209 + }
73210 + rcu_read_lock();
73211 + for_ifa(idev) {
73212 + if (!strcmp(ip->iface, ifa->ifa_label)) {
73213 + our_addr = ifa->ifa_address;
73214 + our_netmask = 0xffffffff;
73215 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73216 + if (ret == 1) {
73217 + rcu_read_unlock();
73218 + in_dev_put(idev);
73219 + dev_put(dev);
73220 + return 0;
73221 + } else if (ret == 2) {
73222 + rcu_read_unlock();
73223 + in_dev_put(idev);
73224 + dev_put(dev);
73225 + goto denied;
73226 + }
73227 + }
73228 + } endfor_ifa(idev);
73229 + rcu_read_unlock();
73230 + in_dev_put(idev);
73231 + dev_put(dev);
73232 + } else {
73233 + our_addr = ip->addr;
73234 + our_netmask = ip->netmask;
73235 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73236 + if (ret == 1)
73237 + return 0;
73238 + else if (ret == 2)
73239 + goto denied;
73240 + }
73241 + }
73242 +
73243 +denied:
73244 + if (mode == GR_BIND)
73245 + 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));
73246 + else if (mode == GR_CONNECT)
73247 + 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));
73248 +
73249 + return -EACCES;
73250 +}
73251 +
73252 +int
73253 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73254 +{
73255 + /* always allow disconnection of dgram sockets with connect */
73256 + if (addr->sin_family == AF_UNSPEC)
73257 + return 0;
73258 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73259 +}
73260 +
73261 +int
73262 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73263 +{
73264 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73265 +}
73266 +
73267 +int gr_search_listen(struct socket *sock)
73268 +{
73269 + struct sock *sk = sock->sk;
73270 + struct sockaddr_in addr;
73271 +
73272 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73273 + addr.sin_port = inet_sk(sk)->inet_sport;
73274 +
73275 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73276 +}
73277 +
73278 +int gr_search_accept(struct socket *sock)
73279 +{
73280 + struct sock *sk = sock->sk;
73281 + struct sockaddr_in addr;
73282 +
73283 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73284 + addr.sin_port = inet_sk(sk)->inet_sport;
73285 +
73286 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73287 +}
73288 +
73289 +int
73290 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73291 +{
73292 + if (addr)
73293 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73294 + else {
73295 + struct sockaddr_in sin;
73296 + const struct inet_sock *inet = inet_sk(sk);
73297 +
73298 + sin.sin_addr.s_addr = inet->inet_daddr;
73299 + sin.sin_port = inet->inet_dport;
73300 +
73301 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73302 + }
73303 +}
73304 +
73305 +int
73306 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73307 +{
73308 + struct sockaddr_in sin;
73309 +
73310 + if (unlikely(skb->len < sizeof (struct udphdr)))
73311 + return 0; // skip this packet
73312 +
73313 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73314 + sin.sin_port = udp_hdr(skb)->source;
73315 +
73316 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73317 +}
73318 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73319 new file mode 100644
73320 index 0000000..25f54ef
73321 --- /dev/null
73322 +++ b/grsecurity/gracl_learn.c
73323 @@ -0,0 +1,207 @@
73324 +#include <linux/kernel.h>
73325 +#include <linux/mm.h>
73326 +#include <linux/sched.h>
73327 +#include <linux/poll.h>
73328 +#include <linux/string.h>
73329 +#include <linux/file.h>
73330 +#include <linux/types.h>
73331 +#include <linux/vmalloc.h>
73332 +#include <linux/grinternal.h>
73333 +
73334 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73335 + size_t count, loff_t *ppos);
73336 +extern int gr_acl_is_enabled(void);
73337 +
73338 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73339 +static int gr_learn_attached;
73340 +
73341 +/* use a 512k buffer */
73342 +#define LEARN_BUFFER_SIZE (512 * 1024)
73343 +
73344 +static DEFINE_SPINLOCK(gr_learn_lock);
73345 +static DEFINE_MUTEX(gr_learn_user_mutex);
73346 +
73347 +/* we need to maintain two buffers, so that the kernel context of grlearn
73348 + uses a semaphore around the userspace copying, and the other kernel contexts
73349 + use a spinlock when copying into the buffer, since they cannot sleep
73350 +*/
73351 +static char *learn_buffer;
73352 +static char *learn_buffer_user;
73353 +static int learn_buffer_len;
73354 +static int learn_buffer_user_len;
73355 +
73356 +static ssize_t
73357 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73358 +{
73359 + DECLARE_WAITQUEUE(wait, current);
73360 + ssize_t retval = 0;
73361 +
73362 + add_wait_queue(&learn_wait, &wait);
73363 + set_current_state(TASK_INTERRUPTIBLE);
73364 + do {
73365 + mutex_lock(&gr_learn_user_mutex);
73366 + spin_lock(&gr_learn_lock);
73367 + if (learn_buffer_len)
73368 + break;
73369 + spin_unlock(&gr_learn_lock);
73370 + mutex_unlock(&gr_learn_user_mutex);
73371 + if (file->f_flags & O_NONBLOCK) {
73372 + retval = -EAGAIN;
73373 + goto out;
73374 + }
73375 + if (signal_pending(current)) {
73376 + retval = -ERESTARTSYS;
73377 + goto out;
73378 + }
73379 +
73380 + schedule();
73381 + } while (1);
73382 +
73383 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73384 + learn_buffer_user_len = learn_buffer_len;
73385 + retval = learn_buffer_len;
73386 + learn_buffer_len = 0;
73387 +
73388 + spin_unlock(&gr_learn_lock);
73389 +
73390 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73391 + retval = -EFAULT;
73392 +
73393 + mutex_unlock(&gr_learn_user_mutex);
73394 +out:
73395 + set_current_state(TASK_RUNNING);
73396 + remove_wait_queue(&learn_wait, &wait);
73397 + return retval;
73398 +}
73399 +
73400 +static unsigned int
73401 +poll_learn(struct file * file, poll_table * wait)
73402 +{
73403 + poll_wait(file, &learn_wait, wait);
73404 +
73405 + if (learn_buffer_len)
73406 + return (POLLIN | POLLRDNORM);
73407 +
73408 + return 0;
73409 +}
73410 +
73411 +void
73412 +gr_clear_learn_entries(void)
73413 +{
73414 + char *tmp;
73415 +
73416 + mutex_lock(&gr_learn_user_mutex);
73417 + spin_lock(&gr_learn_lock);
73418 + tmp = learn_buffer;
73419 + learn_buffer = NULL;
73420 + spin_unlock(&gr_learn_lock);
73421 + if (tmp)
73422 + vfree(tmp);
73423 + if (learn_buffer_user != NULL) {
73424 + vfree(learn_buffer_user);
73425 + learn_buffer_user = NULL;
73426 + }
73427 + learn_buffer_len = 0;
73428 + mutex_unlock(&gr_learn_user_mutex);
73429 +
73430 + return;
73431 +}
73432 +
73433 +void
73434 +gr_add_learn_entry(const char *fmt, ...)
73435 +{
73436 + va_list args;
73437 + unsigned int len;
73438 +
73439 + if (!gr_learn_attached)
73440 + return;
73441 +
73442 + spin_lock(&gr_learn_lock);
73443 +
73444 + /* leave a gap at the end so we know when it's "full" but don't have to
73445 + compute the exact length of the string we're trying to append
73446 + */
73447 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73448 + spin_unlock(&gr_learn_lock);
73449 + wake_up_interruptible(&learn_wait);
73450 + return;
73451 + }
73452 + if (learn_buffer == NULL) {
73453 + spin_unlock(&gr_learn_lock);
73454 + return;
73455 + }
73456 +
73457 + va_start(args, fmt);
73458 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73459 + va_end(args);
73460 +
73461 + learn_buffer_len += len + 1;
73462 +
73463 + spin_unlock(&gr_learn_lock);
73464 + wake_up_interruptible(&learn_wait);
73465 +
73466 + return;
73467 +}
73468 +
73469 +static int
73470 +open_learn(struct inode *inode, struct file *file)
73471 +{
73472 + if (file->f_mode & FMODE_READ && gr_learn_attached)
73473 + return -EBUSY;
73474 + if (file->f_mode & FMODE_READ) {
73475 + int retval = 0;
73476 + mutex_lock(&gr_learn_user_mutex);
73477 + if (learn_buffer == NULL)
73478 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73479 + if (learn_buffer_user == NULL)
73480 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73481 + if (learn_buffer == NULL) {
73482 + retval = -ENOMEM;
73483 + goto out_error;
73484 + }
73485 + if (learn_buffer_user == NULL) {
73486 + retval = -ENOMEM;
73487 + goto out_error;
73488 + }
73489 + learn_buffer_len = 0;
73490 + learn_buffer_user_len = 0;
73491 + gr_learn_attached = 1;
73492 +out_error:
73493 + mutex_unlock(&gr_learn_user_mutex);
73494 + return retval;
73495 + }
73496 + return 0;
73497 +}
73498 +
73499 +static int
73500 +close_learn(struct inode *inode, struct file *file)
73501 +{
73502 + if (file->f_mode & FMODE_READ) {
73503 + char *tmp = NULL;
73504 + mutex_lock(&gr_learn_user_mutex);
73505 + spin_lock(&gr_learn_lock);
73506 + tmp = learn_buffer;
73507 + learn_buffer = NULL;
73508 + spin_unlock(&gr_learn_lock);
73509 + if (tmp)
73510 + vfree(tmp);
73511 + if (learn_buffer_user != NULL) {
73512 + vfree(learn_buffer_user);
73513 + learn_buffer_user = NULL;
73514 + }
73515 + learn_buffer_len = 0;
73516 + learn_buffer_user_len = 0;
73517 + gr_learn_attached = 0;
73518 + mutex_unlock(&gr_learn_user_mutex);
73519 + }
73520 +
73521 + return 0;
73522 +}
73523 +
73524 +const struct file_operations grsec_fops = {
73525 + .read = read_learn,
73526 + .write = write_grsec_handler,
73527 + .open = open_learn,
73528 + .release = close_learn,
73529 + .poll = poll_learn,
73530 +};
73531 diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73532 new file mode 100644
73533 index 0000000..3f8ade0
73534 --- /dev/null
73535 +++ b/grsecurity/gracl_policy.c
73536 @@ -0,0 +1,1782 @@
73537 +#include <linux/kernel.h>
73538 +#include <linux/module.h>
73539 +#include <linux/sched.h>
73540 +#include <linux/mm.h>
73541 +#include <linux/file.h>
73542 +#include <linux/fs.h>
73543 +#include <linux/namei.h>
73544 +#include <linux/mount.h>
73545 +#include <linux/tty.h>
73546 +#include <linux/proc_fs.h>
73547 +#include <linux/lglock.h>
73548 +#include <linux/slab.h>
73549 +#include <linux/vmalloc.h>
73550 +#include <linux/types.h>
73551 +#include <linux/sysctl.h>
73552 +#include <linux/netdevice.h>
73553 +#include <linux/ptrace.h>
73554 +#include <linux/gracl.h>
73555 +#include <linux/gralloc.h>
73556 +#include <linux/security.h>
73557 +#include <linux/grinternal.h>
73558 +#include <linux/pid_namespace.h>
73559 +#include <linux/stop_machine.h>
73560 +#include <linux/fdtable.h>
73561 +#include <linux/percpu.h>
73562 +#include <linux/lglock.h>
73563 +#include <linux/hugetlb.h>
73564 +#include <linux/posix-timers.h>
73565 +#include "../fs/mount.h"
73566 +
73567 +#include <asm/uaccess.h>
73568 +#include <asm/errno.h>
73569 +#include <asm/mman.h>
73570 +
73571 +extern struct gr_policy_state *polstate;
73572 +
73573 +#define FOR_EACH_ROLE_START(role) \
73574 + role = polstate->role_list; \
73575 + while (role) {
73576 +
73577 +#define FOR_EACH_ROLE_END(role) \
73578 + role = role->prev; \
73579 + }
73580 +
73581 +struct path gr_real_root;
73582 +
73583 +extern struct gr_alloc_state *current_alloc_state;
73584 +
73585 +u16 acl_sp_role_value;
73586 +
73587 +static DEFINE_MUTEX(gr_dev_mutex);
73588 +
73589 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73590 +extern void gr_clear_learn_entries(void);
73591 +
73592 +struct gr_arg *gr_usermode __read_only;
73593 +unsigned char *gr_system_salt __read_only;
73594 +unsigned char *gr_system_sum __read_only;
73595 +
73596 +static unsigned int gr_auth_attempts = 0;
73597 +static unsigned long gr_auth_expires = 0UL;
73598 +
73599 +struct acl_object_label *fakefs_obj_rw;
73600 +struct acl_object_label *fakefs_obj_rwx;
73601 +
73602 +extern int gr_init_uidset(void);
73603 +extern void gr_free_uidset(void);
73604 +extern void gr_remove_uid(uid_t uid);
73605 +extern int gr_find_uid(uid_t uid);
73606 +
73607 +extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
73608 +extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73609 +extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73610 +extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73611 +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);
73612 +extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73613 +extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73614 +extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73615 +extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73616 +extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73617 +extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73618 +extern void assign_special_role(const char *rolename);
73619 +extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73620 +extern int gr_rbac_disable(void *unused);
73621 +extern void gr_enable_rbac_system(void);
73622 +
73623 +static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73624 +{
73625 + if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73626 + return -EFAULT;
73627 +
73628 + return 0;
73629 +}
73630 +
73631 +static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73632 +{
73633 + if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73634 + return -EFAULT;
73635 +
73636 + return 0;
73637 +}
73638 +
73639 +static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73640 +{
73641 + if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73642 + return -EFAULT;
73643 +
73644 + return 0;
73645 +}
73646 +
73647 +static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73648 +{
73649 + if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73650 + return -EFAULT;
73651 +
73652 + return 0;
73653 +}
73654 +
73655 +static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73656 +{
73657 + if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73658 + return -EFAULT;
73659 +
73660 + return 0;
73661 +}
73662 +
73663 +static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73664 +{
73665 + if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73666 + return -EFAULT;
73667 +
73668 + return 0;
73669 +}
73670 +
73671 +static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73672 +{
73673 + if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73674 + return -EFAULT;
73675 +
73676 + return 0;
73677 +}
73678 +
73679 +static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73680 +{
73681 + if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73682 + return -EFAULT;
73683 +
73684 + return 0;
73685 +}
73686 +
73687 +int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73688 +{
73689 + if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73690 + return -EFAULT;
73691 +
73692 + return 0;
73693 +}
73694 +
73695 +static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73696 +{
73697 + if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73698 + return -EFAULT;
73699 +
73700 + if (((uwrap->version != GRSECURITY_VERSION) &&
73701 + (uwrap->version != 0x2901)) ||
73702 + (uwrap->size != sizeof(struct gr_arg)))
73703 + return -EINVAL;
73704 +
73705 + return 0;
73706 +}
73707 +
73708 +static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73709 +{
73710 + if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73711 + return -EFAULT;
73712 +
73713 + return 0;
73714 +}
73715 +
73716 +static size_t get_gr_arg_wrapper_size_normal(void)
73717 +{
73718 + return sizeof(struct gr_arg_wrapper);
73719 +}
73720 +
73721 +#ifdef CONFIG_COMPAT
73722 +extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73723 +extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73724 +extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73725 +extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73726 +extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73727 +extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73728 +extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73729 +extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73730 +extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73731 +extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73732 +extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73733 +extern size_t get_gr_arg_wrapper_size_compat(void);
73734 +
73735 +int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73736 +int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73737 +int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73738 +int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73739 +int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73740 +int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73741 +int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73742 +int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73743 +int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73744 +int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73745 +int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73746 +size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73747 +
73748 +#else
73749 +#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73750 +#define copy_gr_arg copy_gr_arg_normal
73751 +#define copy_gr_hash_struct copy_gr_hash_struct_normal
73752 +#define copy_acl_object_label copy_acl_object_label_normal
73753 +#define copy_acl_subject_label copy_acl_subject_label_normal
73754 +#define copy_acl_role_label copy_acl_role_label_normal
73755 +#define copy_acl_ip_label copy_acl_ip_label_normal
73756 +#define copy_pointer_from_array copy_pointer_from_array_normal
73757 +#define copy_sprole_pw copy_sprole_pw_normal
73758 +#define copy_role_transition copy_role_transition_normal
73759 +#define copy_role_allowed_ip copy_role_allowed_ip_normal
73760 +#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73761 +#endif
73762 +
73763 +static struct acl_subject_label *
73764 +lookup_subject_map(const struct acl_subject_label *userp)
73765 +{
73766 + unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73767 + struct subject_map *match;
73768 +
73769 + match = polstate->subj_map_set.s_hash[index];
73770 +
73771 + while (match && match->user != userp)
73772 + match = match->next;
73773 +
73774 + if (match != NULL)
73775 + return match->kernel;
73776 + else
73777 + return NULL;
73778 +}
73779 +
73780 +static void
73781 +insert_subj_map_entry(struct subject_map *subjmap)
73782 +{
73783 + unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73784 + struct subject_map **curr;
73785 +
73786 + subjmap->prev = NULL;
73787 +
73788 + curr = &polstate->subj_map_set.s_hash[index];
73789 + if (*curr != NULL)
73790 + (*curr)->prev = subjmap;
73791 +
73792 + subjmap->next = *curr;
73793 + *curr = subjmap;
73794 +
73795 + return;
73796 +}
73797 +
73798 +static void
73799 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73800 +{
73801 + unsigned int index =
73802 + gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73803 + struct acl_role_label **curr;
73804 + struct acl_role_label *tmp, *tmp2;
73805 +
73806 + curr = &polstate->acl_role_set.r_hash[index];
73807 +
73808 + /* simple case, slot is empty, just set it to our role */
73809 + if (*curr == NULL) {
73810 + *curr = role;
73811 + } else {
73812 + /* example:
73813 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
73814 + 2 -> 3
73815 + */
73816 + /* first check to see if we can already be reached via this slot */
73817 + tmp = *curr;
73818 + while (tmp && tmp != role)
73819 + tmp = tmp->next;
73820 + if (tmp == role) {
73821 + /* we don't need to add ourselves to this slot's chain */
73822 + return;
73823 + }
73824 + /* we need to add ourselves to this chain, two cases */
73825 + if (role->next == NULL) {
73826 + /* simple case, append the current chain to our role */
73827 + role->next = *curr;
73828 + *curr = role;
73829 + } else {
73830 + /* 1 -> 2 -> 3 -> 4
73831 + 2 -> 3 -> 4
73832 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73833 + */
73834 + /* trickier case: walk our role's chain until we find
73835 + the role for the start of the current slot's chain */
73836 + tmp = role;
73837 + tmp2 = *curr;
73838 + while (tmp->next && tmp->next != tmp2)
73839 + tmp = tmp->next;
73840 + if (tmp->next == tmp2) {
73841 + /* from example above, we found 3, so just
73842 + replace this slot's chain with ours */
73843 + *curr = role;
73844 + } else {
73845 + /* we didn't find a subset of our role's chain
73846 + in the current slot's chain, so append their
73847 + chain to ours, and set us as the first role in
73848 + the slot's chain
73849 +
73850 + we could fold this case with the case above,
73851 + but making it explicit for clarity
73852 + */
73853 + tmp->next = tmp2;
73854 + *curr = role;
73855 + }
73856 + }
73857 + }
73858 +
73859 + return;
73860 +}
73861 +
73862 +static void
73863 +insert_acl_role_label(struct acl_role_label *role)
73864 +{
73865 + int i;
73866 +
73867 + if (polstate->role_list == NULL) {
73868 + polstate->role_list = role;
73869 + role->prev = NULL;
73870 + } else {
73871 + role->prev = polstate->role_list;
73872 + polstate->role_list = role;
73873 + }
73874 +
73875 + /* used for hash chains */
73876 + role->next = NULL;
73877 +
73878 + if (role->roletype & GR_ROLE_DOMAIN) {
73879 + for (i = 0; i < role->domain_child_num; i++)
73880 + __insert_acl_role_label(role, role->domain_children[i]);
73881 + } else
73882 + __insert_acl_role_label(role, role->uidgid);
73883 +}
73884 +
73885 +static int
73886 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
73887 +{
73888 + struct name_entry **curr, *nentry;
73889 + struct inodev_entry *ientry;
73890 + unsigned int len = strlen(name);
73891 + unsigned int key = full_name_hash(name, len);
73892 + unsigned int index = key % polstate->name_set.n_size;
73893 +
73894 + curr = &polstate->name_set.n_hash[index];
73895 +
73896 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
73897 + curr = &((*curr)->next);
73898 +
73899 + if (*curr != NULL)
73900 + return 1;
73901 +
73902 + nentry = acl_alloc(sizeof (struct name_entry));
73903 + if (nentry == NULL)
73904 + return 0;
73905 + ientry = acl_alloc(sizeof (struct inodev_entry));
73906 + if (ientry == NULL)
73907 + return 0;
73908 + ientry->nentry = nentry;
73909 +
73910 + nentry->key = key;
73911 + nentry->name = name;
73912 + nentry->inode = inode;
73913 + nentry->device = device;
73914 + nentry->len = len;
73915 + nentry->deleted = deleted;
73916 +
73917 + nentry->prev = NULL;
73918 + curr = &polstate->name_set.n_hash[index];
73919 + if (*curr != NULL)
73920 + (*curr)->prev = nentry;
73921 + nentry->next = *curr;
73922 + *curr = nentry;
73923 +
73924 + /* insert us into the table searchable by inode/dev */
73925 + __insert_inodev_entry(polstate, ientry);
73926 +
73927 + return 1;
73928 +}
73929 +
73930 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
73931 +
73932 +static void *
73933 +create_table(__u32 * len, int elementsize)
73934 +{
73935 + unsigned int table_sizes[] = {
73936 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
73937 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
73938 + 4194301, 8388593, 16777213, 33554393, 67108859
73939 + };
73940 + void *newtable = NULL;
73941 + unsigned int pwr = 0;
73942 +
73943 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
73944 + table_sizes[pwr] <= *len)
73945 + pwr++;
73946 +
73947 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
73948 + return newtable;
73949 +
73950 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
73951 + newtable =
73952 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
73953 + else
73954 + newtable = vmalloc(table_sizes[pwr] * elementsize);
73955 +
73956 + *len = table_sizes[pwr];
73957 +
73958 + return newtable;
73959 +}
73960 +
73961 +static int
73962 +init_variables(const struct gr_arg *arg, bool reload)
73963 +{
73964 + struct task_struct *reaper = init_pid_ns.child_reaper;
73965 + unsigned int stacksize;
73966 +
73967 + polstate->subj_map_set.s_size = arg->role_db.num_subjects;
73968 + polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
73969 + polstate->name_set.n_size = arg->role_db.num_objects;
73970 + polstate->inodev_set.i_size = arg->role_db.num_objects;
73971 +
73972 + if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
73973 + !polstate->name_set.n_size || !polstate->inodev_set.i_size)
73974 + return 1;
73975 +
73976 + if (!reload) {
73977 + if (!gr_init_uidset())
73978 + return 1;
73979 + }
73980 +
73981 + /* set up the stack that holds allocation info */
73982 +
73983 + stacksize = arg->role_db.num_pointers + 5;
73984 +
73985 + if (!acl_alloc_stack_init(stacksize))
73986 + return 1;
73987 +
73988 + if (!reload) {
73989 + /* grab reference for the real root dentry and vfsmount */
73990 + get_fs_root(reaper->fs, &gr_real_root);
73991 +
73992 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
73993 + 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);
73994 +#endif
73995 +
73996 + fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73997 + if (fakefs_obj_rw == NULL)
73998 + return 1;
73999 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
74000 +
74001 + fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
74002 + if (fakefs_obj_rwx == NULL)
74003 + return 1;
74004 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
74005 + }
74006 +
74007 + polstate->subj_map_set.s_hash =
74008 + (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
74009 + polstate->acl_role_set.r_hash =
74010 + (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
74011 + polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
74012 + polstate->inodev_set.i_hash =
74013 + (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
74014 +
74015 + if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
74016 + !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
74017 + return 1;
74018 +
74019 + memset(polstate->subj_map_set.s_hash, 0,
74020 + sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
74021 + memset(polstate->acl_role_set.r_hash, 0,
74022 + sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
74023 + memset(polstate->name_set.n_hash, 0,
74024 + sizeof (struct name_entry *) * polstate->name_set.n_size);
74025 + memset(polstate->inodev_set.i_hash, 0,
74026 + sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
74027 +
74028 + return 0;
74029 +}
74030 +
74031 +/* free information not needed after startup
74032 + currently contains user->kernel pointer mappings for subjects
74033 +*/
74034 +
74035 +static void
74036 +free_init_variables(void)
74037 +{
74038 + __u32 i;
74039 +
74040 + if (polstate->subj_map_set.s_hash) {
74041 + for (i = 0; i < polstate->subj_map_set.s_size; i++) {
74042 + if (polstate->subj_map_set.s_hash[i]) {
74043 + kfree(polstate->subj_map_set.s_hash[i]);
74044 + polstate->subj_map_set.s_hash[i] = NULL;
74045 + }
74046 + }
74047 +
74048 + if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
74049 + PAGE_SIZE)
74050 + kfree(polstate->subj_map_set.s_hash);
74051 + else
74052 + vfree(polstate->subj_map_set.s_hash);
74053 + }
74054 +
74055 + return;
74056 +}
74057 +
74058 +static void
74059 +free_variables(bool reload)
74060 +{
74061 + struct acl_subject_label *s;
74062 + struct acl_role_label *r;
74063 + struct task_struct *task, *task2;
74064 + unsigned int x;
74065 +
74066 + if (!reload) {
74067 + gr_clear_learn_entries();
74068 +
74069 + read_lock(&tasklist_lock);
74070 + do_each_thread(task2, task) {
74071 + task->acl_sp_role = 0;
74072 + task->acl_role_id = 0;
74073 + task->inherited = 0;
74074 + task->acl = NULL;
74075 + task->role = NULL;
74076 + } while_each_thread(task2, task);
74077 + read_unlock(&tasklist_lock);
74078 +
74079 + kfree(fakefs_obj_rw);
74080 + fakefs_obj_rw = NULL;
74081 + kfree(fakefs_obj_rwx);
74082 + fakefs_obj_rwx = NULL;
74083 +
74084 + /* release the reference to the real root dentry and vfsmount */
74085 + path_put(&gr_real_root);
74086 + memset(&gr_real_root, 0, sizeof(gr_real_root));
74087 + }
74088 +
74089 + /* free all object hash tables */
74090 +
74091 + FOR_EACH_ROLE_START(r)
74092 + if (r->subj_hash == NULL)
74093 + goto next_role;
74094 + FOR_EACH_SUBJECT_START(r, s, x)
74095 + if (s->obj_hash == NULL)
74096 + break;
74097 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74098 + kfree(s->obj_hash);
74099 + else
74100 + vfree(s->obj_hash);
74101 + FOR_EACH_SUBJECT_END(s, x)
74102 + FOR_EACH_NESTED_SUBJECT_START(r, s)
74103 + if (s->obj_hash == NULL)
74104 + break;
74105 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74106 + kfree(s->obj_hash);
74107 + else
74108 + vfree(s->obj_hash);
74109 + FOR_EACH_NESTED_SUBJECT_END(s)
74110 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74111 + kfree(r->subj_hash);
74112 + else
74113 + vfree(r->subj_hash);
74114 + r->subj_hash = NULL;
74115 +next_role:
74116 + FOR_EACH_ROLE_END(r)
74117 +
74118 + acl_free_all();
74119 +
74120 + if (polstate->acl_role_set.r_hash) {
74121 + if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74122 + PAGE_SIZE)
74123 + kfree(polstate->acl_role_set.r_hash);
74124 + else
74125 + vfree(polstate->acl_role_set.r_hash);
74126 + }
74127 + if (polstate->name_set.n_hash) {
74128 + if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74129 + PAGE_SIZE)
74130 + kfree(polstate->name_set.n_hash);
74131 + else
74132 + vfree(polstate->name_set.n_hash);
74133 + }
74134 +
74135 + if (polstate->inodev_set.i_hash) {
74136 + if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74137 + PAGE_SIZE)
74138 + kfree(polstate->inodev_set.i_hash);
74139 + else
74140 + vfree(polstate->inodev_set.i_hash);
74141 + }
74142 +
74143 + if (!reload)
74144 + gr_free_uidset();
74145 +
74146 + memset(&polstate->name_set, 0, sizeof (struct name_db));
74147 + memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74148 + memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74149 + memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74150 +
74151 + polstate->default_role = NULL;
74152 + polstate->kernel_role = NULL;
74153 + polstate->role_list = NULL;
74154 +
74155 + return;
74156 +}
74157 +
74158 +static struct acl_subject_label *
74159 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74160 +
74161 +static int alloc_and_copy_string(char **name, unsigned int maxlen)
74162 +{
74163 + unsigned int len = strnlen_user(*name, maxlen);
74164 + char *tmp;
74165 +
74166 + if (!len || len >= maxlen)
74167 + return -EINVAL;
74168 +
74169 + if ((tmp = (char *) acl_alloc(len)) == NULL)
74170 + return -ENOMEM;
74171 +
74172 + if (copy_from_user(tmp, *name, len))
74173 + return -EFAULT;
74174 +
74175 + tmp[len-1] = '\0';
74176 + *name = tmp;
74177 +
74178 + return 0;
74179 +}
74180 +
74181 +static int
74182 +copy_user_glob(struct acl_object_label *obj)
74183 +{
74184 + struct acl_object_label *g_tmp, **guser;
74185 + int error;
74186 +
74187 + if (obj->globbed == NULL)
74188 + return 0;
74189 +
74190 + guser = &obj->globbed;
74191 + while (*guser) {
74192 + g_tmp = (struct acl_object_label *)
74193 + acl_alloc(sizeof (struct acl_object_label));
74194 + if (g_tmp == NULL)
74195 + return -ENOMEM;
74196 +
74197 + if (copy_acl_object_label(g_tmp, *guser))
74198 + return -EFAULT;
74199 +
74200 + error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74201 + if (error)
74202 + return error;
74203 +
74204 + *guser = g_tmp;
74205 + guser = &(g_tmp->next);
74206 + }
74207 +
74208 + return 0;
74209 +}
74210 +
74211 +static int
74212 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74213 + struct acl_role_label *role)
74214 +{
74215 + struct acl_object_label *o_tmp;
74216 + int ret;
74217 +
74218 + while (userp) {
74219 + if ((o_tmp = (struct acl_object_label *)
74220 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
74221 + return -ENOMEM;
74222 +
74223 + if (copy_acl_object_label(o_tmp, userp))
74224 + return -EFAULT;
74225 +
74226 + userp = o_tmp->prev;
74227 +
74228 + ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74229 + if (ret)
74230 + return ret;
74231 +
74232 + insert_acl_obj_label(o_tmp, subj);
74233 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74234 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74235 + return -ENOMEM;
74236 +
74237 + ret = copy_user_glob(o_tmp);
74238 + if (ret)
74239 + return ret;
74240 +
74241 + if (o_tmp->nested) {
74242 + int already_copied;
74243 +
74244 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74245 + if (IS_ERR(o_tmp->nested))
74246 + return PTR_ERR(o_tmp->nested);
74247 +
74248 + /* insert into nested subject list if we haven't copied this one yet
74249 + to prevent duplicate entries */
74250 + if (!already_copied) {
74251 + o_tmp->nested->next = role->hash->first;
74252 + role->hash->first = o_tmp->nested;
74253 + }
74254 + }
74255 + }
74256 +
74257 + return 0;
74258 +}
74259 +
74260 +static __u32
74261 +count_user_subjs(struct acl_subject_label *userp)
74262 +{
74263 + struct acl_subject_label s_tmp;
74264 + __u32 num = 0;
74265 +
74266 + while (userp) {
74267 + if (copy_acl_subject_label(&s_tmp, userp))
74268 + break;
74269 +
74270 + userp = s_tmp.prev;
74271 + }
74272 +
74273 + return num;
74274 +}
74275 +
74276 +static int
74277 +copy_user_allowedips(struct acl_role_label *rolep)
74278 +{
74279 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74280 +
74281 + ruserip = rolep->allowed_ips;
74282 +
74283 + while (ruserip) {
74284 + rlast = rtmp;
74285 +
74286 + if ((rtmp = (struct role_allowed_ip *)
74287 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74288 + return -ENOMEM;
74289 +
74290 + if (copy_role_allowed_ip(rtmp, ruserip))
74291 + return -EFAULT;
74292 +
74293 + ruserip = rtmp->prev;
74294 +
74295 + if (!rlast) {
74296 + rtmp->prev = NULL;
74297 + rolep->allowed_ips = rtmp;
74298 + } else {
74299 + rlast->next = rtmp;
74300 + rtmp->prev = rlast;
74301 + }
74302 +
74303 + if (!ruserip)
74304 + rtmp->next = NULL;
74305 + }
74306 +
74307 + return 0;
74308 +}
74309 +
74310 +static int
74311 +copy_user_transitions(struct acl_role_label *rolep)
74312 +{
74313 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
74314 + int error;
74315 +
74316 + rusertp = rolep->transitions;
74317 +
74318 + while (rusertp) {
74319 + rlast = rtmp;
74320 +
74321 + if ((rtmp = (struct role_transition *)
74322 + acl_alloc(sizeof (struct role_transition))) == NULL)
74323 + return -ENOMEM;
74324 +
74325 + if (copy_role_transition(rtmp, rusertp))
74326 + return -EFAULT;
74327 +
74328 + rusertp = rtmp->prev;
74329 +
74330 + error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74331 + if (error)
74332 + return error;
74333 +
74334 + if (!rlast) {
74335 + rtmp->prev = NULL;
74336 + rolep->transitions = rtmp;
74337 + } else {
74338 + rlast->next = rtmp;
74339 + rtmp->prev = rlast;
74340 + }
74341 +
74342 + if (!rusertp)
74343 + rtmp->next = NULL;
74344 + }
74345 +
74346 + return 0;
74347 +}
74348 +
74349 +static __u32 count_user_objs(const struct acl_object_label __user *userp)
74350 +{
74351 + struct acl_object_label o_tmp;
74352 + __u32 num = 0;
74353 +
74354 + while (userp) {
74355 + if (copy_acl_object_label(&o_tmp, userp))
74356 + break;
74357 +
74358 + userp = o_tmp.prev;
74359 + num++;
74360 + }
74361 +
74362 + return num;
74363 +}
74364 +
74365 +static struct acl_subject_label *
74366 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74367 +{
74368 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74369 + __u32 num_objs;
74370 + struct acl_ip_label **i_tmp, *i_utmp2;
74371 + struct gr_hash_struct ghash;
74372 + struct subject_map *subjmap;
74373 + unsigned int i_num;
74374 + int err;
74375 +
74376 + if (already_copied != NULL)
74377 + *already_copied = 0;
74378 +
74379 + s_tmp = lookup_subject_map(userp);
74380 +
74381 + /* we've already copied this subject into the kernel, just return
74382 + the reference to it, and don't copy it over again
74383 + */
74384 + if (s_tmp) {
74385 + if (already_copied != NULL)
74386 + *already_copied = 1;
74387 + return(s_tmp);
74388 + }
74389 +
74390 + if ((s_tmp = (struct acl_subject_label *)
74391 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74392 + return ERR_PTR(-ENOMEM);
74393 +
74394 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74395 + if (subjmap == NULL)
74396 + return ERR_PTR(-ENOMEM);
74397 +
74398 + subjmap->user = userp;
74399 + subjmap->kernel = s_tmp;
74400 + insert_subj_map_entry(subjmap);
74401 +
74402 + if (copy_acl_subject_label(s_tmp, userp))
74403 + return ERR_PTR(-EFAULT);
74404 +
74405 + err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74406 + if (err)
74407 + return ERR_PTR(err);
74408 +
74409 + if (!strcmp(s_tmp->filename, "/"))
74410 + role->root_label = s_tmp;
74411 +
74412 + if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74413 + return ERR_PTR(-EFAULT);
74414 +
74415 + /* copy user and group transition tables */
74416 +
74417 + if (s_tmp->user_trans_num) {
74418 + uid_t *uidlist;
74419 +
74420 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74421 + if (uidlist == NULL)
74422 + return ERR_PTR(-ENOMEM);
74423 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74424 + return ERR_PTR(-EFAULT);
74425 +
74426 + s_tmp->user_transitions = uidlist;
74427 + }
74428 +
74429 + if (s_tmp->group_trans_num) {
74430 + gid_t *gidlist;
74431 +
74432 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74433 + if (gidlist == NULL)
74434 + return ERR_PTR(-ENOMEM);
74435 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74436 + return ERR_PTR(-EFAULT);
74437 +
74438 + s_tmp->group_transitions = gidlist;
74439 + }
74440 +
74441 + /* set up object hash table */
74442 + num_objs = count_user_objs(ghash.first);
74443 +
74444 + s_tmp->obj_hash_size = num_objs;
74445 + s_tmp->obj_hash =
74446 + (struct acl_object_label **)
74447 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74448 +
74449 + if (!s_tmp->obj_hash)
74450 + return ERR_PTR(-ENOMEM);
74451 +
74452 + memset(s_tmp->obj_hash, 0,
74453 + s_tmp->obj_hash_size *
74454 + sizeof (struct acl_object_label *));
74455 +
74456 + /* add in objects */
74457 + err = copy_user_objs(ghash.first, s_tmp, role);
74458 +
74459 + if (err)
74460 + return ERR_PTR(err);
74461 +
74462 + /* set pointer for parent subject */
74463 + if (s_tmp->parent_subject) {
74464 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74465 +
74466 + if (IS_ERR(s_tmp2))
74467 + return s_tmp2;
74468 +
74469 + s_tmp->parent_subject = s_tmp2;
74470 + }
74471 +
74472 + /* add in ip acls */
74473 +
74474 + if (!s_tmp->ip_num) {
74475 + s_tmp->ips = NULL;
74476 + goto insert;
74477 + }
74478 +
74479 + i_tmp =
74480 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74481 + sizeof (struct acl_ip_label *));
74482 +
74483 + if (!i_tmp)
74484 + return ERR_PTR(-ENOMEM);
74485 +
74486 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74487 + *(i_tmp + i_num) =
74488 + (struct acl_ip_label *)
74489 + acl_alloc(sizeof (struct acl_ip_label));
74490 + if (!*(i_tmp + i_num))
74491 + return ERR_PTR(-ENOMEM);
74492 +
74493 + if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74494 + return ERR_PTR(-EFAULT);
74495 +
74496 + if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74497 + return ERR_PTR(-EFAULT);
74498 +
74499 + if ((*(i_tmp + i_num))->iface == NULL)
74500 + continue;
74501 +
74502 + err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74503 + if (err)
74504 + return ERR_PTR(err);
74505 + }
74506 +
74507 + s_tmp->ips = i_tmp;
74508 +
74509 +insert:
74510 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74511 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74512 + return ERR_PTR(-ENOMEM);
74513 +
74514 + return s_tmp;
74515 +}
74516 +
74517 +static int
74518 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74519 +{
74520 + struct acl_subject_label s_pre;
74521 + struct acl_subject_label * ret;
74522 + int err;
74523 +
74524 + while (userp) {
74525 + if (copy_acl_subject_label(&s_pre, userp))
74526 + return -EFAULT;
74527 +
74528 + ret = do_copy_user_subj(userp, role, NULL);
74529 +
74530 + err = PTR_ERR(ret);
74531 + if (IS_ERR(ret))
74532 + return err;
74533 +
74534 + insert_acl_subj_label(ret, role);
74535 +
74536 + userp = s_pre.prev;
74537 + }
74538 +
74539 + return 0;
74540 +}
74541 +
74542 +static int
74543 +copy_user_acl(struct gr_arg *arg)
74544 +{
74545 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74546 + struct acl_subject_label *subj_list;
74547 + struct sprole_pw *sptmp;
74548 + struct gr_hash_struct *ghash;
74549 + uid_t *domainlist;
74550 + unsigned int r_num;
74551 + int err = 0;
74552 + __u16 i;
74553 + __u32 num_subjs;
74554 +
74555 + /* we need a default and kernel role */
74556 + if (arg->role_db.num_roles < 2)
74557 + return -EINVAL;
74558 +
74559 + /* copy special role authentication info from userspace */
74560 +
74561 + polstate->num_sprole_pws = arg->num_sprole_pws;
74562 + polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74563 +
74564 + if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74565 + return -ENOMEM;
74566 +
74567 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74568 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74569 + if (!sptmp)
74570 + return -ENOMEM;
74571 + if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74572 + return -EFAULT;
74573 +
74574 + err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74575 + if (err)
74576 + return err;
74577 +
74578 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74579 + printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74580 +#endif
74581 +
74582 + polstate->acl_special_roles[i] = sptmp;
74583 + }
74584 +
74585 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74586 +
74587 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74588 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
74589 +
74590 + if (!r_tmp)
74591 + return -ENOMEM;
74592 +
74593 + if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74594 + return -EFAULT;
74595 +
74596 + if (copy_acl_role_label(r_tmp, r_utmp2))
74597 + return -EFAULT;
74598 +
74599 + err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74600 + if (err)
74601 + return err;
74602 +
74603 + if (!strcmp(r_tmp->rolename, "default")
74604 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74605 + polstate->default_role = r_tmp;
74606 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74607 + polstate->kernel_role = r_tmp;
74608 + }
74609 +
74610 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74611 + return -ENOMEM;
74612 +
74613 + if (copy_gr_hash_struct(ghash, r_tmp->hash))
74614 + return -EFAULT;
74615 +
74616 + r_tmp->hash = ghash;
74617 +
74618 + num_subjs = count_user_subjs(r_tmp->hash->first);
74619 +
74620 + r_tmp->subj_hash_size = num_subjs;
74621 + r_tmp->subj_hash =
74622 + (struct acl_subject_label **)
74623 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74624 +
74625 + if (!r_tmp->subj_hash)
74626 + return -ENOMEM;
74627 +
74628 + err = copy_user_allowedips(r_tmp);
74629 + if (err)
74630 + return err;
74631 +
74632 + /* copy domain info */
74633 + if (r_tmp->domain_children != NULL) {
74634 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74635 + if (domainlist == NULL)
74636 + return -ENOMEM;
74637 +
74638 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74639 + return -EFAULT;
74640 +
74641 + r_tmp->domain_children = domainlist;
74642 + }
74643 +
74644 + err = copy_user_transitions(r_tmp);
74645 + if (err)
74646 + return err;
74647 +
74648 + memset(r_tmp->subj_hash, 0,
74649 + r_tmp->subj_hash_size *
74650 + sizeof (struct acl_subject_label *));
74651 +
74652 + /* acquire the list of subjects, then NULL out
74653 + the list prior to parsing the subjects for this role,
74654 + as during this parsing the list is replaced with a list
74655 + of *nested* subjects for the role
74656 + */
74657 + subj_list = r_tmp->hash->first;
74658 +
74659 + /* set nested subject list to null */
74660 + r_tmp->hash->first = NULL;
74661 +
74662 + err = copy_user_subjs(subj_list, r_tmp);
74663 +
74664 + if (err)
74665 + return err;
74666 +
74667 + insert_acl_role_label(r_tmp);
74668 + }
74669 +
74670 + if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74671 + return -EINVAL;
74672 +
74673 + return err;
74674 +}
74675 +
74676 +static int gracl_reload_apply_policies(void *reload)
74677 +{
74678 + struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74679 + struct task_struct *task, *task2;
74680 + struct acl_role_label *role, *rtmp;
74681 + struct acl_subject_label *subj;
74682 + const struct cred *cred;
74683 + int role_applied;
74684 + int ret = 0;
74685 +
74686 + memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74687 + memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74688 +
74689 + /* first make sure we'll be able to apply the new policy cleanly */
74690 + do_each_thread(task2, task) {
74691 + if (task->exec_file == NULL)
74692 + continue;
74693 + role_applied = 0;
74694 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74695 + /* preserve special roles */
74696 + FOR_EACH_ROLE_START(role)
74697 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74698 + rtmp = task->role;
74699 + task->role = role;
74700 + role_applied = 1;
74701 + break;
74702 + }
74703 + FOR_EACH_ROLE_END(role)
74704 + }
74705 + if (!role_applied) {
74706 + cred = __task_cred(task);
74707 + rtmp = task->role;
74708 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74709 + }
74710 + /* this handles non-nested inherited subjects, nested subjects will still
74711 + be dropped currently */
74712 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74713 + task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
74714 + /* change the role back so that we've made no modifications to the policy */
74715 + task->role = rtmp;
74716 +
74717 + if (subj == NULL || task->tmpacl == NULL) {
74718 + ret = -EINVAL;
74719 + goto out;
74720 + }
74721 + } while_each_thread(task2, task);
74722 +
74723 + /* now actually apply the policy */
74724 +
74725 + do_each_thread(task2, task) {
74726 + if (task->exec_file) {
74727 + role_applied = 0;
74728 + if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74729 + /* preserve special roles */
74730 + FOR_EACH_ROLE_START(role)
74731 + if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74732 + task->role = role;
74733 + role_applied = 1;
74734 + break;
74735 + }
74736 + FOR_EACH_ROLE_END(role)
74737 + }
74738 + if (!role_applied) {
74739 + cred = __task_cred(task);
74740 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74741 + }
74742 + /* this handles non-nested inherited subjects, nested subjects will still
74743 + be dropped currently */
74744 + if (!reload_state->oldmode && task->inherited)
74745 + subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74746 + else {
74747 + /* looked up and tagged to the task previously */
74748 + subj = task->tmpacl;
74749 + }
74750 + /* subj will be non-null */
74751 + __gr_apply_subject_to_task(polstate, task, subj);
74752 + if (reload_state->oldmode) {
74753 + task->acl_role_id = 0;
74754 + task->acl_sp_role = 0;
74755 + task->inherited = 0;
74756 + }
74757 + } else {
74758 + // it's a kernel process
74759 + task->role = polstate->kernel_role;
74760 + task->acl = polstate->kernel_role->root_label;
74761 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74762 + task->acl->mode &= ~GR_PROCFIND;
74763 +#endif
74764 + }
74765 + } while_each_thread(task2, task);
74766 +
74767 + memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74768 + memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74769 +
74770 +out:
74771 +
74772 + return ret;
74773 +}
74774 +
74775 +static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74776 +{
74777 + struct gr_reload_state new_reload_state = { };
74778 + int err;
74779 +
74780 + new_reload_state.oldpolicy_ptr = polstate;
74781 + new_reload_state.oldalloc_ptr = current_alloc_state;
74782 + new_reload_state.oldmode = oldmode;
74783 +
74784 + current_alloc_state = &new_reload_state.newalloc;
74785 + polstate = &new_reload_state.newpolicy;
74786 +
74787 + /* everything relevant is now saved off, copy in the new policy */
74788 + if (init_variables(args, true)) {
74789 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74790 + err = -ENOMEM;
74791 + goto error;
74792 + }
74793 +
74794 + err = copy_user_acl(args);
74795 + free_init_variables();
74796 + if (err)
74797 + goto error;
74798 + /* the new policy is copied in, with the old policy available via saved_state
74799 + first go through applying roles, making sure to preserve special roles
74800 + then apply new subjects, making sure to preserve inherited and nested subjects,
74801 + though currently only inherited subjects will be preserved
74802 + */
74803 + err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74804 + if (err)
74805 + goto error;
74806 +
74807 + /* we've now applied the new policy, so restore the old policy state to free it */
74808 + polstate = &new_reload_state.oldpolicy;
74809 + current_alloc_state = &new_reload_state.oldalloc;
74810 + free_variables(true);
74811 +
74812 + /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74813 + to running_polstate/current_alloc_state inside stop_machine
74814 + */
74815 + err = 0;
74816 + goto out;
74817 +error:
74818 + /* on error of loading the new policy, we'll just keep the previous
74819 + policy set around
74820 + */
74821 + free_variables(true);
74822 +
74823 + /* doesn't affect runtime, but maintains consistent state */
74824 +out:
74825 + polstate = new_reload_state.oldpolicy_ptr;
74826 + current_alloc_state = new_reload_state.oldalloc_ptr;
74827 +
74828 + return err;
74829 +}
74830 +
74831 +static int
74832 +gracl_init(struct gr_arg *args)
74833 +{
74834 + int error = 0;
74835 +
74836 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74837 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74838 +
74839 + if (init_variables(args, false)) {
74840 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74841 + error = -ENOMEM;
74842 + goto out;
74843 + }
74844 +
74845 + error = copy_user_acl(args);
74846 + free_init_variables();
74847 + if (error)
74848 + goto out;
74849 +
74850 + error = gr_set_acls(0);
74851 + if (error)
74852 + goto out;
74853 +
74854 + gr_enable_rbac_system();
74855 +
74856 + return 0;
74857 +
74858 +out:
74859 + free_variables(false);
74860 + return error;
74861 +}
74862 +
74863 +static int
74864 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
74865 + unsigned char **sum)
74866 +{
74867 + struct acl_role_label *r;
74868 + struct role_allowed_ip *ipp;
74869 + struct role_transition *trans;
74870 + unsigned int i;
74871 + int found = 0;
74872 + u32 curr_ip = current->signal->curr_ip;
74873 +
74874 + current->signal->saved_ip = curr_ip;
74875 +
74876 + /* check transition table */
74877 +
74878 + for (trans = current->role->transitions; trans; trans = trans->next) {
74879 + if (!strcmp(rolename, trans->rolename)) {
74880 + found = 1;
74881 + break;
74882 + }
74883 + }
74884 +
74885 + if (!found)
74886 + return 0;
74887 +
74888 + /* handle special roles that do not require authentication
74889 + and check ip */
74890 +
74891 + FOR_EACH_ROLE_START(r)
74892 + if (!strcmp(rolename, r->rolename) &&
74893 + (r->roletype & GR_ROLE_SPECIAL)) {
74894 + found = 0;
74895 + if (r->allowed_ips != NULL) {
74896 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
74897 + if ((ntohl(curr_ip) & ipp->netmask) ==
74898 + (ntohl(ipp->addr) & ipp->netmask))
74899 + found = 1;
74900 + }
74901 + } else
74902 + found = 2;
74903 + if (!found)
74904 + return 0;
74905 +
74906 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
74907 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
74908 + *salt = NULL;
74909 + *sum = NULL;
74910 + return 1;
74911 + }
74912 + }
74913 + FOR_EACH_ROLE_END(r)
74914 +
74915 + for (i = 0; i < polstate->num_sprole_pws; i++) {
74916 + if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
74917 + *salt = polstate->acl_special_roles[i]->salt;
74918 + *sum = polstate->acl_special_roles[i]->sum;
74919 + return 1;
74920 + }
74921 + }
74922 +
74923 + return 0;
74924 +}
74925 +
74926 +int gr_check_secure_terminal(struct task_struct *task)
74927 +{
74928 + struct task_struct *p, *p2, *p3;
74929 + struct files_struct *files;
74930 + struct fdtable *fdt;
74931 + struct file *our_file = NULL, *file;
74932 + int i;
74933 +
74934 + if (task->signal->tty == NULL)
74935 + return 1;
74936 +
74937 + files = get_files_struct(task);
74938 + if (files != NULL) {
74939 + rcu_read_lock();
74940 + fdt = files_fdtable(files);
74941 + for (i=0; i < fdt->max_fds; i++) {
74942 + file = fcheck_files(files, i);
74943 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
74944 + get_file(file);
74945 + our_file = file;
74946 + }
74947 + }
74948 + rcu_read_unlock();
74949 + put_files_struct(files);
74950 + }
74951 +
74952 + if (our_file == NULL)
74953 + return 1;
74954 +
74955 + read_lock(&tasklist_lock);
74956 + do_each_thread(p2, p) {
74957 + files = get_files_struct(p);
74958 + if (files == NULL ||
74959 + (p->signal && p->signal->tty == task->signal->tty)) {
74960 + if (files != NULL)
74961 + put_files_struct(files);
74962 + continue;
74963 + }
74964 + rcu_read_lock();
74965 + fdt = files_fdtable(files);
74966 + for (i=0; i < fdt->max_fds; i++) {
74967 + file = fcheck_files(files, i);
74968 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
74969 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
74970 + p3 = task;
74971 + while (task_pid_nr(p3) > 0) {
74972 + if (p3 == p)
74973 + break;
74974 + p3 = p3->real_parent;
74975 + }
74976 + if (p3 == p)
74977 + break;
74978 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
74979 + gr_handle_alertkill(p);
74980 + rcu_read_unlock();
74981 + put_files_struct(files);
74982 + read_unlock(&tasklist_lock);
74983 + fput(our_file);
74984 + return 0;
74985 + }
74986 + }
74987 + rcu_read_unlock();
74988 + put_files_struct(files);
74989 + } while_each_thread(p2, p);
74990 + read_unlock(&tasklist_lock);
74991 +
74992 + fput(our_file);
74993 + return 1;
74994 +}
74995 +
74996 +ssize_t
74997 +write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
74998 +{
74999 + struct gr_arg_wrapper uwrap;
75000 + unsigned char *sprole_salt = NULL;
75001 + unsigned char *sprole_sum = NULL;
75002 + int error = 0;
75003 + int error2 = 0;
75004 + size_t req_count = 0;
75005 + unsigned char oldmode = 0;
75006 +
75007 + mutex_lock(&gr_dev_mutex);
75008 +
75009 + if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
75010 + error = -EPERM;
75011 + goto out;
75012 + }
75013 +
75014 +#ifdef CONFIG_COMPAT
75015 + pax_open_kernel();
75016 + if (is_compat_task()) {
75017 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
75018 + copy_gr_arg = &copy_gr_arg_compat;
75019 + copy_acl_object_label = &copy_acl_object_label_compat;
75020 + copy_acl_subject_label = &copy_acl_subject_label_compat;
75021 + copy_acl_role_label = &copy_acl_role_label_compat;
75022 + copy_acl_ip_label = &copy_acl_ip_label_compat;
75023 + copy_role_allowed_ip = &copy_role_allowed_ip_compat;
75024 + copy_role_transition = &copy_role_transition_compat;
75025 + copy_sprole_pw = &copy_sprole_pw_compat;
75026 + copy_gr_hash_struct = &copy_gr_hash_struct_compat;
75027 + copy_pointer_from_array = &copy_pointer_from_array_compat;
75028 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
75029 + } else {
75030 + copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
75031 + copy_gr_arg = &copy_gr_arg_normal;
75032 + copy_acl_object_label = &copy_acl_object_label_normal;
75033 + copy_acl_subject_label = &copy_acl_subject_label_normal;
75034 + copy_acl_role_label = &copy_acl_role_label_normal;
75035 + copy_acl_ip_label = &copy_acl_ip_label_normal;
75036 + copy_role_allowed_ip = &copy_role_allowed_ip_normal;
75037 + copy_role_transition = &copy_role_transition_normal;
75038 + copy_sprole_pw = &copy_sprole_pw_normal;
75039 + copy_gr_hash_struct = &copy_gr_hash_struct_normal;
75040 + copy_pointer_from_array = &copy_pointer_from_array_normal;
75041 + get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
75042 + }
75043 + pax_close_kernel();
75044 +#endif
75045 +
75046 + req_count = get_gr_arg_wrapper_size();
75047 +
75048 + if (count != req_count) {
75049 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
75050 + error = -EINVAL;
75051 + goto out;
75052 + }
75053 +
75054 +
75055 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
75056 + gr_auth_expires = 0;
75057 + gr_auth_attempts = 0;
75058 + }
75059 +
75060 + error = copy_gr_arg_wrapper(buf, &uwrap);
75061 + if (error)
75062 + goto out;
75063 +
75064 + error = copy_gr_arg(uwrap.arg, gr_usermode);
75065 + if (error)
75066 + goto out;
75067 +
75068 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75069 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75070 + time_after(gr_auth_expires, get_seconds())) {
75071 + error = -EBUSY;
75072 + goto out;
75073 + }
75074 +
75075 + /* if non-root trying to do anything other than use a special role,
75076 + do not attempt authentication, do not count towards authentication
75077 + locking
75078 + */
75079 +
75080 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
75081 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75082 + gr_is_global_nonroot(current_uid())) {
75083 + error = -EPERM;
75084 + goto out;
75085 + }
75086 +
75087 + /* ensure pw and special role name are null terminated */
75088 +
75089 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75090 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75091 +
75092 + /* Okay.
75093 + * We have our enough of the argument structure..(we have yet
75094 + * to copy_from_user the tables themselves) . Copy the tables
75095 + * only if we need them, i.e. for loading operations. */
75096 +
75097 + switch (gr_usermode->mode) {
75098 + case GR_STATUS:
75099 + if (gr_acl_is_enabled()) {
75100 + error = 1;
75101 + if (!gr_check_secure_terminal(current))
75102 + error = 3;
75103 + } else
75104 + error = 2;
75105 + goto out;
75106 + case GR_SHUTDOWN:
75107 + if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75108 + stop_machine(gr_rbac_disable, NULL, NULL);
75109 + free_variables(false);
75110 + memset(gr_usermode, 0, sizeof(struct gr_arg));
75111 + memset(gr_system_salt, 0, GR_SALT_LEN);
75112 + memset(gr_system_sum, 0, GR_SHA_LEN);
75113 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75114 + } else if (gr_acl_is_enabled()) {
75115 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75116 + error = -EPERM;
75117 + } else {
75118 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75119 + error = -EAGAIN;
75120 + }
75121 + break;
75122 + case GR_ENABLE:
75123 + if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75124 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75125 + else {
75126 + if (gr_acl_is_enabled())
75127 + error = -EAGAIN;
75128 + else
75129 + error = error2;
75130 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75131 + }
75132 + break;
75133 + case GR_OLDRELOAD:
75134 + oldmode = 1;
75135 + case GR_RELOAD:
75136 + if (!gr_acl_is_enabled()) {
75137 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75138 + error = -EAGAIN;
75139 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75140 + error2 = gracl_reload(gr_usermode, oldmode);
75141 + if (!error2)
75142 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75143 + else {
75144 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75145 + error = error2;
75146 + }
75147 + } else {
75148 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75149 + error = -EPERM;
75150 + }
75151 + break;
75152 + case GR_SEGVMOD:
75153 + if (unlikely(!gr_acl_is_enabled())) {
75154 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75155 + error = -EAGAIN;
75156 + break;
75157 + }
75158 +
75159 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75160 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75161 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75162 + struct acl_subject_label *segvacl;
75163 + segvacl =
75164 + lookup_acl_subj_label(gr_usermode->segv_inode,
75165 + gr_usermode->segv_device,
75166 + current->role);
75167 + if (segvacl) {
75168 + segvacl->crashes = 0;
75169 + segvacl->expires = 0;
75170 + }
75171 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75172 + gr_remove_uid(gr_usermode->segv_uid);
75173 + }
75174 + } else {
75175 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75176 + error = -EPERM;
75177 + }
75178 + break;
75179 + case GR_SPROLE:
75180 + case GR_SPROLEPAM:
75181 + if (unlikely(!gr_acl_is_enabled())) {
75182 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75183 + error = -EAGAIN;
75184 + break;
75185 + }
75186 +
75187 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75188 + current->role->expires = 0;
75189 + current->role->auth_attempts = 0;
75190 + }
75191 +
75192 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75193 + time_after(current->role->expires, get_seconds())) {
75194 + error = -EBUSY;
75195 + goto out;
75196 + }
75197 +
75198 + if (lookup_special_role_auth
75199 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75200 + && ((!sprole_salt && !sprole_sum)
75201 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75202 + char *p = "";
75203 + assign_special_role(gr_usermode->sp_role);
75204 + read_lock(&tasklist_lock);
75205 + if (current->real_parent)
75206 + p = current->real_parent->role->rolename;
75207 + read_unlock(&tasklist_lock);
75208 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75209 + p, acl_sp_role_value);
75210 + } else {
75211 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75212 + error = -EPERM;
75213 + if(!(current->role->auth_attempts++))
75214 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75215 +
75216 + goto out;
75217 + }
75218 + break;
75219 + case GR_UNSPROLE:
75220 + if (unlikely(!gr_acl_is_enabled())) {
75221 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75222 + error = -EAGAIN;
75223 + break;
75224 + }
75225 +
75226 + if (current->role->roletype & GR_ROLE_SPECIAL) {
75227 + char *p = "";
75228 + int i = 0;
75229 +
75230 + read_lock(&tasklist_lock);
75231 + if (current->real_parent) {
75232 + p = current->real_parent->role->rolename;
75233 + i = current->real_parent->acl_role_id;
75234 + }
75235 + read_unlock(&tasklist_lock);
75236 +
75237 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75238 + gr_set_acls(1);
75239 + } else {
75240 + error = -EPERM;
75241 + goto out;
75242 + }
75243 + break;
75244 + default:
75245 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75246 + error = -EINVAL;
75247 + break;
75248 + }
75249 +
75250 + if (error != -EPERM)
75251 + goto out;
75252 +
75253 + if(!(gr_auth_attempts++))
75254 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75255 +
75256 + out:
75257 + mutex_unlock(&gr_dev_mutex);
75258 +
75259 + if (!error)
75260 + error = req_count;
75261 +
75262 + return error;
75263 +}
75264 +
75265 +int
75266 +gr_set_acls(const int type)
75267 +{
75268 + struct task_struct *task, *task2;
75269 + struct acl_role_label *role = current->role;
75270 + struct acl_subject_label *subj;
75271 + __u16 acl_role_id = current->acl_role_id;
75272 + const struct cred *cred;
75273 + int ret;
75274 +
75275 + rcu_read_lock();
75276 + read_lock(&tasklist_lock);
75277 + read_lock(&grsec_exec_file_lock);
75278 + do_each_thread(task2, task) {
75279 + /* check to see if we're called from the exit handler,
75280 + if so, only replace ACLs that have inherited the admin
75281 + ACL */
75282 +
75283 + if (type && (task->role != role ||
75284 + task->acl_role_id != acl_role_id))
75285 + continue;
75286 +
75287 + task->acl_role_id = 0;
75288 + task->acl_sp_role = 0;
75289 + task->inherited = 0;
75290 +
75291 + if (task->exec_file) {
75292 + cred = __task_cred(task);
75293 + task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75294 + subj = __gr_get_subject_for_task(polstate, task, NULL);
75295 + if (subj == NULL) {
75296 + ret = -EINVAL;
75297 + read_unlock(&grsec_exec_file_lock);
75298 + read_unlock(&tasklist_lock);
75299 + rcu_read_unlock();
75300 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75301 + return ret;
75302 + }
75303 + __gr_apply_subject_to_task(polstate, task, subj);
75304 + } else {
75305 + // it's a kernel process
75306 + task->role = polstate->kernel_role;
75307 + task->acl = polstate->kernel_role->root_label;
75308 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75309 + task->acl->mode &= ~GR_PROCFIND;
75310 +#endif
75311 + }
75312 + } while_each_thread(task2, task);
75313 + read_unlock(&grsec_exec_file_lock);
75314 + read_unlock(&tasklist_lock);
75315 + rcu_read_unlock();
75316 +
75317 + return 0;
75318 +}
75319 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75320 new file mode 100644
75321 index 0000000..39645c9
75322 --- /dev/null
75323 +++ b/grsecurity/gracl_res.c
75324 @@ -0,0 +1,68 @@
75325 +#include <linux/kernel.h>
75326 +#include <linux/sched.h>
75327 +#include <linux/gracl.h>
75328 +#include <linux/grinternal.h>
75329 +
75330 +static const char *restab_log[] = {
75331 + [RLIMIT_CPU] = "RLIMIT_CPU",
75332 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75333 + [RLIMIT_DATA] = "RLIMIT_DATA",
75334 + [RLIMIT_STACK] = "RLIMIT_STACK",
75335 + [RLIMIT_CORE] = "RLIMIT_CORE",
75336 + [RLIMIT_RSS] = "RLIMIT_RSS",
75337 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
75338 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75339 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75340 + [RLIMIT_AS] = "RLIMIT_AS",
75341 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75342 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75343 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75344 + [RLIMIT_NICE] = "RLIMIT_NICE",
75345 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75346 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75347 + [GR_CRASH_RES] = "RLIMIT_CRASH"
75348 +};
75349 +
75350 +void
75351 +gr_log_resource(const struct task_struct *task,
75352 + const int res, const unsigned long wanted, const int gt)
75353 +{
75354 + const struct cred *cred;
75355 + unsigned long rlim;
75356 +
75357 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
75358 + return;
75359 +
75360 + // not yet supported resource
75361 + if (unlikely(!restab_log[res]))
75362 + return;
75363 +
75364 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75365 + rlim = task_rlimit_max(task, res);
75366 + else
75367 + rlim = task_rlimit(task, res);
75368 +
75369 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75370 + return;
75371 +
75372 + rcu_read_lock();
75373 + cred = __task_cred(task);
75374 +
75375 + if (res == RLIMIT_NPROC &&
75376 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75377 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75378 + goto out_rcu_unlock;
75379 + else if (res == RLIMIT_MEMLOCK &&
75380 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75381 + goto out_rcu_unlock;
75382 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75383 + goto out_rcu_unlock;
75384 + rcu_read_unlock();
75385 +
75386 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75387 +
75388 + return;
75389 +out_rcu_unlock:
75390 + rcu_read_unlock();
75391 + return;
75392 +}
75393 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75394 new file mode 100644
75395 index 0000000..2040e61
75396 --- /dev/null
75397 +++ b/grsecurity/gracl_segv.c
75398 @@ -0,0 +1,313 @@
75399 +#include <linux/kernel.h>
75400 +#include <linux/mm.h>
75401 +#include <asm/uaccess.h>
75402 +#include <asm/errno.h>
75403 +#include <asm/mman.h>
75404 +#include <net/sock.h>
75405 +#include <linux/file.h>
75406 +#include <linux/fs.h>
75407 +#include <linux/net.h>
75408 +#include <linux/in.h>
75409 +#include <linux/slab.h>
75410 +#include <linux/types.h>
75411 +#include <linux/sched.h>
75412 +#include <linux/timer.h>
75413 +#include <linux/gracl.h>
75414 +#include <linux/grsecurity.h>
75415 +#include <linux/grinternal.h>
75416 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75417 +#include <linux/magic.h>
75418 +#include <linux/pagemap.h>
75419 +#include "../fs/btrfs/async-thread.h"
75420 +#include "../fs/btrfs/ctree.h"
75421 +#include "../fs/btrfs/btrfs_inode.h"
75422 +#endif
75423 +
75424 +static struct crash_uid *uid_set;
75425 +static unsigned short uid_used;
75426 +static DEFINE_SPINLOCK(gr_uid_lock);
75427 +extern rwlock_t gr_inode_lock;
75428 +extern struct acl_subject_label *
75429 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75430 + struct acl_role_label *role);
75431 +
75432 +static inline dev_t __get_dev(const struct dentry *dentry)
75433 +{
75434 +#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75435 + if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75436 + return BTRFS_I(dentry->d_inode)->root->anon_dev;
75437 + else
75438 +#endif
75439 + return dentry->d_sb->s_dev;
75440 +}
75441 +
75442 +int
75443 +gr_init_uidset(void)
75444 +{
75445 + uid_set =
75446 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75447 + uid_used = 0;
75448 +
75449 + return uid_set ? 1 : 0;
75450 +}
75451 +
75452 +void
75453 +gr_free_uidset(void)
75454 +{
75455 + if (uid_set) {
75456 + struct crash_uid *tmpset;
75457 + spin_lock(&gr_uid_lock);
75458 + tmpset = uid_set;
75459 + uid_set = NULL;
75460 + uid_used = 0;
75461 + spin_unlock(&gr_uid_lock);
75462 + if (tmpset)
75463 + kfree(tmpset);
75464 + }
75465 +
75466 + return;
75467 +}
75468 +
75469 +int
75470 +gr_find_uid(const uid_t uid)
75471 +{
75472 + struct crash_uid *tmp = uid_set;
75473 + uid_t buid;
75474 + int low = 0, high = uid_used - 1, mid;
75475 +
75476 + while (high >= low) {
75477 + mid = (low + high) >> 1;
75478 + buid = tmp[mid].uid;
75479 + if (buid == uid)
75480 + return mid;
75481 + if (buid > uid)
75482 + high = mid - 1;
75483 + if (buid < uid)
75484 + low = mid + 1;
75485 + }
75486 +
75487 + return -1;
75488 +}
75489 +
75490 +static __inline__ void
75491 +gr_insertsort(void)
75492 +{
75493 + unsigned short i, j;
75494 + struct crash_uid index;
75495 +
75496 + for (i = 1; i < uid_used; i++) {
75497 + index = uid_set[i];
75498 + j = i;
75499 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75500 + uid_set[j] = uid_set[j - 1];
75501 + j--;
75502 + }
75503 + uid_set[j] = index;
75504 + }
75505 +
75506 + return;
75507 +}
75508 +
75509 +static __inline__ void
75510 +gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75511 +{
75512 + int loc;
75513 + uid_t uid = GR_GLOBAL_UID(kuid);
75514 +
75515 + if (uid_used == GR_UIDTABLE_MAX)
75516 + return;
75517 +
75518 + loc = gr_find_uid(uid);
75519 +
75520 + if (loc >= 0) {
75521 + uid_set[loc].expires = expires;
75522 + return;
75523 + }
75524 +
75525 + uid_set[uid_used].uid = uid;
75526 + uid_set[uid_used].expires = expires;
75527 + uid_used++;
75528 +
75529 + gr_insertsort();
75530 +
75531 + return;
75532 +}
75533 +
75534 +void
75535 +gr_remove_uid(const unsigned short loc)
75536 +{
75537 + unsigned short i;
75538 +
75539 + for (i = loc + 1; i < uid_used; i++)
75540 + uid_set[i - 1] = uid_set[i];
75541 +
75542 + uid_used--;
75543 +
75544 + return;
75545 +}
75546 +
75547 +int
75548 +gr_check_crash_uid(const kuid_t kuid)
75549 +{
75550 + int loc;
75551 + int ret = 0;
75552 + uid_t uid;
75553 +
75554 + if (unlikely(!gr_acl_is_enabled()))
75555 + return 0;
75556 +
75557 + uid = GR_GLOBAL_UID(kuid);
75558 +
75559 + spin_lock(&gr_uid_lock);
75560 + loc = gr_find_uid(uid);
75561 +
75562 + if (loc < 0)
75563 + goto out_unlock;
75564 +
75565 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
75566 + gr_remove_uid(loc);
75567 + else
75568 + ret = 1;
75569 +
75570 +out_unlock:
75571 + spin_unlock(&gr_uid_lock);
75572 + return ret;
75573 +}
75574 +
75575 +static __inline__ int
75576 +proc_is_setxid(const struct cred *cred)
75577 +{
75578 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75579 + !uid_eq(cred->uid, cred->fsuid))
75580 + return 1;
75581 + if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75582 + !gid_eq(cred->gid, cred->fsgid))
75583 + return 1;
75584 +
75585 + return 0;
75586 +}
75587 +
75588 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
75589 +
75590 +void
75591 +gr_handle_crash(struct task_struct *task, const int sig)
75592 +{
75593 + struct acl_subject_label *curr;
75594 + struct task_struct *tsk, *tsk2;
75595 + const struct cred *cred;
75596 + const struct cred *cred2;
75597 +
75598 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75599 + return;
75600 +
75601 + if (unlikely(!gr_acl_is_enabled()))
75602 + return;
75603 +
75604 + curr = task->acl;
75605 +
75606 + if (!(curr->resmask & (1U << GR_CRASH_RES)))
75607 + return;
75608 +
75609 + if (time_before_eq(curr->expires, get_seconds())) {
75610 + curr->expires = 0;
75611 + curr->crashes = 0;
75612 + }
75613 +
75614 + curr->crashes++;
75615 +
75616 + if (!curr->expires)
75617 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75618 +
75619 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75620 + time_after(curr->expires, get_seconds())) {
75621 + rcu_read_lock();
75622 + cred = __task_cred(task);
75623 + if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75624 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75625 + spin_lock(&gr_uid_lock);
75626 + gr_insert_uid(cred->uid, curr->expires);
75627 + spin_unlock(&gr_uid_lock);
75628 + curr->expires = 0;
75629 + curr->crashes = 0;
75630 + read_lock(&tasklist_lock);
75631 + do_each_thread(tsk2, tsk) {
75632 + cred2 = __task_cred(tsk);
75633 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
75634 + gr_fake_force_sig(SIGKILL, tsk);
75635 + } while_each_thread(tsk2, tsk);
75636 + read_unlock(&tasklist_lock);
75637 + } else {
75638 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75639 + read_lock(&tasklist_lock);
75640 + read_lock(&grsec_exec_file_lock);
75641 + do_each_thread(tsk2, tsk) {
75642 + if (likely(tsk != task)) {
75643 + // if this thread has the same subject as the one that triggered
75644 + // RES_CRASH and it's the same binary, kill it
75645 + if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75646 + gr_fake_force_sig(SIGKILL, tsk);
75647 + }
75648 + } while_each_thread(tsk2, tsk);
75649 + read_unlock(&grsec_exec_file_lock);
75650 + read_unlock(&tasklist_lock);
75651 + }
75652 + rcu_read_unlock();
75653 + }
75654 +
75655 + return;
75656 +}
75657 +
75658 +int
75659 +gr_check_crash_exec(const struct file *filp)
75660 +{
75661 + struct acl_subject_label *curr;
75662 +
75663 + if (unlikely(!gr_acl_is_enabled()))
75664 + return 0;
75665 +
75666 + read_lock(&gr_inode_lock);
75667 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75668 + __get_dev(filp->f_path.dentry),
75669 + current->role);
75670 + read_unlock(&gr_inode_lock);
75671 +
75672 + if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75673 + (!curr->crashes && !curr->expires))
75674 + return 0;
75675 +
75676 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75677 + time_after(curr->expires, get_seconds()))
75678 + return 1;
75679 + else if (time_before_eq(curr->expires, get_seconds())) {
75680 + curr->crashes = 0;
75681 + curr->expires = 0;
75682 + }
75683 +
75684 + return 0;
75685 +}
75686 +
75687 +void
75688 +gr_handle_alertkill(struct task_struct *task)
75689 +{
75690 + struct acl_subject_label *curracl;
75691 + __u32 curr_ip;
75692 + struct task_struct *p, *p2;
75693 +
75694 + if (unlikely(!gr_acl_is_enabled()))
75695 + return;
75696 +
75697 + curracl = task->acl;
75698 + curr_ip = task->signal->curr_ip;
75699 +
75700 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75701 + read_lock(&tasklist_lock);
75702 + do_each_thread(p2, p) {
75703 + if (p->signal->curr_ip == curr_ip)
75704 + gr_fake_force_sig(SIGKILL, p);
75705 + } while_each_thread(p2, p);
75706 + read_unlock(&tasklist_lock);
75707 + } else if (curracl->mode & GR_KILLPROC)
75708 + gr_fake_force_sig(SIGKILL, task);
75709 +
75710 + return;
75711 +}
75712 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75713 new file mode 100644
75714 index 0000000..6b0c9cc
75715 --- /dev/null
75716 +++ b/grsecurity/gracl_shm.c
75717 @@ -0,0 +1,40 @@
75718 +#include <linux/kernel.h>
75719 +#include <linux/mm.h>
75720 +#include <linux/sched.h>
75721 +#include <linux/file.h>
75722 +#include <linux/ipc.h>
75723 +#include <linux/gracl.h>
75724 +#include <linux/grsecurity.h>
75725 +#include <linux/grinternal.h>
75726 +
75727 +int
75728 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75729 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
75730 +{
75731 + struct task_struct *task;
75732 +
75733 + if (!gr_acl_is_enabled())
75734 + return 1;
75735 +
75736 + rcu_read_lock();
75737 + read_lock(&tasklist_lock);
75738 +
75739 + task = find_task_by_vpid(shm_cprid);
75740 +
75741 + if (unlikely(!task))
75742 + task = find_task_by_vpid(shm_lapid);
75743 +
75744 + if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75745 + (task_pid_nr(task) == shm_lapid)) &&
75746 + (task->acl->mode & GR_PROTSHM) &&
75747 + (task->acl != current->acl))) {
75748 + read_unlock(&tasklist_lock);
75749 + rcu_read_unlock();
75750 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75751 + return 0;
75752 + }
75753 + read_unlock(&tasklist_lock);
75754 + rcu_read_unlock();
75755 +
75756 + return 1;
75757 +}
75758 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75759 new file mode 100644
75760 index 0000000..bc0be01
75761 --- /dev/null
75762 +++ b/grsecurity/grsec_chdir.c
75763 @@ -0,0 +1,19 @@
75764 +#include <linux/kernel.h>
75765 +#include <linux/sched.h>
75766 +#include <linux/fs.h>
75767 +#include <linux/file.h>
75768 +#include <linux/grsecurity.h>
75769 +#include <linux/grinternal.h>
75770 +
75771 +void
75772 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75773 +{
75774 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75775 + if ((grsec_enable_chdir && grsec_enable_group &&
75776 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75777 + !grsec_enable_group)) {
75778 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75779 + }
75780 +#endif
75781 + return;
75782 +}
75783 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75784 new file mode 100644
75785 index 0000000..6d99cec
75786 --- /dev/null
75787 +++ b/grsecurity/grsec_chroot.c
75788 @@ -0,0 +1,385 @@
75789 +#include <linux/kernel.h>
75790 +#include <linux/module.h>
75791 +#include <linux/sched.h>
75792 +#include <linux/file.h>
75793 +#include <linux/fs.h>
75794 +#include <linux/mount.h>
75795 +#include <linux/types.h>
75796 +#include "../fs/mount.h"
75797 +#include <linux/grsecurity.h>
75798 +#include <linux/grinternal.h>
75799 +
75800 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75801 +int gr_init_ran;
75802 +#endif
75803 +
75804 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
75805 +{
75806 +#ifdef CONFIG_GRKERNSEC
75807 + if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
75808 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
75809 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75810 + && gr_init_ran
75811 +#endif
75812 + )
75813 + task->gr_is_chrooted = 1;
75814 + else {
75815 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75816 + if (task_pid_nr(task) == 1 && !gr_init_ran)
75817 + gr_init_ran = 1;
75818 +#endif
75819 + task->gr_is_chrooted = 0;
75820 + }
75821 +
75822 + task->gr_chroot_dentry = path->dentry;
75823 +#endif
75824 + return;
75825 +}
75826 +
75827 +void gr_clear_chroot_entries(struct task_struct *task)
75828 +{
75829 +#ifdef CONFIG_GRKERNSEC
75830 + task->gr_is_chrooted = 0;
75831 + task->gr_chroot_dentry = NULL;
75832 +#endif
75833 + return;
75834 +}
75835 +
75836 +int
75837 +gr_handle_chroot_unix(const pid_t pid)
75838 +{
75839 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75840 + struct task_struct *p;
75841 +
75842 + if (unlikely(!grsec_enable_chroot_unix))
75843 + return 1;
75844 +
75845 + if (likely(!proc_is_chrooted(current)))
75846 + return 1;
75847 +
75848 + rcu_read_lock();
75849 + read_lock(&tasklist_lock);
75850 + p = find_task_by_vpid_unrestricted(pid);
75851 + if (unlikely(p && !have_same_root(current, p))) {
75852 + read_unlock(&tasklist_lock);
75853 + rcu_read_unlock();
75854 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
75855 + return 0;
75856 + }
75857 + read_unlock(&tasklist_lock);
75858 + rcu_read_unlock();
75859 +#endif
75860 + return 1;
75861 +}
75862 +
75863 +int
75864 +gr_handle_chroot_nice(void)
75865 +{
75866 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75867 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
75868 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
75869 + return -EPERM;
75870 + }
75871 +#endif
75872 + return 0;
75873 +}
75874 +
75875 +int
75876 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
75877 +{
75878 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75879 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
75880 + && proc_is_chrooted(current)) {
75881 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
75882 + return -EACCES;
75883 + }
75884 +#endif
75885 + return 0;
75886 +}
75887 +
75888 +int
75889 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
75890 +{
75891 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75892 + struct task_struct *p;
75893 + int ret = 0;
75894 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
75895 + return ret;
75896 +
75897 + read_lock(&tasklist_lock);
75898 + do_each_pid_task(pid, type, p) {
75899 + if (!have_same_root(current, p)) {
75900 + ret = 1;
75901 + goto out;
75902 + }
75903 + } while_each_pid_task(pid, type, p);
75904 +out:
75905 + read_unlock(&tasklist_lock);
75906 + return ret;
75907 +#endif
75908 + return 0;
75909 +}
75910 +
75911 +int
75912 +gr_pid_is_chrooted(struct task_struct *p)
75913 +{
75914 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75915 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
75916 + return 0;
75917 +
75918 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
75919 + !have_same_root(current, p)) {
75920 + return 1;
75921 + }
75922 +#endif
75923 + return 0;
75924 +}
75925 +
75926 +EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
75927 +
75928 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
75929 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
75930 +{
75931 + struct path path, currentroot;
75932 + int ret = 0;
75933 +
75934 + path.dentry = (struct dentry *)u_dentry;
75935 + path.mnt = (struct vfsmount *)u_mnt;
75936 + get_fs_root(current->fs, &currentroot);
75937 + if (path_is_under(&path, &currentroot))
75938 + ret = 1;
75939 + path_put(&currentroot);
75940 +
75941 + return ret;
75942 +}
75943 +#endif
75944 +
75945 +int
75946 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
75947 +{
75948 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75949 + if (!grsec_enable_chroot_fchdir)
75950 + return 1;
75951 +
75952 + if (!proc_is_chrooted(current))
75953 + return 1;
75954 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
75955 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
75956 + return 0;
75957 + }
75958 +#endif
75959 + return 1;
75960 +}
75961 +
75962 +int
75963 +gr_chroot_fhandle(void)
75964 +{
75965 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75966 + if (!grsec_enable_chroot_fchdir)
75967 + return 1;
75968 +
75969 + if (!proc_is_chrooted(current))
75970 + return 1;
75971 + else {
75972 + gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
75973 + return 0;
75974 + }
75975 +#endif
75976 + return 1;
75977 +}
75978 +
75979 +int
75980 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75981 + const u64 shm_createtime)
75982 +{
75983 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75984 + struct task_struct *p;
75985 +
75986 + if (unlikely(!grsec_enable_chroot_shmat))
75987 + return 1;
75988 +
75989 + if (likely(!proc_is_chrooted(current)))
75990 + return 1;
75991 +
75992 + rcu_read_lock();
75993 + read_lock(&tasklist_lock);
75994 +
75995 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
75996 + if (time_before_eq64(p->start_time, shm_createtime)) {
75997 + if (have_same_root(current, p)) {
75998 + goto allow;
75999 + } else {
76000 + read_unlock(&tasklist_lock);
76001 + rcu_read_unlock();
76002 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76003 + return 0;
76004 + }
76005 + }
76006 + /* creator exited, pid reuse, fall through to next check */
76007 + }
76008 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
76009 + if (unlikely(!have_same_root(current, p))) {
76010 + read_unlock(&tasklist_lock);
76011 + rcu_read_unlock();
76012 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
76013 + return 0;
76014 + }
76015 + }
76016 +
76017 +allow:
76018 + read_unlock(&tasklist_lock);
76019 + rcu_read_unlock();
76020 +#endif
76021 + return 1;
76022 +}
76023 +
76024 +void
76025 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
76026 +{
76027 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76028 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
76029 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
76030 +#endif
76031 + return;
76032 +}
76033 +
76034 +int
76035 +gr_handle_chroot_mknod(const struct dentry *dentry,
76036 + const struct vfsmount *mnt, const int mode)
76037 +{
76038 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76039 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
76040 + proc_is_chrooted(current)) {
76041 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
76042 + return -EPERM;
76043 + }
76044 +#endif
76045 + return 0;
76046 +}
76047 +
76048 +int
76049 +gr_handle_chroot_mount(const struct dentry *dentry,
76050 + const struct vfsmount *mnt, const char *dev_name)
76051 +{
76052 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76053 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
76054 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
76055 + return -EPERM;
76056 + }
76057 +#endif
76058 + return 0;
76059 +}
76060 +
76061 +int
76062 +gr_handle_chroot_pivot(void)
76063 +{
76064 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76065 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
76066 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
76067 + return -EPERM;
76068 + }
76069 +#endif
76070 + return 0;
76071 +}
76072 +
76073 +int
76074 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
76075 +{
76076 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76077 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
76078 + !gr_is_outside_chroot(dentry, mnt)) {
76079 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
76080 + return -EPERM;
76081 + }
76082 +#endif
76083 + return 0;
76084 +}
76085 +
76086 +extern const char *captab_log[];
76087 +extern int captab_log_entries;
76088 +
76089 +int
76090 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76091 +{
76092 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76093 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76094 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76095 + if (cap_raised(chroot_caps, cap)) {
76096 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76097 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76098 + }
76099 + return 0;
76100 + }
76101 + }
76102 +#endif
76103 + return 1;
76104 +}
76105 +
76106 +int
76107 +gr_chroot_is_capable(const int cap)
76108 +{
76109 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76110 + return gr_task_chroot_is_capable(current, current_cred(), cap);
76111 +#endif
76112 + return 1;
76113 +}
76114 +
76115 +int
76116 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76117 +{
76118 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76119 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76120 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76121 + if (cap_raised(chroot_caps, cap)) {
76122 + return 0;
76123 + }
76124 + }
76125 +#endif
76126 + return 1;
76127 +}
76128 +
76129 +int
76130 +gr_chroot_is_capable_nolog(const int cap)
76131 +{
76132 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76133 + return gr_task_chroot_is_capable_nolog(current, cap);
76134 +#endif
76135 + return 1;
76136 +}
76137 +
76138 +int
76139 +gr_handle_chroot_sysctl(const int op)
76140 +{
76141 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76142 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76143 + proc_is_chrooted(current))
76144 + return -EACCES;
76145 +#endif
76146 + return 0;
76147 +}
76148 +
76149 +void
76150 +gr_handle_chroot_chdir(const struct path *path)
76151 +{
76152 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76153 + if (grsec_enable_chroot_chdir)
76154 + set_fs_pwd(current->fs, path);
76155 +#endif
76156 + return;
76157 +}
76158 +
76159 +int
76160 +gr_handle_chroot_chmod(const struct dentry *dentry,
76161 + const struct vfsmount *mnt, const int mode)
76162 +{
76163 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76164 + /* allow chmod +s on directories, but not files */
76165 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76166 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76167 + proc_is_chrooted(current)) {
76168 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76169 + return -EPERM;
76170 + }
76171 +#endif
76172 + return 0;
76173 +}
76174 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76175 new file mode 100644
76176 index 0000000..0f9ac91
76177 --- /dev/null
76178 +++ b/grsecurity/grsec_disabled.c
76179 @@ -0,0 +1,440 @@
76180 +#include <linux/kernel.h>
76181 +#include <linux/module.h>
76182 +#include <linux/sched.h>
76183 +#include <linux/file.h>
76184 +#include <linux/fs.h>
76185 +#include <linux/kdev_t.h>
76186 +#include <linux/net.h>
76187 +#include <linux/in.h>
76188 +#include <linux/ip.h>
76189 +#include <linux/skbuff.h>
76190 +#include <linux/sysctl.h>
76191 +
76192 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76193 +void
76194 +pax_set_initial_flags(struct linux_binprm *bprm)
76195 +{
76196 + return;
76197 +}
76198 +#endif
76199 +
76200 +#ifdef CONFIG_SYSCTL
76201 +__u32
76202 +gr_handle_sysctl(const struct ctl_table * table, const int op)
76203 +{
76204 + return 0;
76205 +}
76206 +#endif
76207 +
76208 +#ifdef CONFIG_TASKSTATS
76209 +int gr_is_taskstats_denied(int pid)
76210 +{
76211 + return 0;
76212 +}
76213 +#endif
76214 +
76215 +int
76216 +gr_acl_is_enabled(void)
76217 +{
76218 + return 0;
76219 +}
76220 +
76221 +int
76222 +gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76223 +{
76224 + return 0;
76225 +}
76226 +
76227 +void
76228 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76229 +{
76230 + return;
76231 +}
76232 +
76233 +int
76234 +gr_handle_rawio(const struct inode *inode)
76235 +{
76236 + return 0;
76237 +}
76238 +
76239 +void
76240 +gr_acl_handle_psacct(struct task_struct *task, const long code)
76241 +{
76242 + return;
76243 +}
76244 +
76245 +int
76246 +gr_handle_ptrace(struct task_struct *task, const long request)
76247 +{
76248 + return 0;
76249 +}
76250 +
76251 +int
76252 +gr_handle_proc_ptrace(struct task_struct *task)
76253 +{
76254 + return 0;
76255 +}
76256 +
76257 +int
76258 +gr_set_acls(const int type)
76259 +{
76260 + return 0;
76261 +}
76262 +
76263 +int
76264 +gr_check_hidden_task(const struct task_struct *tsk)
76265 +{
76266 + return 0;
76267 +}
76268 +
76269 +int
76270 +gr_check_protected_task(const struct task_struct *task)
76271 +{
76272 + return 0;
76273 +}
76274 +
76275 +int
76276 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76277 +{
76278 + return 0;
76279 +}
76280 +
76281 +void
76282 +gr_copy_label(struct task_struct *tsk)
76283 +{
76284 + return;
76285 +}
76286 +
76287 +void
76288 +gr_set_pax_flags(struct task_struct *task)
76289 +{
76290 + return;
76291 +}
76292 +
76293 +int
76294 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76295 + const int unsafe_share)
76296 +{
76297 + return 0;
76298 +}
76299 +
76300 +void
76301 +gr_handle_delete(const ino_t ino, const dev_t dev)
76302 +{
76303 + return;
76304 +}
76305 +
76306 +void
76307 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76308 +{
76309 + return;
76310 +}
76311 +
76312 +void
76313 +gr_handle_crash(struct task_struct *task, const int sig)
76314 +{
76315 + return;
76316 +}
76317 +
76318 +int
76319 +gr_check_crash_exec(const struct file *filp)
76320 +{
76321 + return 0;
76322 +}
76323 +
76324 +int
76325 +gr_check_crash_uid(const kuid_t uid)
76326 +{
76327 + return 0;
76328 +}
76329 +
76330 +void
76331 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76332 + struct dentry *old_dentry,
76333 + struct dentry *new_dentry,
76334 + struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76335 +{
76336 + return;
76337 +}
76338 +
76339 +int
76340 +gr_search_socket(const int family, const int type, const int protocol)
76341 +{
76342 + return 1;
76343 +}
76344 +
76345 +int
76346 +gr_search_connectbind(const int mode, const struct socket *sock,
76347 + const struct sockaddr_in *addr)
76348 +{
76349 + return 0;
76350 +}
76351 +
76352 +void
76353 +gr_handle_alertkill(struct task_struct *task)
76354 +{
76355 + return;
76356 +}
76357 +
76358 +__u32
76359 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76360 +{
76361 + return 1;
76362 +}
76363 +
76364 +__u32
76365 +gr_acl_handle_hidden_file(const struct dentry * dentry,
76366 + const struct vfsmount * mnt)
76367 +{
76368 + return 1;
76369 +}
76370 +
76371 +__u32
76372 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76373 + int acc_mode)
76374 +{
76375 + return 1;
76376 +}
76377 +
76378 +__u32
76379 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76380 +{
76381 + return 1;
76382 +}
76383 +
76384 +__u32
76385 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76386 +{
76387 + return 1;
76388 +}
76389 +
76390 +int
76391 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76392 + unsigned int *vm_flags)
76393 +{
76394 + return 1;
76395 +}
76396 +
76397 +__u32
76398 +gr_acl_handle_truncate(const struct dentry * dentry,
76399 + const struct vfsmount * mnt)
76400 +{
76401 + return 1;
76402 +}
76403 +
76404 +__u32
76405 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76406 +{
76407 + return 1;
76408 +}
76409 +
76410 +__u32
76411 +gr_acl_handle_access(const struct dentry * dentry,
76412 + const struct vfsmount * mnt, const int fmode)
76413 +{
76414 + return 1;
76415 +}
76416 +
76417 +__u32
76418 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76419 + umode_t *mode)
76420 +{
76421 + return 1;
76422 +}
76423 +
76424 +__u32
76425 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76426 +{
76427 + return 1;
76428 +}
76429 +
76430 +__u32
76431 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76432 +{
76433 + return 1;
76434 +}
76435 +
76436 +__u32
76437 +gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76438 +{
76439 + return 1;
76440 +}
76441 +
76442 +void
76443 +grsecurity_init(void)
76444 +{
76445 + return;
76446 +}
76447 +
76448 +umode_t gr_acl_umask(void)
76449 +{
76450 + return 0;
76451 +}
76452 +
76453 +__u32
76454 +gr_acl_handle_mknod(const struct dentry * new_dentry,
76455 + const struct dentry * parent_dentry,
76456 + const struct vfsmount * parent_mnt,
76457 + const int mode)
76458 +{
76459 + return 1;
76460 +}
76461 +
76462 +__u32
76463 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
76464 + const struct dentry * parent_dentry,
76465 + const struct vfsmount * parent_mnt)
76466 +{
76467 + return 1;
76468 +}
76469 +
76470 +__u32
76471 +gr_acl_handle_symlink(const struct dentry * new_dentry,
76472 + const struct dentry * parent_dentry,
76473 + const struct vfsmount * parent_mnt, const struct filename *from)
76474 +{
76475 + return 1;
76476 +}
76477 +
76478 +__u32
76479 +gr_acl_handle_link(const struct dentry * new_dentry,
76480 + const struct dentry * parent_dentry,
76481 + const struct vfsmount * parent_mnt,
76482 + const struct dentry * old_dentry,
76483 + const struct vfsmount * old_mnt, const struct filename *to)
76484 +{
76485 + return 1;
76486 +}
76487 +
76488 +int
76489 +gr_acl_handle_rename(const struct dentry *new_dentry,
76490 + const struct dentry *parent_dentry,
76491 + const struct vfsmount *parent_mnt,
76492 + const struct dentry *old_dentry,
76493 + const struct inode *old_parent_inode,
76494 + const struct vfsmount *old_mnt, const struct filename *newname,
76495 + unsigned int flags)
76496 +{
76497 + return 0;
76498 +}
76499 +
76500 +int
76501 +gr_acl_handle_filldir(const struct file *file, const char *name,
76502 + const int namelen, const ino_t ino)
76503 +{
76504 + return 1;
76505 +}
76506 +
76507 +int
76508 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76509 + const u64 shm_createtime, const kuid_t cuid, const int shmid)
76510 +{
76511 + return 1;
76512 +}
76513 +
76514 +int
76515 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76516 +{
76517 + return 0;
76518 +}
76519 +
76520 +int
76521 +gr_search_accept(const struct socket *sock)
76522 +{
76523 + return 0;
76524 +}
76525 +
76526 +int
76527 +gr_search_listen(const struct socket *sock)
76528 +{
76529 + return 0;
76530 +}
76531 +
76532 +int
76533 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76534 +{
76535 + return 0;
76536 +}
76537 +
76538 +__u32
76539 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76540 +{
76541 + return 1;
76542 +}
76543 +
76544 +__u32
76545 +gr_acl_handle_creat(const struct dentry * dentry,
76546 + const struct dentry * p_dentry,
76547 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76548 + const int imode)
76549 +{
76550 + return 1;
76551 +}
76552 +
76553 +void
76554 +gr_acl_handle_exit(void)
76555 +{
76556 + return;
76557 +}
76558 +
76559 +int
76560 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76561 +{
76562 + return 1;
76563 +}
76564 +
76565 +void
76566 +gr_set_role_label(const kuid_t uid, const kgid_t gid)
76567 +{
76568 + return;
76569 +}
76570 +
76571 +int
76572 +gr_acl_handle_procpidmem(const struct task_struct *task)
76573 +{
76574 + return 0;
76575 +}
76576 +
76577 +int
76578 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76579 +{
76580 + return 0;
76581 +}
76582 +
76583 +int
76584 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76585 +{
76586 + return 0;
76587 +}
76588 +
76589 +int
76590 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76591 +{
76592 + return 0;
76593 +}
76594 +
76595 +int
76596 +gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76597 +{
76598 + return 0;
76599 +}
76600 +
76601 +int gr_acl_enable_at_secure(void)
76602 +{
76603 + return 0;
76604 +}
76605 +
76606 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76607 +{
76608 + return dentry->d_sb->s_dev;
76609 +}
76610 +
76611 +void gr_put_exec_file(struct task_struct *task)
76612 +{
76613 + return;
76614 +}
76615 +
76616 +#ifdef CONFIG_SECURITY
76617 +EXPORT_SYMBOL_GPL(gr_check_user_change);
76618 +EXPORT_SYMBOL_GPL(gr_check_group_change);
76619 +#endif
76620 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76621 new file mode 100644
76622 index 0000000..14638ff
76623 --- /dev/null
76624 +++ b/grsecurity/grsec_exec.c
76625 @@ -0,0 +1,188 @@
76626 +#include <linux/kernel.h>
76627 +#include <linux/sched.h>
76628 +#include <linux/file.h>
76629 +#include <linux/binfmts.h>
76630 +#include <linux/fs.h>
76631 +#include <linux/types.h>
76632 +#include <linux/grdefs.h>
76633 +#include <linux/grsecurity.h>
76634 +#include <linux/grinternal.h>
76635 +#include <linux/capability.h>
76636 +#include <linux/module.h>
76637 +#include <linux/compat.h>
76638 +
76639 +#include <asm/uaccess.h>
76640 +
76641 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76642 +static char gr_exec_arg_buf[132];
76643 +static DEFINE_MUTEX(gr_exec_arg_mutex);
76644 +#endif
76645 +
76646 +struct user_arg_ptr {
76647 +#ifdef CONFIG_COMPAT
76648 + bool is_compat;
76649 +#endif
76650 + union {
76651 + const char __user *const __user *native;
76652 +#ifdef CONFIG_COMPAT
76653 + const compat_uptr_t __user *compat;
76654 +#endif
76655 + } ptr;
76656 +};
76657 +
76658 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76659 +
76660 +void
76661 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76662 +{
76663 +#ifdef CONFIG_GRKERNSEC_EXECLOG
76664 + char *grarg = gr_exec_arg_buf;
76665 + unsigned int i, x, execlen = 0;
76666 + char c;
76667 +
76668 + if (!((grsec_enable_execlog && grsec_enable_group &&
76669 + in_group_p(grsec_audit_gid))
76670 + || (grsec_enable_execlog && !grsec_enable_group)))
76671 + return;
76672 +
76673 + mutex_lock(&gr_exec_arg_mutex);
76674 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
76675 +
76676 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
76677 + const char __user *p;
76678 + unsigned int len;
76679 +
76680 + p = get_user_arg_ptr(argv, i);
76681 + if (IS_ERR(p))
76682 + goto log;
76683 +
76684 + len = strnlen_user(p, 128 - execlen);
76685 + if (len > 128 - execlen)
76686 + len = 128 - execlen;
76687 + else if (len > 0)
76688 + len--;
76689 + if (copy_from_user(grarg + execlen, p, len))
76690 + goto log;
76691 +
76692 + /* rewrite unprintable characters */
76693 + for (x = 0; x < len; x++) {
76694 + c = *(grarg + execlen + x);
76695 + if (c < 32 || c > 126)
76696 + *(grarg + execlen + x) = ' ';
76697 + }
76698 +
76699 + execlen += len;
76700 + *(grarg + execlen) = ' ';
76701 + *(grarg + execlen + 1) = '\0';
76702 + execlen++;
76703 + }
76704 +
76705 + log:
76706 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76707 + bprm->file->f_path.mnt, grarg);
76708 + mutex_unlock(&gr_exec_arg_mutex);
76709 +#endif
76710 + return;
76711 +}
76712 +
76713 +#ifdef CONFIG_GRKERNSEC
76714 +extern int gr_acl_is_capable(const int cap);
76715 +extern int gr_acl_is_capable_nolog(const int cap);
76716 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76717 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76718 +extern int gr_chroot_is_capable(const int cap);
76719 +extern int gr_chroot_is_capable_nolog(const int cap);
76720 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76721 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76722 +#endif
76723 +
76724 +const char *captab_log[] = {
76725 + "CAP_CHOWN",
76726 + "CAP_DAC_OVERRIDE",
76727 + "CAP_DAC_READ_SEARCH",
76728 + "CAP_FOWNER",
76729 + "CAP_FSETID",
76730 + "CAP_KILL",
76731 + "CAP_SETGID",
76732 + "CAP_SETUID",
76733 + "CAP_SETPCAP",
76734 + "CAP_LINUX_IMMUTABLE",
76735 + "CAP_NET_BIND_SERVICE",
76736 + "CAP_NET_BROADCAST",
76737 + "CAP_NET_ADMIN",
76738 + "CAP_NET_RAW",
76739 + "CAP_IPC_LOCK",
76740 + "CAP_IPC_OWNER",
76741 + "CAP_SYS_MODULE",
76742 + "CAP_SYS_RAWIO",
76743 + "CAP_SYS_CHROOT",
76744 + "CAP_SYS_PTRACE",
76745 + "CAP_SYS_PACCT",
76746 + "CAP_SYS_ADMIN",
76747 + "CAP_SYS_BOOT",
76748 + "CAP_SYS_NICE",
76749 + "CAP_SYS_RESOURCE",
76750 + "CAP_SYS_TIME",
76751 + "CAP_SYS_TTY_CONFIG",
76752 + "CAP_MKNOD",
76753 + "CAP_LEASE",
76754 + "CAP_AUDIT_WRITE",
76755 + "CAP_AUDIT_CONTROL",
76756 + "CAP_SETFCAP",
76757 + "CAP_MAC_OVERRIDE",
76758 + "CAP_MAC_ADMIN",
76759 + "CAP_SYSLOG",
76760 + "CAP_WAKE_ALARM",
76761 + "CAP_BLOCK_SUSPEND"
76762 +};
76763 +
76764 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76765 +
76766 +int gr_is_capable(const int cap)
76767 +{
76768 +#ifdef CONFIG_GRKERNSEC
76769 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76770 + return 1;
76771 + return 0;
76772 +#else
76773 + return 1;
76774 +#endif
76775 +}
76776 +
76777 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76778 +{
76779 +#ifdef CONFIG_GRKERNSEC
76780 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
76781 + return 1;
76782 + return 0;
76783 +#else
76784 + return 1;
76785 +#endif
76786 +}
76787 +
76788 +int gr_is_capable_nolog(const int cap)
76789 +{
76790 +#ifdef CONFIG_GRKERNSEC
76791 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
76792 + return 1;
76793 + return 0;
76794 +#else
76795 + return 1;
76796 +#endif
76797 +}
76798 +
76799 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
76800 +{
76801 +#ifdef CONFIG_GRKERNSEC
76802 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
76803 + return 1;
76804 + return 0;
76805 +#else
76806 + return 1;
76807 +#endif
76808 +}
76809 +
76810 +EXPORT_SYMBOL_GPL(gr_is_capable);
76811 +EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
76812 +EXPORT_SYMBOL_GPL(gr_task_is_capable);
76813 +EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
76814 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
76815 new file mode 100644
76816 index 0000000..06cc6ea
76817 --- /dev/null
76818 +++ b/grsecurity/grsec_fifo.c
76819 @@ -0,0 +1,24 @@
76820 +#include <linux/kernel.h>
76821 +#include <linux/sched.h>
76822 +#include <linux/fs.h>
76823 +#include <linux/file.h>
76824 +#include <linux/grinternal.h>
76825 +
76826 +int
76827 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
76828 + const struct dentry *dir, const int flag, const int acc_mode)
76829 +{
76830 +#ifdef CONFIG_GRKERNSEC_FIFO
76831 + const struct cred *cred = current_cred();
76832 +
76833 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
76834 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
76835 + !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
76836 + !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
76837 + if (!inode_permission(dentry->d_inode, acc_mode))
76838 + 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));
76839 + return -EACCES;
76840 + }
76841 +#endif
76842 + return 0;
76843 +}
76844 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
76845 new file mode 100644
76846 index 0000000..8ca18bf
76847 --- /dev/null
76848 +++ b/grsecurity/grsec_fork.c
76849 @@ -0,0 +1,23 @@
76850 +#include <linux/kernel.h>
76851 +#include <linux/sched.h>
76852 +#include <linux/grsecurity.h>
76853 +#include <linux/grinternal.h>
76854 +#include <linux/errno.h>
76855 +
76856 +void
76857 +gr_log_forkfail(const int retval)
76858 +{
76859 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
76860 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
76861 + switch (retval) {
76862 + case -EAGAIN:
76863 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
76864 + break;
76865 + case -ENOMEM:
76866 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
76867 + break;
76868 + }
76869 + }
76870 +#endif
76871 + return;
76872 +}
76873 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
76874 new file mode 100644
76875 index 0000000..b7cb191
76876 --- /dev/null
76877 +++ b/grsecurity/grsec_init.c
76878 @@ -0,0 +1,286 @@
76879 +#include <linux/kernel.h>
76880 +#include <linux/sched.h>
76881 +#include <linux/mm.h>
76882 +#include <linux/gracl.h>
76883 +#include <linux/slab.h>
76884 +#include <linux/vmalloc.h>
76885 +#include <linux/percpu.h>
76886 +#include <linux/module.h>
76887 +
76888 +int grsec_enable_ptrace_readexec;
76889 +int grsec_enable_setxid;
76890 +int grsec_enable_symlinkown;
76891 +kgid_t grsec_symlinkown_gid;
76892 +int grsec_enable_brute;
76893 +int grsec_enable_link;
76894 +int grsec_enable_dmesg;
76895 +int grsec_enable_harden_ptrace;
76896 +int grsec_enable_harden_ipc;
76897 +int grsec_enable_fifo;
76898 +int grsec_enable_execlog;
76899 +int grsec_enable_signal;
76900 +int grsec_enable_forkfail;
76901 +int grsec_enable_audit_ptrace;
76902 +int grsec_enable_time;
76903 +int grsec_enable_group;
76904 +kgid_t grsec_audit_gid;
76905 +int grsec_enable_chdir;
76906 +int grsec_enable_mount;
76907 +int grsec_enable_rofs;
76908 +int grsec_deny_new_usb;
76909 +int grsec_enable_chroot_findtask;
76910 +int grsec_enable_chroot_mount;
76911 +int grsec_enable_chroot_shmat;
76912 +int grsec_enable_chroot_fchdir;
76913 +int grsec_enable_chroot_double;
76914 +int grsec_enable_chroot_pivot;
76915 +int grsec_enable_chroot_chdir;
76916 +int grsec_enable_chroot_chmod;
76917 +int grsec_enable_chroot_mknod;
76918 +int grsec_enable_chroot_nice;
76919 +int grsec_enable_chroot_execlog;
76920 +int grsec_enable_chroot_caps;
76921 +int grsec_enable_chroot_sysctl;
76922 +int grsec_enable_chroot_unix;
76923 +int grsec_enable_tpe;
76924 +kgid_t grsec_tpe_gid;
76925 +int grsec_enable_blackhole;
76926 +#ifdef CONFIG_IPV6_MODULE
76927 +EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
76928 +#endif
76929 +int grsec_lastack_retries;
76930 +int grsec_enable_tpe_all;
76931 +int grsec_enable_tpe_invert;
76932 +int grsec_enable_socket_all;
76933 +kgid_t grsec_socket_all_gid;
76934 +int grsec_enable_socket_client;
76935 +kgid_t grsec_socket_client_gid;
76936 +int grsec_enable_socket_server;
76937 +kgid_t grsec_socket_server_gid;
76938 +int grsec_resource_logging;
76939 +int grsec_disable_privio;
76940 +int grsec_enable_log_rwxmaps;
76941 +int grsec_lock;
76942 +
76943 +DEFINE_SPINLOCK(grsec_alert_lock);
76944 +unsigned long grsec_alert_wtime = 0;
76945 +unsigned long grsec_alert_fyet = 0;
76946 +
76947 +DEFINE_SPINLOCK(grsec_audit_lock);
76948 +
76949 +DEFINE_RWLOCK(grsec_exec_file_lock);
76950 +
76951 +char *gr_shared_page[4];
76952 +
76953 +char *gr_alert_log_fmt;
76954 +char *gr_audit_log_fmt;
76955 +char *gr_alert_log_buf;
76956 +char *gr_audit_log_buf;
76957 +
76958 +extern struct gr_arg *gr_usermode;
76959 +extern unsigned char *gr_system_salt;
76960 +extern unsigned char *gr_system_sum;
76961 +
76962 +void __init
76963 +grsecurity_init(void)
76964 +{
76965 + int j;
76966 + /* create the per-cpu shared pages */
76967 +
76968 +#ifdef CONFIG_X86
76969 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
76970 +#endif
76971 +
76972 + for (j = 0; j < 4; j++) {
76973 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
76974 + if (gr_shared_page[j] == NULL) {
76975 + panic("Unable to allocate grsecurity shared page");
76976 + return;
76977 + }
76978 + }
76979 +
76980 + /* allocate log buffers */
76981 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
76982 + if (!gr_alert_log_fmt) {
76983 + panic("Unable to allocate grsecurity alert log format buffer");
76984 + return;
76985 + }
76986 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
76987 + if (!gr_audit_log_fmt) {
76988 + panic("Unable to allocate grsecurity audit log format buffer");
76989 + return;
76990 + }
76991 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76992 + if (!gr_alert_log_buf) {
76993 + panic("Unable to allocate grsecurity alert log buffer");
76994 + return;
76995 + }
76996 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76997 + if (!gr_audit_log_buf) {
76998 + panic("Unable to allocate grsecurity audit log buffer");
76999 + return;
77000 + }
77001 +
77002 + /* allocate memory for authentication structure */
77003 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
77004 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
77005 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
77006 +
77007 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
77008 + panic("Unable to allocate grsecurity authentication structure");
77009 + return;
77010 + }
77011 +
77012 +#ifdef CONFIG_GRKERNSEC_IO
77013 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
77014 + grsec_disable_privio = 1;
77015 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77016 + grsec_disable_privio = 1;
77017 +#else
77018 + grsec_disable_privio = 0;
77019 +#endif
77020 +#endif
77021 +
77022 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
77023 + /* for backward compatibility, tpe_invert always defaults to on if
77024 + enabled in the kernel
77025 + */
77026 + grsec_enable_tpe_invert = 1;
77027 +#endif
77028 +
77029 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
77030 +#ifndef CONFIG_GRKERNSEC_SYSCTL
77031 + grsec_lock = 1;
77032 +#endif
77033 +
77034 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77035 + grsec_enable_log_rwxmaps = 1;
77036 +#endif
77037 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
77038 + grsec_enable_group = 1;
77039 + grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
77040 +#endif
77041 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77042 + grsec_enable_ptrace_readexec = 1;
77043 +#endif
77044 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
77045 + grsec_enable_chdir = 1;
77046 +#endif
77047 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
77048 + grsec_enable_harden_ptrace = 1;
77049 +#endif
77050 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77051 + grsec_enable_harden_ipc = 1;
77052 +#endif
77053 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77054 + grsec_enable_mount = 1;
77055 +#endif
77056 +#ifdef CONFIG_GRKERNSEC_LINK
77057 + grsec_enable_link = 1;
77058 +#endif
77059 +#ifdef CONFIG_GRKERNSEC_BRUTE
77060 + grsec_enable_brute = 1;
77061 +#endif
77062 +#ifdef CONFIG_GRKERNSEC_DMESG
77063 + grsec_enable_dmesg = 1;
77064 +#endif
77065 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77066 + grsec_enable_blackhole = 1;
77067 + grsec_lastack_retries = 4;
77068 +#endif
77069 +#ifdef CONFIG_GRKERNSEC_FIFO
77070 + grsec_enable_fifo = 1;
77071 +#endif
77072 +#ifdef CONFIG_GRKERNSEC_EXECLOG
77073 + grsec_enable_execlog = 1;
77074 +#endif
77075 +#ifdef CONFIG_GRKERNSEC_SETXID
77076 + grsec_enable_setxid = 1;
77077 +#endif
77078 +#ifdef CONFIG_GRKERNSEC_SIGNAL
77079 + grsec_enable_signal = 1;
77080 +#endif
77081 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
77082 + grsec_enable_forkfail = 1;
77083 +#endif
77084 +#ifdef CONFIG_GRKERNSEC_TIME
77085 + grsec_enable_time = 1;
77086 +#endif
77087 +#ifdef CONFIG_GRKERNSEC_RESLOG
77088 + grsec_resource_logging = 1;
77089 +#endif
77090 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77091 + grsec_enable_chroot_findtask = 1;
77092 +#endif
77093 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77094 + grsec_enable_chroot_unix = 1;
77095 +#endif
77096 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77097 + grsec_enable_chroot_mount = 1;
77098 +#endif
77099 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77100 + grsec_enable_chroot_fchdir = 1;
77101 +#endif
77102 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77103 + grsec_enable_chroot_shmat = 1;
77104 +#endif
77105 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77106 + grsec_enable_audit_ptrace = 1;
77107 +#endif
77108 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77109 + grsec_enable_chroot_double = 1;
77110 +#endif
77111 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77112 + grsec_enable_chroot_pivot = 1;
77113 +#endif
77114 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77115 + grsec_enable_chroot_chdir = 1;
77116 +#endif
77117 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77118 + grsec_enable_chroot_chmod = 1;
77119 +#endif
77120 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77121 + grsec_enable_chroot_mknod = 1;
77122 +#endif
77123 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77124 + grsec_enable_chroot_nice = 1;
77125 +#endif
77126 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77127 + grsec_enable_chroot_execlog = 1;
77128 +#endif
77129 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77130 + grsec_enable_chroot_caps = 1;
77131 +#endif
77132 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77133 + grsec_enable_chroot_sysctl = 1;
77134 +#endif
77135 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77136 + grsec_enable_symlinkown = 1;
77137 + grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77138 +#endif
77139 +#ifdef CONFIG_GRKERNSEC_TPE
77140 + grsec_enable_tpe = 1;
77141 + grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77142 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
77143 + grsec_enable_tpe_all = 1;
77144 +#endif
77145 +#endif
77146 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77147 + grsec_enable_socket_all = 1;
77148 + grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77149 +#endif
77150 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77151 + grsec_enable_socket_client = 1;
77152 + grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77153 +#endif
77154 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77155 + grsec_enable_socket_server = 1;
77156 + grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77157 +#endif
77158 +#endif
77159 +#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77160 + grsec_deny_new_usb = 1;
77161 +#endif
77162 +
77163 + return;
77164 +}
77165 diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77166 new file mode 100644
77167 index 0000000..1773300
77168 --- /dev/null
77169 +++ b/grsecurity/grsec_ipc.c
77170 @@ -0,0 +1,48 @@
77171 +#include <linux/kernel.h>
77172 +#include <linux/mm.h>
77173 +#include <linux/sched.h>
77174 +#include <linux/file.h>
77175 +#include <linux/ipc.h>
77176 +#include <linux/ipc_namespace.h>
77177 +#include <linux/grsecurity.h>
77178 +#include <linux/grinternal.h>
77179 +
77180 +int
77181 +gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77182 +{
77183 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77184 + int write;
77185 + int orig_granted_mode;
77186 + kuid_t euid;
77187 + kgid_t egid;
77188 +
77189 + if (!grsec_enable_harden_ipc)
77190 + return 1;
77191 +
77192 + euid = current_euid();
77193 + egid = current_egid();
77194 +
77195 + write = requested_mode & 00002;
77196 + orig_granted_mode = ipcp->mode;
77197 +
77198 + if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77199 + orig_granted_mode >>= 6;
77200 + else {
77201 + /* if likely wrong permissions, lock to user */
77202 + if (orig_granted_mode & 0007)
77203 + orig_granted_mode = 0;
77204 + /* otherwise do a egid-only check */
77205 + else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77206 + orig_granted_mode >>= 3;
77207 + /* otherwise, no access */
77208 + else
77209 + orig_granted_mode = 0;
77210 + }
77211 + if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77212 + !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77213 + gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77214 + return 0;
77215 + }
77216 +#endif
77217 + return 1;
77218 +}
77219 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77220 new file mode 100644
77221 index 0000000..5e05e20
77222 --- /dev/null
77223 +++ b/grsecurity/grsec_link.c
77224 @@ -0,0 +1,58 @@
77225 +#include <linux/kernel.h>
77226 +#include <linux/sched.h>
77227 +#include <linux/fs.h>
77228 +#include <linux/file.h>
77229 +#include <linux/grinternal.h>
77230 +
77231 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77232 +{
77233 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77234 + const struct inode *link_inode = link->dentry->d_inode;
77235 +
77236 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77237 + /* ignore root-owned links, e.g. /proc/self */
77238 + gr_is_global_nonroot(link_inode->i_uid) && target &&
77239 + !uid_eq(link_inode->i_uid, target->i_uid)) {
77240 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77241 + return 1;
77242 + }
77243 +#endif
77244 + return 0;
77245 +}
77246 +
77247 +int
77248 +gr_handle_follow_link(const struct inode *parent,
77249 + const struct inode *inode,
77250 + const struct dentry *dentry, const struct vfsmount *mnt)
77251 +{
77252 +#ifdef CONFIG_GRKERNSEC_LINK
77253 + const struct cred *cred = current_cred();
77254 +
77255 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77256 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77257 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77258 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77259 + return -EACCES;
77260 + }
77261 +#endif
77262 + return 0;
77263 +}
77264 +
77265 +int
77266 +gr_handle_hardlink(const struct dentry *dentry,
77267 + const struct vfsmount *mnt,
77268 + struct inode *inode, const int mode, const struct filename *to)
77269 +{
77270 +#ifdef CONFIG_GRKERNSEC_LINK
77271 + const struct cred *cred = current_cred();
77272 +
77273 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77274 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77275 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77276 + !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77277 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77278 + return -EPERM;
77279 + }
77280 +#endif
77281 + return 0;
77282 +}
77283 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77284 new file mode 100644
77285 index 0000000..dbe0a6b
77286 --- /dev/null
77287 +++ b/grsecurity/grsec_log.c
77288 @@ -0,0 +1,341 @@
77289 +#include <linux/kernel.h>
77290 +#include <linux/sched.h>
77291 +#include <linux/file.h>
77292 +#include <linux/tty.h>
77293 +#include <linux/fs.h>
77294 +#include <linux/mm.h>
77295 +#include <linux/grinternal.h>
77296 +
77297 +#ifdef CONFIG_TREE_PREEMPT_RCU
77298 +#define DISABLE_PREEMPT() preempt_disable()
77299 +#define ENABLE_PREEMPT() preempt_enable()
77300 +#else
77301 +#define DISABLE_PREEMPT()
77302 +#define ENABLE_PREEMPT()
77303 +#endif
77304 +
77305 +#define BEGIN_LOCKS(x) \
77306 + DISABLE_PREEMPT(); \
77307 + rcu_read_lock(); \
77308 + read_lock(&tasklist_lock); \
77309 + read_lock(&grsec_exec_file_lock); \
77310 + if (x != GR_DO_AUDIT) \
77311 + spin_lock(&grsec_alert_lock); \
77312 + else \
77313 + spin_lock(&grsec_audit_lock)
77314 +
77315 +#define END_LOCKS(x) \
77316 + if (x != GR_DO_AUDIT) \
77317 + spin_unlock(&grsec_alert_lock); \
77318 + else \
77319 + spin_unlock(&grsec_audit_lock); \
77320 + read_unlock(&grsec_exec_file_lock); \
77321 + read_unlock(&tasklist_lock); \
77322 + rcu_read_unlock(); \
77323 + ENABLE_PREEMPT(); \
77324 + if (x == GR_DONT_AUDIT) \
77325 + gr_handle_alertkill(current)
77326 +
77327 +enum {
77328 + FLOODING,
77329 + NO_FLOODING
77330 +};
77331 +
77332 +extern char *gr_alert_log_fmt;
77333 +extern char *gr_audit_log_fmt;
77334 +extern char *gr_alert_log_buf;
77335 +extern char *gr_audit_log_buf;
77336 +
77337 +static int gr_log_start(int audit)
77338 +{
77339 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77340 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77341 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77342 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77343 + unsigned long curr_secs = get_seconds();
77344 +
77345 + if (audit == GR_DO_AUDIT)
77346 + goto set_fmt;
77347 +
77348 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77349 + grsec_alert_wtime = curr_secs;
77350 + grsec_alert_fyet = 0;
77351 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77352 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77353 + grsec_alert_fyet++;
77354 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77355 + grsec_alert_wtime = curr_secs;
77356 + grsec_alert_fyet++;
77357 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77358 + return FLOODING;
77359 + }
77360 + else return FLOODING;
77361 +
77362 +set_fmt:
77363 +#endif
77364 + memset(buf, 0, PAGE_SIZE);
77365 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
77366 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77367 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77368 + } else if (current->signal->curr_ip) {
77369 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77370 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77371 + } else if (gr_acl_is_enabled()) {
77372 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77373 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77374 + } else {
77375 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
77376 + strcpy(buf, fmt);
77377 + }
77378 +
77379 + return NO_FLOODING;
77380 +}
77381 +
77382 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77383 + __attribute__ ((format (printf, 2, 0)));
77384 +
77385 +static void gr_log_middle(int audit, const char *msg, va_list ap)
77386 +{
77387 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77388 + unsigned int len = strlen(buf);
77389 +
77390 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77391 +
77392 + return;
77393 +}
77394 +
77395 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77396 + __attribute__ ((format (printf, 2, 3)));
77397 +
77398 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
77399 +{
77400 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77401 + unsigned int len = strlen(buf);
77402 + va_list ap;
77403 +
77404 + va_start(ap, msg);
77405 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77406 + va_end(ap);
77407 +
77408 + return;
77409 +}
77410 +
77411 +static void gr_log_end(int audit, int append_default)
77412 +{
77413 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77414 + if (append_default) {
77415 + struct task_struct *task = current;
77416 + struct task_struct *parent = task->real_parent;
77417 + const struct cred *cred = __task_cred(task);
77418 + const struct cred *pcred = __task_cred(parent);
77419 + unsigned int len = strlen(buf);
77420 +
77421 + 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));
77422 + }
77423 +
77424 + printk("%s\n", buf);
77425 +
77426 + return;
77427 +}
77428 +
77429 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77430 +{
77431 + int logtype;
77432 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77433 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77434 + void *voidptr = NULL;
77435 + int num1 = 0, num2 = 0;
77436 + unsigned long ulong1 = 0, ulong2 = 0;
77437 + struct dentry *dentry = NULL;
77438 + struct vfsmount *mnt = NULL;
77439 + struct file *file = NULL;
77440 + struct task_struct *task = NULL;
77441 + struct vm_area_struct *vma = NULL;
77442 + const struct cred *cred, *pcred;
77443 + va_list ap;
77444 +
77445 + BEGIN_LOCKS(audit);
77446 + logtype = gr_log_start(audit);
77447 + if (logtype == FLOODING) {
77448 + END_LOCKS(audit);
77449 + return;
77450 + }
77451 + va_start(ap, argtypes);
77452 + switch (argtypes) {
77453 + case GR_TTYSNIFF:
77454 + task = va_arg(ap, struct task_struct *);
77455 + 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));
77456 + break;
77457 + case GR_SYSCTL_HIDDEN:
77458 + str1 = va_arg(ap, char *);
77459 + gr_log_middle_varargs(audit, msg, result, str1);
77460 + break;
77461 + case GR_RBAC:
77462 + dentry = va_arg(ap, struct dentry *);
77463 + mnt = va_arg(ap, struct vfsmount *);
77464 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77465 + break;
77466 + case GR_RBAC_STR:
77467 + dentry = va_arg(ap, struct dentry *);
77468 + mnt = va_arg(ap, struct vfsmount *);
77469 + str1 = va_arg(ap, char *);
77470 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77471 + break;
77472 + case GR_STR_RBAC:
77473 + str1 = va_arg(ap, char *);
77474 + dentry = va_arg(ap, struct dentry *);
77475 + mnt = va_arg(ap, struct vfsmount *);
77476 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77477 + break;
77478 + case GR_RBAC_MODE2:
77479 + dentry = va_arg(ap, struct dentry *);
77480 + mnt = va_arg(ap, struct vfsmount *);
77481 + str1 = va_arg(ap, char *);
77482 + str2 = va_arg(ap, char *);
77483 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77484 + break;
77485 + case GR_RBAC_MODE3:
77486 + dentry = va_arg(ap, struct dentry *);
77487 + mnt = va_arg(ap, struct vfsmount *);
77488 + str1 = va_arg(ap, char *);
77489 + str2 = va_arg(ap, char *);
77490 + str3 = va_arg(ap, char *);
77491 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77492 + break;
77493 + case GR_FILENAME:
77494 + dentry = va_arg(ap, struct dentry *);
77495 + mnt = va_arg(ap, struct vfsmount *);
77496 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77497 + break;
77498 + case GR_STR_FILENAME:
77499 + str1 = va_arg(ap, char *);
77500 + dentry = va_arg(ap, struct dentry *);
77501 + mnt = va_arg(ap, struct vfsmount *);
77502 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77503 + break;
77504 + case GR_FILENAME_STR:
77505 + dentry = va_arg(ap, struct dentry *);
77506 + mnt = va_arg(ap, struct vfsmount *);
77507 + str1 = va_arg(ap, char *);
77508 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77509 + break;
77510 + case GR_FILENAME_TWO_INT:
77511 + dentry = va_arg(ap, struct dentry *);
77512 + mnt = va_arg(ap, struct vfsmount *);
77513 + num1 = va_arg(ap, int);
77514 + num2 = va_arg(ap, int);
77515 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77516 + break;
77517 + case GR_FILENAME_TWO_INT_STR:
77518 + dentry = va_arg(ap, struct dentry *);
77519 + mnt = va_arg(ap, struct vfsmount *);
77520 + num1 = va_arg(ap, int);
77521 + num2 = va_arg(ap, int);
77522 + str1 = va_arg(ap, char *);
77523 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77524 + break;
77525 + case GR_TEXTREL:
77526 + file = va_arg(ap, struct file *);
77527 + ulong1 = va_arg(ap, unsigned long);
77528 + ulong2 = va_arg(ap, unsigned long);
77529 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77530 + break;
77531 + case GR_PTRACE:
77532 + task = va_arg(ap, struct task_struct *);
77533 + 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));
77534 + break;
77535 + case GR_RESOURCE:
77536 + task = va_arg(ap, struct task_struct *);
77537 + cred = __task_cred(task);
77538 + pcred = __task_cred(task->real_parent);
77539 + ulong1 = va_arg(ap, unsigned long);
77540 + str1 = va_arg(ap, char *);
77541 + ulong2 = va_arg(ap, unsigned long);
77542 + 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));
77543 + break;
77544 + case GR_CAP:
77545 + task = va_arg(ap, struct task_struct *);
77546 + cred = __task_cred(task);
77547 + pcred = __task_cred(task->real_parent);
77548 + str1 = va_arg(ap, char *);
77549 + 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));
77550 + break;
77551 + case GR_SIG:
77552 + str1 = va_arg(ap, char *);
77553 + voidptr = va_arg(ap, void *);
77554 + gr_log_middle_varargs(audit, msg, str1, voidptr);
77555 + break;
77556 + case GR_SIG2:
77557 + task = va_arg(ap, struct task_struct *);
77558 + cred = __task_cred(task);
77559 + pcred = __task_cred(task->real_parent);
77560 + num1 = va_arg(ap, int);
77561 + 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));
77562 + break;
77563 + case GR_CRASH1:
77564 + task = va_arg(ap, struct task_struct *);
77565 + cred = __task_cred(task);
77566 + pcred = __task_cred(task->real_parent);
77567 + ulong1 = va_arg(ap, unsigned long);
77568 + 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);
77569 + break;
77570 + case GR_CRASH2:
77571 + task = va_arg(ap, struct task_struct *);
77572 + cred = __task_cred(task);
77573 + pcred = __task_cred(task->real_parent);
77574 + ulong1 = va_arg(ap, unsigned long);
77575 + 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);
77576 + break;
77577 + case GR_RWXMAP:
77578 + file = va_arg(ap, struct file *);
77579 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77580 + break;
77581 + case GR_RWXMAPVMA:
77582 + vma = va_arg(ap, struct vm_area_struct *);
77583 + if (vma->vm_file)
77584 + str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77585 + else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77586 + str1 = "<stack>";
77587 + else if (vma->vm_start <= current->mm->brk &&
77588 + vma->vm_end >= current->mm->start_brk)
77589 + str1 = "<heap>";
77590 + else
77591 + str1 = "<anonymous mapping>";
77592 + gr_log_middle_varargs(audit, msg, str1);
77593 + break;
77594 + case GR_PSACCT:
77595 + {
77596 + unsigned int wday, cday;
77597 + __u8 whr, chr;
77598 + __u8 wmin, cmin;
77599 + __u8 wsec, csec;
77600 + char cur_tty[64] = { 0 };
77601 + char parent_tty[64] = { 0 };
77602 +
77603 + task = va_arg(ap, struct task_struct *);
77604 + wday = va_arg(ap, unsigned int);
77605 + cday = va_arg(ap, unsigned int);
77606 + whr = va_arg(ap, int);
77607 + chr = va_arg(ap, int);
77608 + wmin = va_arg(ap, int);
77609 + cmin = va_arg(ap, int);
77610 + wsec = va_arg(ap, int);
77611 + csec = va_arg(ap, int);
77612 + ulong1 = va_arg(ap, unsigned long);
77613 + cred = __task_cred(task);
77614 + pcred = __task_cred(task->real_parent);
77615 +
77616 + 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));
77617 + }
77618 + break;
77619 + default:
77620 + gr_log_middle(audit, msg, ap);
77621 + }
77622 + va_end(ap);
77623 + // these don't need DEFAULTSECARGS printed on the end
77624 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77625 + gr_log_end(audit, 0);
77626 + else
77627 + gr_log_end(audit, 1);
77628 + END_LOCKS(audit);
77629 +}
77630 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77631 new file mode 100644
77632 index 0000000..0e39d8c
77633 --- /dev/null
77634 +++ b/grsecurity/grsec_mem.c
77635 @@ -0,0 +1,48 @@
77636 +#include <linux/kernel.h>
77637 +#include <linux/sched.h>
77638 +#include <linux/mm.h>
77639 +#include <linux/mman.h>
77640 +#include <linux/module.h>
77641 +#include <linux/grinternal.h>
77642 +
77643 +void gr_handle_msr_write(void)
77644 +{
77645 + gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77646 + return;
77647 +}
77648 +EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77649 +
77650 +void
77651 +gr_handle_ioperm(void)
77652 +{
77653 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77654 + return;
77655 +}
77656 +
77657 +void
77658 +gr_handle_iopl(void)
77659 +{
77660 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77661 + return;
77662 +}
77663 +
77664 +void
77665 +gr_handle_mem_readwrite(u64 from, u64 to)
77666 +{
77667 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77668 + return;
77669 +}
77670 +
77671 +void
77672 +gr_handle_vm86(void)
77673 +{
77674 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77675 + return;
77676 +}
77677 +
77678 +void
77679 +gr_log_badprocpid(const char *entry)
77680 +{
77681 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77682 + return;
77683 +}
77684 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77685 new file mode 100644
77686 index 0000000..6f9eb73
77687 --- /dev/null
77688 +++ b/grsecurity/grsec_mount.c
77689 @@ -0,0 +1,65 @@
77690 +#include <linux/kernel.h>
77691 +#include <linux/sched.h>
77692 +#include <linux/mount.h>
77693 +#include <linux/major.h>
77694 +#include <linux/grsecurity.h>
77695 +#include <linux/grinternal.h>
77696 +
77697 +void
77698 +gr_log_remount(const char *devname, const int retval)
77699 +{
77700 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77701 + if (grsec_enable_mount && (retval >= 0))
77702 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77703 +#endif
77704 + return;
77705 +}
77706 +
77707 +void
77708 +gr_log_unmount(const char *devname, const int retval)
77709 +{
77710 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77711 + if (grsec_enable_mount && (retval >= 0))
77712 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77713 +#endif
77714 + return;
77715 +}
77716 +
77717 +void
77718 +gr_log_mount(const char *from, struct path *to, const int retval)
77719 +{
77720 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77721 + if (grsec_enable_mount && (retval >= 0))
77722 + gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77723 +#endif
77724 + return;
77725 +}
77726 +
77727 +int
77728 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77729 +{
77730 +#ifdef CONFIG_GRKERNSEC_ROFS
77731 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77732 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77733 + return -EPERM;
77734 + } else
77735 + return 0;
77736 +#endif
77737 + return 0;
77738 +}
77739 +
77740 +int
77741 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77742 +{
77743 +#ifdef CONFIG_GRKERNSEC_ROFS
77744 + struct inode *inode = dentry->d_inode;
77745 +
77746 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77747 + inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77748 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77749 + return -EPERM;
77750 + } else
77751 + return 0;
77752 +#endif
77753 + return 0;
77754 +}
77755 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77756 new file mode 100644
77757 index 0000000..6ee9d50
77758 --- /dev/null
77759 +++ b/grsecurity/grsec_pax.c
77760 @@ -0,0 +1,45 @@
77761 +#include <linux/kernel.h>
77762 +#include <linux/sched.h>
77763 +#include <linux/mm.h>
77764 +#include <linux/file.h>
77765 +#include <linux/grinternal.h>
77766 +#include <linux/grsecurity.h>
77767 +
77768 +void
77769 +gr_log_textrel(struct vm_area_struct * vma)
77770 +{
77771 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77772 + if (grsec_enable_log_rwxmaps)
77773 + gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77774 +#endif
77775 + return;
77776 +}
77777 +
77778 +void gr_log_ptgnustack(struct file *file)
77779 +{
77780 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77781 + if (grsec_enable_log_rwxmaps)
77782 + gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
77783 +#endif
77784 + return;
77785 +}
77786 +
77787 +void
77788 +gr_log_rwxmmap(struct file *file)
77789 +{
77790 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77791 + if (grsec_enable_log_rwxmaps)
77792 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
77793 +#endif
77794 + return;
77795 +}
77796 +
77797 +void
77798 +gr_log_rwxmprotect(struct vm_area_struct *vma)
77799 +{
77800 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77801 + if (grsec_enable_log_rwxmaps)
77802 + gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
77803 +#endif
77804 + return;
77805 +}
77806 diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
77807 new file mode 100644
77808 index 0000000..2005a3a
77809 --- /dev/null
77810 +++ b/grsecurity/grsec_proc.c
77811 @@ -0,0 +1,20 @@
77812 +#include <linux/kernel.h>
77813 +#include <linux/sched.h>
77814 +#include <linux/grsecurity.h>
77815 +#include <linux/grinternal.h>
77816 +
77817 +int gr_proc_is_restricted(void)
77818 +{
77819 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77820 + const struct cred *cred = current_cred();
77821 +#endif
77822 +
77823 +#ifdef CONFIG_GRKERNSEC_PROC_USER
77824 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
77825 + return -EACCES;
77826 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77827 + if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
77828 + return -EACCES;
77829 +#endif
77830 + return 0;
77831 +}
77832 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
77833 new file mode 100644
77834 index 0000000..f7f29aa
77835 --- /dev/null
77836 +++ b/grsecurity/grsec_ptrace.c
77837 @@ -0,0 +1,30 @@
77838 +#include <linux/kernel.h>
77839 +#include <linux/sched.h>
77840 +#include <linux/grinternal.h>
77841 +#include <linux/security.h>
77842 +
77843 +void
77844 +gr_audit_ptrace(struct task_struct *task)
77845 +{
77846 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77847 + if (grsec_enable_audit_ptrace)
77848 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
77849 +#endif
77850 + return;
77851 +}
77852 +
77853 +int
77854 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
77855 +{
77856 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77857 + const struct dentry *dentry = file->f_path.dentry;
77858 + const struct vfsmount *mnt = file->f_path.mnt;
77859 +
77860 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
77861 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
77862 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
77863 + return -EACCES;
77864 + }
77865 +#endif
77866 + return 0;
77867 +}
77868 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
77869 new file mode 100644
77870 index 0000000..3860c7e
77871 --- /dev/null
77872 +++ b/grsecurity/grsec_sig.c
77873 @@ -0,0 +1,236 @@
77874 +#include <linux/kernel.h>
77875 +#include <linux/sched.h>
77876 +#include <linux/fs.h>
77877 +#include <linux/delay.h>
77878 +#include <linux/grsecurity.h>
77879 +#include <linux/grinternal.h>
77880 +#include <linux/hardirq.h>
77881 +
77882 +char *signames[] = {
77883 + [SIGSEGV] = "Segmentation fault",
77884 + [SIGILL] = "Illegal instruction",
77885 + [SIGABRT] = "Abort",
77886 + [SIGBUS] = "Invalid alignment/Bus error"
77887 +};
77888 +
77889 +void
77890 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
77891 +{
77892 +#ifdef CONFIG_GRKERNSEC_SIGNAL
77893 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
77894 + (sig == SIGABRT) || (sig == SIGBUS))) {
77895 + if (task_pid_nr(t) == task_pid_nr(current)) {
77896 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
77897 + } else {
77898 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
77899 + }
77900 + }
77901 +#endif
77902 + return;
77903 +}
77904 +
77905 +int
77906 +gr_handle_signal(const struct task_struct *p, const int sig)
77907 +{
77908 +#ifdef CONFIG_GRKERNSEC
77909 + /* ignore the 0 signal for protected task checks */
77910 + if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
77911 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
77912 + return -EPERM;
77913 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
77914 + return -EPERM;
77915 + }
77916 +#endif
77917 + return 0;
77918 +}
77919 +
77920 +#ifdef CONFIG_GRKERNSEC
77921 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
77922 +
77923 +int gr_fake_force_sig(int sig, struct task_struct *t)
77924 +{
77925 + unsigned long int flags;
77926 + int ret, blocked, ignored;
77927 + struct k_sigaction *action;
77928 +
77929 + spin_lock_irqsave(&t->sighand->siglock, flags);
77930 + action = &t->sighand->action[sig-1];
77931 + ignored = action->sa.sa_handler == SIG_IGN;
77932 + blocked = sigismember(&t->blocked, sig);
77933 + if (blocked || ignored) {
77934 + action->sa.sa_handler = SIG_DFL;
77935 + if (blocked) {
77936 + sigdelset(&t->blocked, sig);
77937 + recalc_sigpending_and_wake(t);
77938 + }
77939 + }
77940 + if (action->sa.sa_handler == SIG_DFL)
77941 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
77942 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
77943 +
77944 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
77945 +
77946 + return ret;
77947 +}
77948 +#endif
77949 +
77950 +#define GR_USER_BAN_TIME (15 * 60)
77951 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
77952 +
77953 +void gr_handle_brute_attach(int dumpable)
77954 +{
77955 +#ifdef CONFIG_GRKERNSEC_BRUTE
77956 + struct task_struct *p = current;
77957 + kuid_t uid = GLOBAL_ROOT_UID;
77958 + int daemon = 0;
77959 +
77960 + if (!grsec_enable_brute)
77961 + return;
77962 +
77963 + rcu_read_lock();
77964 + read_lock(&tasklist_lock);
77965 + read_lock(&grsec_exec_file_lock);
77966 + if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
77967 + p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
77968 + p->real_parent->brute = 1;
77969 + daemon = 1;
77970 + } else {
77971 + const struct cred *cred = __task_cred(p), *cred2;
77972 + struct task_struct *tsk, *tsk2;
77973 +
77974 + if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
77975 + struct user_struct *user;
77976 +
77977 + uid = cred->uid;
77978 +
77979 + /* this is put upon execution past expiration */
77980 + user = find_user(uid);
77981 + if (user == NULL)
77982 + goto unlock;
77983 + user->suid_banned = 1;
77984 + user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
77985 + if (user->suid_ban_expires == ~0UL)
77986 + user->suid_ban_expires--;
77987 +
77988 + /* only kill other threads of the same binary, from the same user */
77989 + do_each_thread(tsk2, tsk) {
77990 + cred2 = __task_cred(tsk);
77991 + if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
77992 + gr_fake_force_sig(SIGKILL, tsk);
77993 + } while_each_thread(tsk2, tsk);
77994 + }
77995 + }
77996 +unlock:
77997 + read_unlock(&grsec_exec_file_lock);
77998 + read_unlock(&tasklist_lock);
77999 + rcu_read_unlock();
78000 +
78001 + if (gr_is_global_nonroot(uid))
78002 + 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);
78003 + else if (daemon)
78004 + gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
78005 +
78006 +#endif
78007 + return;
78008 +}
78009 +
78010 +void gr_handle_brute_check(void)
78011 +{
78012 +#ifdef CONFIG_GRKERNSEC_BRUTE
78013 + struct task_struct *p = current;
78014 +
78015 + if (unlikely(p->brute)) {
78016 + if (!grsec_enable_brute)
78017 + p->brute = 0;
78018 + else if (time_before(get_seconds(), p->brute_expires))
78019 + msleep(30 * 1000);
78020 + }
78021 +#endif
78022 + return;
78023 +}
78024 +
78025 +void gr_handle_kernel_exploit(void)
78026 +{
78027 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78028 + const struct cred *cred;
78029 + struct task_struct *tsk, *tsk2;
78030 + struct user_struct *user;
78031 + kuid_t uid;
78032 +
78033 + if (in_irq() || in_serving_softirq() || in_nmi())
78034 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
78035 +
78036 + uid = current_uid();
78037 +
78038 + if (gr_is_global_root(uid))
78039 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
78040 + else {
78041 + /* kill all the processes of this user, hold a reference
78042 + to their creds struct, and prevent them from creating
78043 + another process until system reset
78044 + */
78045 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
78046 + GR_GLOBAL_UID(uid));
78047 + /* we intentionally leak this ref */
78048 + user = get_uid(current->cred->user);
78049 + if (user)
78050 + user->kernel_banned = 1;
78051 +
78052 + /* kill all processes of this user */
78053 + read_lock(&tasklist_lock);
78054 + do_each_thread(tsk2, tsk) {
78055 + cred = __task_cred(tsk);
78056 + if (uid_eq(cred->uid, uid))
78057 + gr_fake_force_sig(SIGKILL, tsk);
78058 + } while_each_thread(tsk2, tsk);
78059 + read_unlock(&tasklist_lock);
78060 + }
78061 +#endif
78062 +}
78063 +
78064 +#ifdef CONFIG_GRKERNSEC_BRUTE
78065 +static bool suid_ban_expired(struct user_struct *user)
78066 +{
78067 + if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
78068 + user->suid_banned = 0;
78069 + user->suid_ban_expires = 0;
78070 + free_uid(user);
78071 + return true;
78072 + }
78073 +
78074 + return false;
78075 +}
78076 +#endif
78077 +
78078 +int gr_process_kernel_exec_ban(void)
78079 +{
78080 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78081 + if (unlikely(current->cred->user->kernel_banned))
78082 + return -EPERM;
78083 +#endif
78084 + return 0;
78085 +}
78086 +
78087 +int gr_process_kernel_setuid_ban(struct user_struct *user)
78088 +{
78089 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78090 + if (unlikely(user->kernel_banned))
78091 + gr_fake_force_sig(SIGKILL, current);
78092 +#endif
78093 + return 0;
78094 +}
78095 +
78096 +int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78097 +{
78098 +#ifdef CONFIG_GRKERNSEC_BRUTE
78099 + struct user_struct *user = current->cred->user;
78100 + if (unlikely(user->suid_banned)) {
78101 + if (suid_ban_expired(user))
78102 + return 0;
78103 + /* disallow execution of suid binaries only */
78104 + else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78105 + return -EPERM;
78106 + }
78107 +#endif
78108 + return 0;
78109 +}
78110 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78111 new file mode 100644
78112 index 0000000..e3650b6
78113 --- /dev/null
78114 +++ b/grsecurity/grsec_sock.c
78115 @@ -0,0 +1,244 @@
78116 +#include <linux/kernel.h>
78117 +#include <linux/module.h>
78118 +#include <linux/sched.h>
78119 +#include <linux/file.h>
78120 +#include <linux/net.h>
78121 +#include <linux/in.h>
78122 +#include <linux/ip.h>
78123 +#include <net/sock.h>
78124 +#include <net/inet_sock.h>
78125 +#include <linux/grsecurity.h>
78126 +#include <linux/grinternal.h>
78127 +#include <linux/gracl.h>
78128 +
78129 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78130 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78131 +
78132 +EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78133 +EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78134 +
78135 +#ifdef CONFIG_UNIX_MODULE
78136 +EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78137 +EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78138 +EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78139 +EXPORT_SYMBOL_GPL(gr_handle_create);
78140 +#endif
78141 +
78142 +#ifdef CONFIG_GRKERNSEC
78143 +#define gr_conn_table_size 32749
78144 +struct conn_table_entry {
78145 + struct conn_table_entry *next;
78146 + struct signal_struct *sig;
78147 +};
78148 +
78149 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78150 +DEFINE_SPINLOCK(gr_conn_table_lock);
78151 +
78152 +extern const char * gr_socktype_to_name(unsigned char type);
78153 +extern const char * gr_proto_to_name(unsigned char proto);
78154 +extern const char * gr_sockfamily_to_name(unsigned char family);
78155 +
78156 +static __inline__ int
78157 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78158 +{
78159 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78160 +}
78161 +
78162 +static __inline__ int
78163 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78164 + __u16 sport, __u16 dport)
78165 +{
78166 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78167 + sig->gr_sport == sport && sig->gr_dport == dport))
78168 + return 1;
78169 + else
78170 + return 0;
78171 +}
78172 +
78173 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78174 +{
78175 + struct conn_table_entry **match;
78176 + unsigned int index;
78177 +
78178 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78179 + sig->gr_sport, sig->gr_dport,
78180 + gr_conn_table_size);
78181 +
78182 + newent->sig = sig;
78183 +
78184 + match = &gr_conn_table[index];
78185 + newent->next = *match;
78186 + *match = newent;
78187 +
78188 + return;
78189 +}
78190 +
78191 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78192 +{
78193 + struct conn_table_entry *match, *last = NULL;
78194 + unsigned int index;
78195 +
78196 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78197 + sig->gr_sport, sig->gr_dport,
78198 + gr_conn_table_size);
78199 +
78200 + match = gr_conn_table[index];
78201 + while (match && !conn_match(match->sig,
78202 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78203 + sig->gr_dport)) {
78204 + last = match;
78205 + match = match->next;
78206 + }
78207 +
78208 + if (match) {
78209 + if (last)
78210 + last->next = match->next;
78211 + else
78212 + gr_conn_table[index] = NULL;
78213 + kfree(match);
78214 + }
78215 +
78216 + return;
78217 +}
78218 +
78219 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78220 + __u16 sport, __u16 dport)
78221 +{
78222 + struct conn_table_entry *match;
78223 + unsigned int index;
78224 +
78225 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78226 +
78227 + match = gr_conn_table[index];
78228 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78229 + match = match->next;
78230 +
78231 + if (match)
78232 + return match->sig;
78233 + else
78234 + return NULL;
78235 +}
78236 +
78237 +#endif
78238 +
78239 +void gr_update_task_in_ip_table(const struct inet_sock *inet)
78240 +{
78241 +#ifdef CONFIG_GRKERNSEC
78242 + struct signal_struct *sig = current->signal;
78243 + struct conn_table_entry *newent;
78244 +
78245 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78246 + if (newent == NULL)
78247 + return;
78248 + /* no bh lock needed since we are called with bh disabled */
78249 + spin_lock(&gr_conn_table_lock);
78250 + gr_del_task_from_ip_table_nolock(sig);
78251 + sig->gr_saddr = inet->inet_rcv_saddr;
78252 + sig->gr_daddr = inet->inet_daddr;
78253 + sig->gr_sport = inet->inet_sport;
78254 + sig->gr_dport = inet->inet_dport;
78255 + gr_add_to_task_ip_table_nolock(sig, newent);
78256 + spin_unlock(&gr_conn_table_lock);
78257 +#endif
78258 + return;
78259 +}
78260 +
78261 +void gr_del_task_from_ip_table(struct task_struct *task)
78262 +{
78263 +#ifdef CONFIG_GRKERNSEC
78264 + spin_lock_bh(&gr_conn_table_lock);
78265 + gr_del_task_from_ip_table_nolock(task->signal);
78266 + spin_unlock_bh(&gr_conn_table_lock);
78267 +#endif
78268 + return;
78269 +}
78270 +
78271 +void
78272 +gr_attach_curr_ip(const struct sock *sk)
78273 +{
78274 +#ifdef CONFIG_GRKERNSEC
78275 + struct signal_struct *p, *set;
78276 + const struct inet_sock *inet = inet_sk(sk);
78277 +
78278 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78279 + return;
78280 +
78281 + set = current->signal;
78282 +
78283 + spin_lock_bh(&gr_conn_table_lock);
78284 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78285 + inet->inet_dport, inet->inet_sport);
78286 + if (unlikely(p != NULL)) {
78287 + set->curr_ip = p->curr_ip;
78288 + set->used_accept = 1;
78289 + gr_del_task_from_ip_table_nolock(p);
78290 + spin_unlock_bh(&gr_conn_table_lock);
78291 + return;
78292 + }
78293 + spin_unlock_bh(&gr_conn_table_lock);
78294 +
78295 + set->curr_ip = inet->inet_daddr;
78296 + set->used_accept = 1;
78297 +#endif
78298 + return;
78299 +}
78300 +
78301 +int
78302 +gr_handle_sock_all(const int family, const int type, const int protocol)
78303 +{
78304 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78305 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78306 + (family != AF_UNIX)) {
78307 + if (family == AF_INET)
78308 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78309 + else
78310 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78311 + return -EACCES;
78312 + }
78313 +#endif
78314 + return 0;
78315 +}
78316 +
78317 +int
78318 +gr_handle_sock_server(const struct sockaddr *sck)
78319 +{
78320 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78321 + if (grsec_enable_socket_server &&
78322 + in_group_p(grsec_socket_server_gid) &&
78323 + sck && (sck->sa_family != AF_UNIX) &&
78324 + (sck->sa_family != AF_LOCAL)) {
78325 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78326 + return -EACCES;
78327 + }
78328 +#endif
78329 + return 0;
78330 +}
78331 +
78332 +int
78333 +gr_handle_sock_server_other(const struct sock *sck)
78334 +{
78335 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78336 + if (grsec_enable_socket_server &&
78337 + in_group_p(grsec_socket_server_gid) &&
78338 + sck && (sck->sk_family != AF_UNIX) &&
78339 + (sck->sk_family != AF_LOCAL)) {
78340 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78341 + return -EACCES;
78342 + }
78343 +#endif
78344 + return 0;
78345 +}
78346 +
78347 +int
78348 +gr_handle_sock_client(const struct sockaddr *sck)
78349 +{
78350 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78351 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78352 + sck && (sck->sa_family != AF_UNIX) &&
78353 + (sck->sa_family != AF_LOCAL)) {
78354 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78355 + return -EACCES;
78356 + }
78357 +#endif
78358 + return 0;
78359 +}
78360 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78361 new file mode 100644
78362 index 0000000..8159888
78363 --- /dev/null
78364 +++ b/grsecurity/grsec_sysctl.c
78365 @@ -0,0 +1,479 @@
78366 +#include <linux/kernel.h>
78367 +#include <linux/sched.h>
78368 +#include <linux/sysctl.h>
78369 +#include <linux/grsecurity.h>
78370 +#include <linux/grinternal.h>
78371 +
78372 +int
78373 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78374 +{
78375 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78376 + if (dirname == NULL || name == NULL)
78377 + return 0;
78378 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78379 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78380 + return -EACCES;
78381 + }
78382 +#endif
78383 + return 0;
78384 +}
78385 +
78386 +#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78387 +static int __maybe_unused __read_only one = 1;
78388 +#endif
78389 +
78390 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78391 + defined(CONFIG_GRKERNSEC_DENYUSB)
78392 +struct ctl_table grsecurity_table[] = {
78393 +#ifdef CONFIG_GRKERNSEC_SYSCTL
78394 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78395 +#ifdef CONFIG_GRKERNSEC_IO
78396 + {
78397 + .procname = "disable_priv_io",
78398 + .data = &grsec_disable_privio,
78399 + .maxlen = sizeof(int),
78400 + .mode = 0600,
78401 + .proc_handler = &proc_dointvec,
78402 + },
78403 +#endif
78404 +#endif
78405 +#ifdef CONFIG_GRKERNSEC_LINK
78406 + {
78407 + .procname = "linking_restrictions",
78408 + .data = &grsec_enable_link,
78409 + .maxlen = sizeof(int),
78410 + .mode = 0600,
78411 + .proc_handler = &proc_dointvec,
78412 + },
78413 +#endif
78414 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78415 + {
78416 + .procname = "enforce_symlinksifowner",
78417 + .data = &grsec_enable_symlinkown,
78418 + .maxlen = sizeof(int),
78419 + .mode = 0600,
78420 + .proc_handler = &proc_dointvec,
78421 + },
78422 + {
78423 + .procname = "symlinkown_gid",
78424 + .data = &grsec_symlinkown_gid,
78425 + .maxlen = sizeof(int),
78426 + .mode = 0600,
78427 + .proc_handler = &proc_dointvec,
78428 + },
78429 +#endif
78430 +#ifdef CONFIG_GRKERNSEC_BRUTE
78431 + {
78432 + .procname = "deter_bruteforce",
78433 + .data = &grsec_enable_brute,
78434 + .maxlen = sizeof(int),
78435 + .mode = 0600,
78436 + .proc_handler = &proc_dointvec,
78437 + },
78438 +#endif
78439 +#ifdef CONFIG_GRKERNSEC_FIFO
78440 + {
78441 + .procname = "fifo_restrictions",
78442 + .data = &grsec_enable_fifo,
78443 + .maxlen = sizeof(int),
78444 + .mode = 0600,
78445 + .proc_handler = &proc_dointvec,
78446 + },
78447 +#endif
78448 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78449 + {
78450 + .procname = "ptrace_readexec",
78451 + .data = &grsec_enable_ptrace_readexec,
78452 + .maxlen = sizeof(int),
78453 + .mode = 0600,
78454 + .proc_handler = &proc_dointvec,
78455 + },
78456 +#endif
78457 +#ifdef CONFIG_GRKERNSEC_SETXID
78458 + {
78459 + .procname = "consistent_setxid",
78460 + .data = &grsec_enable_setxid,
78461 + .maxlen = sizeof(int),
78462 + .mode = 0600,
78463 + .proc_handler = &proc_dointvec,
78464 + },
78465 +#endif
78466 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78467 + {
78468 + .procname = "ip_blackhole",
78469 + .data = &grsec_enable_blackhole,
78470 + .maxlen = sizeof(int),
78471 + .mode = 0600,
78472 + .proc_handler = &proc_dointvec,
78473 + },
78474 + {
78475 + .procname = "lastack_retries",
78476 + .data = &grsec_lastack_retries,
78477 + .maxlen = sizeof(int),
78478 + .mode = 0600,
78479 + .proc_handler = &proc_dointvec,
78480 + },
78481 +#endif
78482 +#ifdef CONFIG_GRKERNSEC_EXECLOG
78483 + {
78484 + .procname = "exec_logging",
78485 + .data = &grsec_enable_execlog,
78486 + .maxlen = sizeof(int),
78487 + .mode = 0600,
78488 + .proc_handler = &proc_dointvec,
78489 + },
78490 +#endif
78491 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78492 + {
78493 + .procname = "rwxmap_logging",
78494 + .data = &grsec_enable_log_rwxmaps,
78495 + .maxlen = sizeof(int),
78496 + .mode = 0600,
78497 + .proc_handler = &proc_dointvec,
78498 + },
78499 +#endif
78500 +#ifdef CONFIG_GRKERNSEC_SIGNAL
78501 + {
78502 + .procname = "signal_logging",
78503 + .data = &grsec_enable_signal,
78504 + .maxlen = sizeof(int),
78505 + .mode = 0600,
78506 + .proc_handler = &proc_dointvec,
78507 + },
78508 +#endif
78509 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
78510 + {
78511 + .procname = "forkfail_logging",
78512 + .data = &grsec_enable_forkfail,
78513 + .maxlen = sizeof(int),
78514 + .mode = 0600,
78515 + .proc_handler = &proc_dointvec,
78516 + },
78517 +#endif
78518 +#ifdef CONFIG_GRKERNSEC_TIME
78519 + {
78520 + .procname = "timechange_logging",
78521 + .data = &grsec_enable_time,
78522 + .maxlen = sizeof(int),
78523 + .mode = 0600,
78524 + .proc_handler = &proc_dointvec,
78525 + },
78526 +#endif
78527 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78528 + {
78529 + .procname = "chroot_deny_shmat",
78530 + .data = &grsec_enable_chroot_shmat,
78531 + .maxlen = sizeof(int),
78532 + .mode = 0600,
78533 + .proc_handler = &proc_dointvec,
78534 + },
78535 +#endif
78536 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78537 + {
78538 + .procname = "chroot_deny_unix",
78539 + .data = &grsec_enable_chroot_unix,
78540 + .maxlen = sizeof(int),
78541 + .mode = 0600,
78542 + .proc_handler = &proc_dointvec,
78543 + },
78544 +#endif
78545 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78546 + {
78547 + .procname = "chroot_deny_mount",
78548 + .data = &grsec_enable_chroot_mount,
78549 + .maxlen = sizeof(int),
78550 + .mode = 0600,
78551 + .proc_handler = &proc_dointvec,
78552 + },
78553 +#endif
78554 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78555 + {
78556 + .procname = "chroot_deny_fchdir",
78557 + .data = &grsec_enable_chroot_fchdir,
78558 + .maxlen = sizeof(int),
78559 + .mode = 0600,
78560 + .proc_handler = &proc_dointvec,
78561 + },
78562 +#endif
78563 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78564 + {
78565 + .procname = "chroot_deny_chroot",
78566 + .data = &grsec_enable_chroot_double,
78567 + .maxlen = sizeof(int),
78568 + .mode = 0600,
78569 + .proc_handler = &proc_dointvec,
78570 + },
78571 +#endif
78572 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78573 + {
78574 + .procname = "chroot_deny_pivot",
78575 + .data = &grsec_enable_chroot_pivot,
78576 + .maxlen = sizeof(int),
78577 + .mode = 0600,
78578 + .proc_handler = &proc_dointvec,
78579 + },
78580 +#endif
78581 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78582 + {
78583 + .procname = "chroot_enforce_chdir",
78584 + .data = &grsec_enable_chroot_chdir,
78585 + .maxlen = sizeof(int),
78586 + .mode = 0600,
78587 + .proc_handler = &proc_dointvec,
78588 + },
78589 +#endif
78590 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78591 + {
78592 + .procname = "chroot_deny_chmod",
78593 + .data = &grsec_enable_chroot_chmod,
78594 + .maxlen = sizeof(int),
78595 + .mode = 0600,
78596 + .proc_handler = &proc_dointvec,
78597 + },
78598 +#endif
78599 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78600 + {
78601 + .procname = "chroot_deny_mknod",
78602 + .data = &grsec_enable_chroot_mknod,
78603 + .maxlen = sizeof(int),
78604 + .mode = 0600,
78605 + .proc_handler = &proc_dointvec,
78606 + },
78607 +#endif
78608 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78609 + {
78610 + .procname = "chroot_restrict_nice",
78611 + .data = &grsec_enable_chroot_nice,
78612 + .maxlen = sizeof(int),
78613 + .mode = 0600,
78614 + .proc_handler = &proc_dointvec,
78615 + },
78616 +#endif
78617 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78618 + {
78619 + .procname = "chroot_execlog",
78620 + .data = &grsec_enable_chroot_execlog,
78621 + .maxlen = sizeof(int),
78622 + .mode = 0600,
78623 + .proc_handler = &proc_dointvec,
78624 + },
78625 +#endif
78626 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78627 + {
78628 + .procname = "chroot_caps",
78629 + .data = &grsec_enable_chroot_caps,
78630 + .maxlen = sizeof(int),
78631 + .mode = 0600,
78632 + .proc_handler = &proc_dointvec,
78633 + },
78634 +#endif
78635 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78636 + {
78637 + .procname = "chroot_deny_sysctl",
78638 + .data = &grsec_enable_chroot_sysctl,
78639 + .maxlen = sizeof(int),
78640 + .mode = 0600,
78641 + .proc_handler = &proc_dointvec,
78642 + },
78643 +#endif
78644 +#ifdef CONFIG_GRKERNSEC_TPE
78645 + {
78646 + .procname = "tpe",
78647 + .data = &grsec_enable_tpe,
78648 + .maxlen = sizeof(int),
78649 + .mode = 0600,
78650 + .proc_handler = &proc_dointvec,
78651 + },
78652 + {
78653 + .procname = "tpe_gid",
78654 + .data = &grsec_tpe_gid,
78655 + .maxlen = sizeof(int),
78656 + .mode = 0600,
78657 + .proc_handler = &proc_dointvec,
78658 + },
78659 +#endif
78660 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78661 + {
78662 + .procname = "tpe_invert",
78663 + .data = &grsec_enable_tpe_invert,
78664 + .maxlen = sizeof(int),
78665 + .mode = 0600,
78666 + .proc_handler = &proc_dointvec,
78667 + },
78668 +#endif
78669 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78670 + {
78671 + .procname = "tpe_restrict_all",
78672 + .data = &grsec_enable_tpe_all,
78673 + .maxlen = sizeof(int),
78674 + .mode = 0600,
78675 + .proc_handler = &proc_dointvec,
78676 + },
78677 +#endif
78678 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78679 + {
78680 + .procname = "socket_all",
78681 + .data = &grsec_enable_socket_all,
78682 + .maxlen = sizeof(int),
78683 + .mode = 0600,
78684 + .proc_handler = &proc_dointvec,
78685 + },
78686 + {
78687 + .procname = "socket_all_gid",
78688 + .data = &grsec_socket_all_gid,
78689 + .maxlen = sizeof(int),
78690 + .mode = 0600,
78691 + .proc_handler = &proc_dointvec,
78692 + },
78693 +#endif
78694 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78695 + {
78696 + .procname = "socket_client",
78697 + .data = &grsec_enable_socket_client,
78698 + .maxlen = sizeof(int),
78699 + .mode = 0600,
78700 + .proc_handler = &proc_dointvec,
78701 + },
78702 + {
78703 + .procname = "socket_client_gid",
78704 + .data = &grsec_socket_client_gid,
78705 + .maxlen = sizeof(int),
78706 + .mode = 0600,
78707 + .proc_handler = &proc_dointvec,
78708 + },
78709 +#endif
78710 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78711 + {
78712 + .procname = "socket_server",
78713 + .data = &grsec_enable_socket_server,
78714 + .maxlen = sizeof(int),
78715 + .mode = 0600,
78716 + .proc_handler = &proc_dointvec,
78717 + },
78718 + {
78719 + .procname = "socket_server_gid",
78720 + .data = &grsec_socket_server_gid,
78721 + .maxlen = sizeof(int),
78722 + .mode = 0600,
78723 + .proc_handler = &proc_dointvec,
78724 + },
78725 +#endif
78726 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78727 + {
78728 + .procname = "audit_group",
78729 + .data = &grsec_enable_group,
78730 + .maxlen = sizeof(int),
78731 + .mode = 0600,
78732 + .proc_handler = &proc_dointvec,
78733 + },
78734 + {
78735 + .procname = "audit_gid",
78736 + .data = &grsec_audit_gid,
78737 + .maxlen = sizeof(int),
78738 + .mode = 0600,
78739 + .proc_handler = &proc_dointvec,
78740 + },
78741 +#endif
78742 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78743 + {
78744 + .procname = "audit_chdir",
78745 + .data = &grsec_enable_chdir,
78746 + .maxlen = sizeof(int),
78747 + .mode = 0600,
78748 + .proc_handler = &proc_dointvec,
78749 + },
78750 +#endif
78751 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78752 + {
78753 + .procname = "audit_mount",
78754 + .data = &grsec_enable_mount,
78755 + .maxlen = sizeof(int),
78756 + .mode = 0600,
78757 + .proc_handler = &proc_dointvec,
78758 + },
78759 +#endif
78760 +#ifdef CONFIG_GRKERNSEC_DMESG
78761 + {
78762 + .procname = "dmesg",
78763 + .data = &grsec_enable_dmesg,
78764 + .maxlen = sizeof(int),
78765 + .mode = 0600,
78766 + .proc_handler = &proc_dointvec,
78767 + },
78768 +#endif
78769 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78770 + {
78771 + .procname = "chroot_findtask",
78772 + .data = &grsec_enable_chroot_findtask,
78773 + .maxlen = sizeof(int),
78774 + .mode = 0600,
78775 + .proc_handler = &proc_dointvec,
78776 + },
78777 +#endif
78778 +#ifdef CONFIG_GRKERNSEC_RESLOG
78779 + {
78780 + .procname = "resource_logging",
78781 + .data = &grsec_resource_logging,
78782 + .maxlen = sizeof(int),
78783 + .mode = 0600,
78784 + .proc_handler = &proc_dointvec,
78785 + },
78786 +#endif
78787 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78788 + {
78789 + .procname = "audit_ptrace",
78790 + .data = &grsec_enable_audit_ptrace,
78791 + .maxlen = sizeof(int),
78792 + .mode = 0600,
78793 + .proc_handler = &proc_dointvec,
78794 + },
78795 +#endif
78796 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78797 + {
78798 + .procname = "harden_ptrace",
78799 + .data = &grsec_enable_harden_ptrace,
78800 + .maxlen = sizeof(int),
78801 + .mode = 0600,
78802 + .proc_handler = &proc_dointvec,
78803 + },
78804 +#endif
78805 +#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78806 + {
78807 + .procname = "harden_ipc",
78808 + .data = &grsec_enable_harden_ipc,
78809 + .maxlen = sizeof(int),
78810 + .mode = 0600,
78811 + .proc_handler = &proc_dointvec,
78812 + },
78813 +#endif
78814 + {
78815 + .procname = "grsec_lock",
78816 + .data = &grsec_lock,
78817 + .maxlen = sizeof(int),
78818 + .mode = 0600,
78819 + .proc_handler = &proc_dointvec,
78820 + },
78821 +#endif
78822 +#ifdef CONFIG_GRKERNSEC_ROFS
78823 + {
78824 + .procname = "romount_protect",
78825 + .data = &grsec_enable_rofs,
78826 + .maxlen = sizeof(int),
78827 + .mode = 0600,
78828 + .proc_handler = &proc_dointvec_minmax,
78829 + .extra1 = &one,
78830 + .extra2 = &one,
78831 + },
78832 +#endif
78833 +#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
78834 + {
78835 + .procname = "deny_new_usb",
78836 + .data = &grsec_deny_new_usb,
78837 + .maxlen = sizeof(int),
78838 + .mode = 0600,
78839 + .proc_handler = &proc_dointvec,
78840 + },
78841 +#endif
78842 + { }
78843 +};
78844 +#endif
78845 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
78846 new file mode 100644
78847 index 0000000..61b514e
78848 --- /dev/null
78849 +++ b/grsecurity/grsec_time.c
78850 @@ -0,0 +1,16 @@
78851 +#include <linux/kernel.h>
78852 +#include <linux/sched.h>
78853 +#include <linux/grinternal.h>
78854 +#include <linux/module.h>
78855 +
78856 +void
78857 +gr_log_timechange(void)
78858 +{
78859 +#ifdef CONFIG_GRKERNSEC_TIME
78860 + if (grsec_enable_time)
78861 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
78862 +#endif
78863 + return;
78864 +}
78865 +
78866 +EXPORT_SYMBOL_GPL(gr_log_timechange);
78867 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
78868 new file mode 100644
78869 index 0000000..d1953de
78870 --- /dev/null
78871 +++ b/grsecurity/grsec_tpe.c
78872 @@ -0,0 +1,78 @@
78873 +#include <linux/kernel.h>
78874 +#include <linux/sched.h>
78875 +#include <linux/file.h>
78876 +#include <linux/fs.h>
78877 +#include <linux/grinternal.h>
78878 +
78879 +extern int gr_acl_tpe_check(void);
78880 +
78881 +int
78882 +gr_tpe_allow(const struct file *file)
78883 +{
78884 +#ifdef CONFIG_GRKERNSEC
78885 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
78886 + struct inode *file_inode = file->f_path.dentry->d_inode;
78887 + const struct cred *cred = current_cred();
78888 + char *msg = NULL;
78889 + char *msg2 = NULL;
78890 +
78891 + // never restrict root
78892 + if (gr_is_global_root(cred->uid))
78893 + return 1;
78894 +
78895 + if (grsec_enable_tpe) {
78896 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78897 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
78898 + msg = "not being in trusted group";
78899 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
78900 + msg = "being in untrusted group";
78901 +#else
78902 + if (in_group_p(grsec_tpe_gid))
78903 + msg = "being in untrusted group";
78904 +#endif
78905 + }
78906 + if (!msg && gr_acl_tpe_check())
78907 + msg = "being in untrusted role";
78908 +
78909 + // not in any affected group/role
78910 + if (!msg)
78911 + goto next_check;
78912 +
78913 + if (gr_is_global_nonroot(inode->i_uid))
78914 + msg2 = "file in non-root-owned directory";
78915 + else if (inode->i_mode & S_IWOTH)
78916 + msg2 = "file in world-writable directory";
78917 + else if (inode->i_mode & S_IWGRP)
78918 + msg2 = "file in group-writable directory";
78919 + else if (file_inode->i_mode & S_IWOTH)
78920 + msg2 = "file is world-writable";
78921 +
78922 + if (msg && msg2) {
78923 + char fullmsg[70] = {0};
78924 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
78925 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
78926 + return 0;
78927 + }
78928 + msg = NULL;
78929 +next_check:
78930 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
78931 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
78932 + return 1;
78933 +
78934 + if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
78935 + msg = "directory not owned by user";
78936 + else if (inode->i_mode & S_IWOTH)
78937 + msg = "file in world-writable directory";
78938 + else if (inode->i_mode & S_IWGRP)
78939 + msg = "file in group-writable directory";
78940 + else if (file_inode->i_mode & S_IWOTH)
78941 + msg = "file is world-writable";
78942 +
78943 + if (msg) {
78944 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
78945 + return 0;
78946 + }
78947 +#endif
78948 +#endif
78949 + return 1;
78950 +}
78951 diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
78952 new file mode 100644
78953 index 0000000..ae02d8e
78954 --- /dev/null
78955 +++ b/grsecurity/grsec_usb.c
78956 @@ -0,0 +1,15 @@
78957 +#include <linux/kernel.h>
78958 +#include <linux/grinternal.h>
78959 +#include <linux/module.h>
78960 +
78961 +int gr_handle_new_usb(void)
78962 +{
78963 +#ifdef CONFIG_GRKERNSEC_DENYUSB
78964 + if (grsec_deny_new_usb) {
78965 + printk(KERN_ALERT "grsec: denied insert of new USB device\n");
78966 + return 1;
78967 + }
78968 +#endif
78969 + return 0;
78970 +}
78971 +EXPORT_SYMBOL_GPL(gr_handle_new_usb);
78972 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
78973 new file mode 100644
78974 index 0000000..158b330
78975 --- /dev/null
78976 +++ b/grsecurity/grsum.c
78977 @@ -0,0 +1,64 @@
78978 +#include <linux/err.h>
78979 +#include <linux/kernel.h>
78980 +#include <linux/sched.h>
78981 +#include <linux/mm.h>
78982 +#include <linux/scatterlist.h>
78983 +#include <linux/crypto.h>
78984 +#include <linux/gracl.h>
78985 +
78986 +
78987 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
78988 +#error "crypto and sha256 must be built into the kernel"
78989 +#endif
78990 +
78991 +int
78992 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
78993 +{
78994 + struct crypto_hash *tfm;
78995 + struct hash_desc desc;
78996 + struct scatterlist sg[2];
78997 + unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
78998 + unsigned long *tmpsumptr = (unsigned long *)temp_sum;
78999 + unsigned long *sumptr = (unsigned long *)sum;
79000 + int cryptres;
79001 + int retval = 1;
79002 + volatile int mismatched = 0;
79003 + volatile int dummy = 0;
79004 + unsigned int i;
79005 +
79006 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
79007 + if (IS_ERR(tfm)) {
79008 + /* should never happen, since sha256 should be built in */
79009 + memset(entry->pw, 0, GR_PW_LEN);
79010 + return 1;
79011 + }
79012 +
79013 + sg_init_table(sg, 2);
79014 + sg_set_buf(&sg[0], salt, GR_SALT_LEN);
79015 + sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
79016 +
79017 + desc.tfm = tfm;
79018 + desc.flags = 0;
79019 +
79020 + cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
79021 + temp_sum);
79022 +
79023 + memset(entry->pw, 0, GR_PW_LEN);
79024 +
79025 + if (cryptres)
79026 + goto out;
79027 +
79028 + for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
79029 + if (sumptr[i] != tmpsumptr[i])
79030 + mismatched = 1;
79031 + else
79032 + dummy = 1; // waste a cycle
79033 +
79034 + if (!mismatched)
79035 + retval = dummy - 1;
79036 +
79037 +out:
79038 + crypto_free_hash(tfm);
79039 +
79040 + return retval;
79041 +}
79042 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
79043 index 77ff547..181834f 100644
79044 --- a/include/asm-generic/4level-fixup.h
79045 +++ b/include/asm-generic/4level-fixup.h
79046 @@ -13,8 +13,10 @@
79047 #define pmd_alloc(mm, pud, address) \
79048 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
79049 NULL: pmd_offset(pud, address))
79050 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
79051
79052 #define pud_alloc(mm, pgd, address) (pgd)
79053 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
79054 #define pud_offset(pgd, start) (pgd)
79055 #define pud_none(pud) 0
79056 #define pud_bad(pud) 0
79057 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
79058 index b7babf0..1e4b4f1 100644
79059 --- a/include/asm-generic/atomic-long.h
79060 +++ b/include/asm-generic/atomic-long.h
79061 @@ -22,6 +22,12 @@
79062
79063 typedef atomic64_t atomic_long_t;
79064
79065 +#ifdef CONFIG_PAX_REFCOUNT
79066 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
79067 +#else
79068 +typedef atomic64_t atomic_long_unchecked_t;
79069 +#endif
79070 +
79071 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
79072
79073 static inline long atomic_long_read(atomic_long_t *l)
79074 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79075 return (long)atomic64_read(v);
79076 }
79077
79078 +#ifdef CONFIG_PAX_REFCOUNT
79079 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79080 +{
79081 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79082 +
79083 + return (long)atomic64_read_unchecked(v);
79084 +}
79085 +#endif
79086 +
79087 static inline void atomic_long_set(atomic_long_t *l, long i)
79088 {
79089 atomic64_t *v = (atomic64_t *)l;
79090 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79091 atomic64_set(v, i);
79092 }
79093
79094 +#ifdef CONFIG_PAX_REFCOUNT
79095 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79096 +{
79097 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79098 +
79099 + atomic64_set_unchecked(v, i);
79100 +}
79101 +#endif
79102 +
79103 static inline void atomic_long_inc(atomic_long_t *l)
79104 {
79105 atomic64_t *v = (atomic64_t *)l;
79106 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79107 atomic64_inc(v);
79108 }
79109
79110 +#ifdef CONFIG_PAX_REFCOUNT
79111 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79112 +{
79113 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79114 +
79115 + atomic64_inc_unchecked(v);
79116 +}
79117 +#endif
79118 +
79119 static inline void atomic_long_dec(atomic_long_t *l)
79120 {
79121 atomic64_t *v = (atomic64_t *)l;
79122 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79123 atomic64_dec(v);
79124 }
79125
79126 +#ifdef CONFIG_PAX_REFCOUNT
79127 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79128 +{
79129 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79130 +
79131 + atomic64_dec_unchecked(v);
79132 +}
79133 +#endif
79134 +
79135 static inline void atomic_long_add(long i, atomic_long_t *l)
79136 {
79137 atomic64_t *v = (atomic64_t *)l;
79138 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79139 atomic64_add(i, v);
79140 }
79141
79142 +#ifdef CONFIG_PAX_REFCOUNT
79143 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79144 +{
79145 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79146 +
79147 + atomic64_add_unchecked(i, v);
79148 +}
79149 +#endif
79150 +
79151 static inline void atomic_long_sub(long i, atomic_long_t *l)
79152 {
79153 atomic64_t *v = (atomic64_t *)l;
79154 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79155 atomic64_sub(i, v);
79156 }
79157
79158 +#ifdef CONFIG_PAX_REFCOUNT
79159 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79160 +{
79161 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79162 +
79163 + atomic64_sub_unchecked(i, v);
79164 +}
79165 +#endif
79166 +
79167 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79168 {
79169 atomic64_t *v = (atomic64_t *)l;
79170 @@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79171 return atomic64_add_negative(i, v);
79172 }
79173
79174 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
79175 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79176 {
79177 atomic64_t *v = (atomic64_t *)l;
79178
79179 return (long)atomic64_add_return(i, v);
79180 }
79181
79182 +#ifdef CONFIG_PAX_REFCOUNT
79183 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79184 +{
79185 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79186 +
79187 + return (long)atomic64_add_return_unchecked(i, v);
79188 +}
79189 +#endif
79190 +
79191 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79192 {
79193 atomic64_t *v = (atomic64_t *)l;
79194 @@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79195 return (long)atomic64_inc_return(v);
79196 }
79197
79198 +#ifdef CONFIG_PAX_REFCOUNT
79199 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79200 +{
79201 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79202 +
79203 + return (long)atomic64_inc_return_unchecked(v);
79204 +}
79205 +#endif
79206 +
79207 static inline long atomic_long_dec_return(atomic_long_t *l)
79208 {
79209 atomic64_t *v = (atomic64_t *)l;
79210 @@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79211
79212 typedef atomic_t atomic_long_t;
79213
79214 +#ifdef CONFIG_PAX_REFCOUNT
79215 +typedef atomic_unchecked_t atomic_long_unchecked_t;
79216 +#else
79217 +typedef atomic_t atomic_long_unchecked_t;
79218 +#endif
79219 +
79220 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79221 static inline long atomic_long_read(atomic_long_t *l)
79222 {
79223 @@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79224 return (long)atomic_read(v);
79225 }
79226
79227 +#ifdef CONFIG_PAX_REFCOUNT
79228 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79229 +{
79230 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79231 +
79232 + return (long)atomic_read_unchecked(v);
79233 +}
79234 +#endif
79235 +
79236 static inline void atomic_long_set(atomic_long_t *l, long i)
79237 {
79238 atomic_t *v = (atomic_t *)l;
79239 @@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79240 atomic_set(v, i);
79241 }
79242
79243 +#ifdef CONFIG_PAX_REFCOUNT
79244 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79245 +{
79246 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79247 +
79248 + atomic_set_unchecked(v, i);
79249 +}
79250 +#endif
79251 +
79252 static inline void atomic_long_inc(atomic_long_t *l)
79253 {
79254 atomic_t *v = (atomic_t *)l;
79255 @@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79256 atomic_inc(v);
79257 }
79258
79259 +#ifdef CONFIG_PAX_REFCOUNT
79260 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79261 +{
79262 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79263 +
79264 + atomic_inc_unchecked(v);
79265 +}
79266 +#endif
79267 +
79268 static inline void atomic_long_dec(atomic_long_t *l)
79269 {
79270 atomic_t *v = (atomic_t *)l;
79271 @@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79272 atomic_dec(v);
79273 }
79274
79275 +#ifdef CONFIG_PAX_REFCOUNT
79276 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79277 +{
79278 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79279 +
79280 + atomic_dec_unchecked(v);
79281 +}
79282 +#endif
79283 +
79284 static inline void atomic_long_add(long i, atomic_long_t *l)
79285 {
79286 atomic_t *v = (atomic_t *)l;
79287 @@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79288 atomic_add(i, v);
79289 }
79290
79291 +#ifdef CONFIG_PAX_REFCOUNT
79292 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79293 +{
79294 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79295 +
79296 + atomic_add_unchecked(i, v);
79297 +}
79298 +#endif
79299 +
79300 static inline void atomic_long_sub(long i, atomic_long_t *l)
79301 {
79302 atomic_t *v = (atomic_t *)l;
79303 @@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79304 atomic_sub(i, v);
79305 }
79306
79307 +#ifdef CONFIG_PAX_REFCOUNT
79308 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79309 +{
79310 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79311 +
79312 + atomic_sub_unchecked(i, v);
79313 +}
79314 +#endif
79315 +
79316 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79317 {
79318 atomic_t *v = (atomic_t *)l;
79319 @@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79320 return atomic_add_negative(i, v);
79321 }
79322
79323 -static inline long atomic_long_add_return(long i, atomic_long_t *l)
79324 +static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79325 {
79326 atomic_t *v = (atomic_t *)l;
79327
79328 return (long)atomic_add_return(i, v);
79329 }
79330
79331 +#ifdef CONFIG_PAX_REFCOUNT
79332 +static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79333 +{
79334 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79335 +
79336 + return (long)atomic_add_return_unchecked(i, v);
79337 +}
79338 +
79339 +#endif
79340 +
79341 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79342 {
79343 atomic_t *v = (atomic_t *)l;
79344 @@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79345 return (long)atomic_inc_return(v);
79346 }
79347
79348 +#ifdef CONFIG_PAX_REFCOUNT
79349 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79350 +{
79351 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79352 +
79353 + return (long)atomic_inc_return_unchecked(v);
79354 +}
79355 +#endif
79356 +
79357 static inline long atomic_long_dec_return(atomic_long_t *l)
79358 {
79359 atomic_t *v = (atomic_t *)l;
79360 @@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79361
79362 #endif /* BITS_PER_LONG == 64 */
79363
79364 +#ifdef CONFIG_PAX_REFCOUNT
79365 +static inline void pax_refcount_needs_these_functions(void)
79366 +{
79367 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
79368 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79369 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79370 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79371 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79372 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79373 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79374 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79375 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79376 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79377 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79378 +#ifdef CONFIG_X86
79379 + atomic_clear_mask_unchecked(0, NULL);
79380 + atomic_set_mask_unchecked(0, NULL);
79381 +#endif
79382 +
79383 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79384 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79385 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79386 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79387 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79388 + atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79389 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79390 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79391 +}
79392 +#else
79393 +#define atomic_read_unchecked(v) atomic_read(v)
79394 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79395 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79396 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79397 +#define atomic_inc_unchecked(v) atomic_inc(v)
79398 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79399 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79400 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79401 +#define atomic_dec_unchecked(v) atomic_dec(v)
79402 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79403 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79404 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79405 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79406 +
79407 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
79408 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79409 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79410 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79411 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79412 +#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79413 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79414 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79415 +#endif
79416 +
79417 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79418 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79419 index 30ad9c8..c70c170 100644
79420 --- a/include/asm-generic/atomic64.h
79421 +++ b/include/asm-generic/atomic64.h
79422 @@ -16,6 +16,8 @@ typedef struct {
79423 long long counter;
79424 } atomic64_t;
79425
79426 +typedef atomic64_t atomic64_unchecked_t;
79427 +
79428 #define ATOMIC64_INIT(i) { (i) }
79429
79430 extern long long atomic64_read(const atomic64_t *v);
79431 @@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79432 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79433 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79434
79435 +#define atomic64_read_unchecked(v) atomic64_read(v)
79436 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79437 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79438 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79439 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79440 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
79441 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79442 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
79443 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79444 +
79445 #endif /* _ASM_GENERIC_ATOMIC64_H */
79446 diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79447 index 1402fa8..025a736 100644
79448 --- a/include/asm-generic/barrier.h
79449 +++ b/include/asm-generic/barrier.h
79450 @@ -74,7 +74,7 @@
79451 do { \
79452 compiletime_assert_atomic_type(*p); \
79453 smp_mb(); \
79454 - ACCESS_ONCE(*p) = (v); \
79455 + ACCESS_ONCE_RW(*p) = (v); \
79456 } while (0)
79457
79458 #define smp_load_acquire(p) \
79459 diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79460 index a60a7cc..0fe12f2 100644
79461 --- a/include/asm-generic/bitops/__fls.h
79462 +++ b/include/asm-generic/bitops/__fls.h
79463 @@ -9,7 +9,7 @@
79464 *
79465 * Undefined if no set bit exists, so code should check against 0 first.
79466 */
79467 -static __always_inline unsigned long __fls(unsigned long word)
79468 +static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79469 {
79470 int num = BITS_PER_LONG - 1;
79471
79472 diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79473 index 0576d1f..dad6c71 100644
79474 --- a/include/asm-generic/bitops/fls.h
79475 +++ b/include/asm-generic/bitops/fls.h
79476 @@ -9,7 +9,7 @@
79477 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79478 */
79479
79480 -static __always_inline int fls(int x)
79481 +static __always_inline int __intentional_overflow(-1) fls(int x)
79482 {
79483 int r = 32;
79484
79485 diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79486 index b097cf8..3d40e14 100644
79487 --- a/include/asm-generic/bitops/fls64.h
79488 +++ b/include/asm-generic/bitops/fls64.h
79489 @@ -15,7 +15,7 @@
79490 * at position 64.
79491 */
79492 #if BITS_PER_LONG == 32
79493 -static __always_inline int fls64(__u64 x)
79494 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79495 {
79496 __u32 h = x >> 32;
79497 if (h)
79498 @@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79499 return fls(x);
79500 }
79501 #elif BITS_PER_LONG == 64
79502 -static __always_inline int fls64(__u64 x)
79503 +static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79504 {
79505 if (x == 0)
79506 return 0;
79507 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79508 index 1bfcfe5..e04c5c9 100644
79509 --- a/include/asm-generic/cache.h
79510 +++ b/include/asm-generic/cache.h
79511 @@ -6,7 +6,7 @@
79512 * cache lines need to provide their own cache.h.
79513 */
79514
79515 -#define L1_CACHE_SHIFT 5
79516 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79517 +#define L1_CACHE_SHIFT 5UL
79518 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79519
79520 #endif /* __ASM_GENERIC_CACHE_H */
79521 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79522 index 0d68a1e..b74a761 100644
79523 --- a/include/asm-generic/emergency-restart.h
79524 +++ b/include/asm-generic/emergency-restart.h
79525 @@ -1,7 +1,7 @@
79526 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79527 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79528
79529 -static inline void machine_emergency_restart(void)
79530 +static inline __noreturn void machine_emergency_restart(void)
79531 {
79532 machine_restart(NULL);
79533 }
79534 diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79535 index b8fdc57..c6d5a5c 100644
79536 --- a/include/asm-generic/io.h
79537 +++ b/include/asm-generic/io.h
79538 @@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79539 * These are pretty trivial
79540 */
79541 #ifndef virt_to_phys
79542 -static inline unsigned long virt_to_phys(volatile void *address)
79543 +static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79544 {
79545 return __pa((unsigned long)address);
79546 }
79547 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79548 index 90f99c7..00ce236 100644
79549 --- a/include/asm-generic/kmap_types.h
79550 +++ b/include/asm-generic/kmap_types.h
79551 @@ -2,9 +2,9 @@
79552 #define _ASM_GENERIC_KMAP_TYPES_H
79553
79554 #ifdef __WITH_KM_FENCE
79555 -# define KM_TYPE_NR 41
79556 +# define KM_TYPE_NR 42
79557 #else
79558 -# define KM_TYPE_NR 20
79559 +# define KM_TYPE_NR 21
79560 #endif
79561
79562 #endif
79563 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79564 index 9ceb03b..62b0b8f 100644
79565 --- a/include/asm-generic/local.h
79566 +++ b/include/asm-generic/local.h
79567 @@ -23,24 +23,37 @@ typedef struct
79568 atomic_long_t a;
79569 } local_t;
79570
79571 +typedef struct {
79572 + atomic_long_unchecked_t a;
79573 +} local_unchecked_t;
79574 +
79575 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79576
79577 #define local_read(l) atomic_long_read(&(l)->a)
79578 +#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79579 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79580 +#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79581 #define local_inc(l) atomic_long_inc(&(l)->a)
79582 +#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79583 #define local_dec(l) atomic_long_dec(&(l)->a)
79584 +#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79585 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79586 +#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79587 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79588 +#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79589
79590 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79591 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79592 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79593 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79594 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79595 +#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79596 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79597 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79598 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79599
79600 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79601 +#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79602 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79603 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79604 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79605 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79606 index 725612b..9cc513a 100644
79607 --- a/include/asm-generic/pgtable-nopmd.h
79608 +++ b/include/asm-generic/pgtable-nopmd.h
79609 @@ -1,14 +1,19 @@
79610 #ifndef _PGTABLE_NOPMD_H
79611 #define _PGTABLE_NOPMD_H
79612
79613 -#ifndef __ASSEMBLY__
79614 -
79615 #include <asm-generic/pgtable-nopud.h>
79616
79617 -struct mm_struct;
79618 -
79619 #define __PAGETABLE_PMD_FOLDED
79620
79621 +#define PMD_SHIFT PUD_SHIFT
79622 +#define PTRS_PER_PMD 1
79623 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79624 +#define PMD_MASK (~(PMD_SIZE-1))
79625 +
79626 +#ifndef __ASSEMBLY__
79627 +
79628 +struct mm_struct;
79629 +
79630 /*
79631 * Having the pmd type consist of a pud gets the size right, and allows
79632 * us to conceptually access the pud entry that this pmd is folded into
79633 @@ -16,11 +21,6 @@ struct mm_struct;
79634 */
79635 typedef struct { pud_t pud; } pmd_t;
79636
79637 -#define PMD_SHIFT PUD_SHIFT
79638 -#define PTRS_PER_PMD 1
79639 -#define PMD_SIZE (1UL << PMD_SHIFT)
79640 -#define PMD_MASK (~(PMD_SIZE-1))
79641 -
79642 /*
79643 * The "pud_xxx()" functions here are trivial for a folded two-level
79644 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79645 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79646 index 810431d..0ec4804f 100644
79647 --- a/include/asm-generic/pgtable-nopud.h
79648 +++ b/include/asm-generic/pgtable-nopud.h
79649 @@ -1,10 +1,15 @@
79650 #ifndef _PGTABLE_NOPUD_H
79651 #define _PGTABLE_NOPUD_H
79652
79653 -#ifndef __ASSEMBLY__
79654 -
79655 #define __PAGETABLE_PUD_FOLDED
79656
79657 +#define PUD_SHIFT PGDIR_SHIFT
79658 +#define PTRS_PER_PUD 1
79659 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79660 +#define PUD_MASK (~(PUD_SIZE-1))
79661 +
79662 +#ifndef __ASSEMBLY__
79663 +
79664 /*
79665 * Having the pud type consist of a pgd gets the size right, and allows
79666 * us to conceptually access the pgd entry that this pud is folded into
79667 @@ -12,11 +17,6 @@
79668 */
79669 typedef struct { pgd_t pgd; } pud_t;
79670
79671 -#define PUD_SHIFT PGDIR_SHIFT
79672 -#define PTRS_PER_PUD 1
79673 -#define PUD_SIZE (1UL << PUD_SHIFT)
79674 -#define PUD_MASK (~(PUD_SIZE-1))
79675 -
79676 /*
79677 * The "pgd_xxx()" functions here are trivial for a folded two-level
79678 * setup: the pud is never bad, and a pud always exists (as it's folded
79679 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79680 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79681
79682 #define pgd_populate(mm, pgd, pud) do { } while (0)
79683 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79684 /*
79685 * (puds are folded into pgds so this doesn't get actually called,
79686 * but the define is needed for a generic inline function.)
79687 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79688 index 752e30d..87f172d 100644
79689 --- a/include/asm-generic/pgtable.h
79690 +++ b/include/asm-generic/pgtable.h
79691 @@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79692 }
79693 #endif /* CONFIG_NUMA_BALANCING */
79694
79695 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79696 +#ifdef CONFIG_PAX_KERNEXEC
79697 +#error KERNEXEC requires pax_open_kernel
79698 +#else
79699 +static inline unsigned long pax_open_kernel(void) { return 0; }
79700 +#endif
79701 +#endif
79702 +
79703 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79704 +#ifdef CONFIG_PAX_KERNEXEC
79705 +#error KERNEXEC requires pax_close_kernel
79706 +#else
79707 +static inline unsigned long pax_close_kernel(void) { return 0; }
79708 +#endif
79709 +#endif
79710 +
79711 #endif /* CONFIG_MMU */
79712
79713 #endif /* !__ASSEMBLY__ */
79714 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79715 index 72d8803..cb9749c 100644
79716 --- a/include/asm-generic/uaccess.h
79717 +++ b/include/asm-generic/uaccess.h
79718 @@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79719 return __clear_user(to, n);
79720 }
79721
79722 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79723 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79724 +#error UDEREF requires pax_open_userland
79725 +#else
79726 +static inline unsigned long pax_open_userland(void) { return 0; }
79727 +#endif
79728 +#endif
79729 +
79730 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79731 +#ifdef CONFIG_PAX_MEMORY_UDEREF
79732 +#error UDEREF requires pax_close_userland
79733 +#else
79734 +static inline unsigned long pax_close_userland(void) { return 0; }
79735 +#endif
79736 +#endif
79737 +
79738 #endif /* __ASM_GENERIC_UACCESS_H */
79739 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79740 index aa70cbd..fd72c7a 100644
79741 --- a/include/asm-generic/vmlinux.lds.h
79742 +++ b/include/asm-generic/vmlinux.lds.h
79743 @@ -233,6 +233,7 @@
79744 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79745 VMLINUX_SYMBOL(__start_rodata) = .; \
79746 *(.rodata) *(.rodata.*) \
79747 + *(.data..read_only) \
79748 *(__vermagic) /* Kernel version magic */ \
79749 . = ALIGN(8); \
79750 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79751 @@ -724,17 +725,18 @@
79752 * section in the linker script will go there too. @phdr should have
79753 * a leading colon.
79754 *
79755 - * Note that this macros defines __per_cpu_load as an absolute symbol.
79756 + * Note that this macros defines per_cpu_load as an absolute symbol.
79757 * If there is no need to put the percpu section at a predetermined
79758 * address, use PERCPU_SECTION.
79759 */
79760 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79761 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
79762 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79763 + per_cpu_load = .; \
79764 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79765 - LOAD_OFFSET) { \
79766 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
79767 PERCPU_INPUT(cacheline) \
79768 } phdr \
79769 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
79770 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
79771
79772 /**
79773 * PERCPU_SECTION - define output section for percpu area, simple version
79774 diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
79775 index 623a59c..1e79ab9 100644
79776 --- a/include/crypto/algapi.h
79777 +++ b/include/crypto/algapi.h
79778 @@ -34,7 +34,7 @@ struct crypto_type {
79779 unsigned int maskclear;
79780 unsigned int maskset;
79781 unsigned int tfmsize;
79782 -};
79783 +} __do_const;
79784
79785 struct crypto_instance {
79786 struct crypto_alg alg;
79787 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
79788 index 53ed876..5bb09be 100644
79789 --- a/include/drm/drmP.h
79790 +++ b/include/drm/drmP.h
79791 @@ -59,6 +59,7 @@
79792
79793 #include <asm/mman.h>
79794 #include <asm/pgalloc.h>
79795 +#include <asm/local.h>
79796 #include <asm/uaccess.h>
79797
79798 #include <uapi/drm/drm.h>
79799 @@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
79800 * \param cmd command.
79801 * \param arg argument.
79802 */
79803 -typedef int drm_ioctl_t(struct drm_device *dev, void *data,
79804 +typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
79805 + struct drm_file *file_priv);
79806 +typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
79807 struct drm_file *file_priv);
79808
79809 -typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79810 +typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
79811 unsigned long arg);
79812
79813 #define DRM_IOCTL_NR(n) _IOC_NR(n)
79814 @@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79815 struct drm_ioctl_desc {
79816 unsigned int cmd;
79817 int flags;
79818 - drm_ioctl_t *func;
79819 + drm_ioctl_t func;
79820 unsigned int cmd_drv;
79821 const char *name;
79822 -};
79823 +} __do_const;
79824
79825 /**
79826 * Creates a driver or general drm_ioctl_desc array entry for the given
79827 @@ -629,7 +632,8 @@ struct drm_info_list {
79828 int (*show)(struct seq_file*, void*); /** show callback */
79829 u32 driver_features; /**< Required driver features for this entry */
79830 void *data;
79831 -};
79832 +} __do_const;
79833 +typedef struct drm_info_list __no_const drm_info_list_no_const;
79834
79835 /**
79836 * debugfs node structure. This structure represents a debugfs file.
79837 @@ -713,7 +717,7 @@ struct drm_device {
79838
79839 /** \name Usage Counters */
79840 /*@{ */
79841 - int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79842 + local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79843 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
79844 int buf_use; /**< Buffers in use -- cannot alloc */
79845 atomic_t buf_alloc; /**< Buffer allocation in progress */
79846 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
79847 index a3d75fe..6802f9c 100644
79848 --- a/include/drm/drm_crtc_helper.h
79849 +++ b/include/drm/drm_crtc_helper.h
79850 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
79851 struct drm_connector *connector);
79852 /* disable encoder when not in use - more explicit than dpms off */
79853 void (*disable)(struct drm_encoder *encoder);
79854 -};
79855 +} __no_const;
79856
79857 /**
79858 * drm_connector_helper_funcs - helper operations for connectors
79859 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
79860 index a70d456..6ea07cd 100644
79861 --- a/include/drm/i915_pciids.h
79862 +++ b/include/drm/i915_pciids.h
79863 @@ -37,7 +37,7 @@
79864 */
79865 #define INTEL_VGA_DEVICE(id, info) { \
79866 0x8086, id, \
79867 - ~0, ~0, \
79868 + PCI_ANY_ID, PCI_ANY_ID, \
79869 0x030000, 0xff0000, \
79870 (unsigned long) info }
79871
79872 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
79873 index 72dcbe8..8db58d7 100644
79874 --- a/include/drm/ttm/ttm_memory.h
79875 +++ b/include/drm/ttm/ttm_memory.h
79876 @@ -48,7 +48,7 @@
79877
79878 struct ttm_mem_shrink {
79879 int (*do_shrink) (struct ttm_mem_shrink *);
79880 -};
79881 +} __no_const;
79882
79883 /**
79884 * struct ttm_mem_global - Global memory accounting structure.
79885 diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
79886 index 49a8284..9643967 100644
79887 --- a/include/drm/ttm/ttm_page_alloc.h
79888 +++ b/include/drm/ttm/ttm_page_alloc.h
79889 @@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
79890 */
79891 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
79892
79893 +struct device;
79894 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79895 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79896
79897 diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
79898 index 4b840e8..155d235 100644
79899 --- a/include/keys/asymmetric-subtype.h
79900 +++ b/include/keys/asymmetric-subtype.h
79901 @@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
79902 /* Verify the signature on a key of this subtype (optional) */
79903 int (*verify_signature)(const struct key *key,
79904 const struct public_key_signature *sig);
79905 -};
79906 +} __do_const;
79907
79908 /**
79909 * asymmetric_key_subtype - Get the subtype from an asymmetric key
79910 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
79911 index c1da539..1dcec55 100644
79912 --- a/include/linux/atmdev.h
79913 +++ b/include/linux/atmdev.h
79914 @@ -28,7 +28,7 @@ struct compat_atm_iobuf {
79915 #endif
79916
79917 struct k_atm_aal_stats {
79918 -#define __HANDLE_ITEM(i) atomic_t i
79919 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
79920 __AAL_STAT_ITEMS
79921 #undef __HANDLE_ITEM
79922 };
79923 @@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
79924 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
79925 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
79926 struct module *owner;
79927 -};
79928 +} __do_const ;
79929
79930 struct atmphy_ops {
79931 int (*start)(struct atm_dev *dev);
79932 diff --git a/include/linux/audit.h b/include/linux/audit.h
79933 index 10f155b..6c73ffe 100644
79934 --- a/include/linux/audit.h
79935 +++ b/include/linux/audit.h
79936 @@ -219,7 +219,7 @@ static inline void audit_ptrace(struct task_struct *t)
79937 extern unsigned int audit_serial(void);
79938 extern int auditsc_get_stamp(struct audit_context *ctx,
79939 struct timespec *t, unsigned int *serial);
79940 -extern int audit_set_loginuid(kuid_t loginuid);
79941 +extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
79942
79943 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
79944 {
79945 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
79946 index 61f29e5..e67c658 100644
79947 --- a/include/linux/binfmts.h
79948 +++ b/include/linux/binfmts.h
79949 @@ -44,7 +44,7 @@ struct linux_binprm {
79950 unsigned interp_flags;
79951 unsigned interp_data;
79952 unsigned long loader, exec;
79953 -};
79954 +} __randomize_layout;
79955
79956 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
79957 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
79958 @@ -73,8 +73,10 @@ struct linux_binfmt {
79959 int (*load_binary)(struct linux_binprm *);
79960 int (*load_shlib)(struct file *);
79961 int (*core_dump)(struct coredump_params *cprm);
79962 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
79963 + void (*handle_mmap)(struct file *);
79964 unsigned long min_coredump; /* minimal dump size */
79965 -};
79966 +} __do_const __randomize_layout;
79967
79968 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
79969
79970 diff --git a/include/linux/bitops.h b/include/linux/bitops.h
79971 index 5d858e0..336c1d9 100644
79972 --- a/include/linux/bitops.h
79973 +++ b/include/linux/bitops.h
79974 @@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
79975 * @word: value to rotate
79976 * @shift: bits to roll
79977 */
79978 -static inline __u32 rol32(__u32 word, unsigned int shift)
79979 +static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
79980 {
79981 return (word << shift) | (word >> (32 - shift));
79982 }
79983 @@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
79984 * @word: value to rotate
79985 * @shift: bits to roll
79986 */
79987 -static inline __u32 ror32(__u32 word, unsigned int shift)
79988 +static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
79989 {
79990 return (word >> shift) | (word << (32 - shift));
79991 }
79992 @@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
79993 return (__s32)(value << shift) >> shift;
79994 }
79995
79996 -static inline unsigned fls_long(unsigned long l)
79997 +static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
79998 {
79999 if (sizeof(l) == 4)
80000 return fls(l);
80001 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
80002 index aac0f9e..73c9869 100644
80003 --- a/include/linux/blkdev.h
80004 +++ b/include/linux/blkdev.h
80005 @@ -1615,7 +1615,7 @@ struct block_device_operations {
80006 /* this callback is with swap_lock and sometimes page table lock held */
80007 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
80008 struct module *owner;
80009 -};
80010 +} __do_const;
80011
80012 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
80013 unsigned long);
80014 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
80015 index afc1343..9735539 100644
80016 --- a/include/linux/blktrace_api.h
80017 +++ b/include/linux/blktrace_api.h
80018 @@ -25,7 +25,7 @@ struct blk_trace {
80019 struct dentry *dropped_file;
80020 struct dentry *msg_file;
80021 struct list_head running_list;
80022 - atomic_t dropped;
80023 + atomic_unchecked_t dropped;
80024 };
80025
80026 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
80027 diff --git a/include/linux/cache.h b/include/linux/cache.h
80028 index 17e7e82..1d7da26 100644
80029 --- a/include/linux/cache.h
80030 +++ b/include/linux/cache.h
80031 @@ -16,6 +16,14 @@
80032 #define __read_mostly
80033 #endif
80034
80035 +#ifndef __read_only
80036 +#ifdef CONFIG_PAX_KERNEXEC
80037 +#error KERNEXEC requires __read_only
80038 +#else
80039 +#define __read_only __read_mostly
80040 +#endif
80041 +#endif
80042 +
80043 #ifndef ____cacheline_aligned
80044 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
80045 #endif
80046 diff --git a/include/linux/capability.h b/include/linux/capability.h
80047 index aa93e5e..985a1b0 100644
80048 --- a/include/linux/capability.h
80049 +++ b/include/linux/capability.h
80050 @@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
80051 extern bool capable(int cap);
80052 extern bool ns_capable(struct user_namespace *ns, int cap);
80053 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
80054 +extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
80055 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
80056 +extern bool capable_nolog(int cap);
80057 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
80058
80059 /* audit system wants to get cap info from files as well */
80060 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
80061
80062 +extern int is_privileged_binary(const struct dentry *dentry);
80063 +
80064 #endif /* !_LINUX_CAPABILITY_H */
80065 diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
80066 index 8609d57..86e4d79 100644
80067 --- a/include/linux/cdrom.h
80068 +++ b/include/linux/cdrom.h
80069 @@ -87,7 +87,6 @@ struct cdrom_device_ops {
80070
80071 /* driver specifications */
80072 const int capability; /* capability flags */
80073 - int n_minors; /* number of active minor devices */
80074 /* handle uniform packets for scsi type devices (scsi,atapi) */
80075 int (*generic_packet) (struct cdrom_device_info *,
80076 struct packet_command *);
80077 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
80078 index 4ce9056..86caac6 100644
80079 --- a/include/linux/cleancache.h
80080 +++ b/include/linux/cleancache.h
80081 @@ -31,7 +31,7 @@ struct cleancache_ops {
80082 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
80083 void (*invalidate_inode)(int, struct cleancache_filekey);
80084 void (*invalidate_fs)(int);
80085 -};
80086 +} __no_const;
80087
80088 extern struct cleancache_ops *
80089 cleancache_register_ops(struct cleancache_ops *ops);
80090 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80091 index 2839c63..5b06b6b 100644
80092 --- a/include/linux/clk-provider.h
80093 +++ b/include/linux/clk-provider.h
80094 @@ -191,6 +191,7 @@ struct clk_ops {
80095 void (*init)(struct clk_hw *hw);
80096 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80097 };
80098 +typedef struct clk_ops __no_const clk_ops_no_const;
80099
80100 /**
80101 * struct clk_init_data - holds init data that's common to all clocks and is
80102 diff --git a/include/linux/compat.h b/include/linux/compat.h
80103 index e649426..a74047b 100644
80104 --- a/include/linux/compat.h
80105 +++ b/include/linux/compat.h
80106 @@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80107 compat_size_t __user *len_ptr);
80108
80109 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80110 -asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80111 +asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80112 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80113 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80114 compat_ssize_t msgsz, int msgflg);
80115 @@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80116 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80117 compat_ulong_t addr, compat_ulong_t data);
80118 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80119 - compat_long_t addr, compat_long_t data);
80120 + compat_ulong_t addr, compat_ulong_t data);
80121
80122 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80123 /*
80124 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80125 index d1a5582..4424efa 100644
80126 --- a/include/linux/compiler-gcc4.h
80127 +++ b/include/linux/compiler-gcc4.h
80128 @@ -39,9 +39,34 @@
80129 # define __compiletime_warning(message) __attribute__((warning(message)))
80130 # define __compiletime_error(message) __attribute__((error(message)))
80131 #endif /* __CHECKER__ */
80132 +
80133 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80134 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80135 +#define __bos0(ptr) __bos((ptr), 0)
80136 +#define __bos1(ptr) __bos((ptr), 1)
80137 #endif /* GCC_VERSION >= 40300 */
80138
80139 #if GCC_VERSION >= 40500
80140 +
80141 +#ifdef RANDSTRUCT_PLUGIN
80142 +#define __randomize_layout __attribute__((randomize_layout))
80143 +#define __no_randomize_layout __attribute__((no_randomize_layout))
80144 +#endif
80145 +
80146 +#ifdef CONSTIFY_PLUGIN
80147 +#define __no_const __attribute__((no_const))
80148 +#define __do_const __attribute__((do_const))
80149 +#endif
80150 +
80151 +#ifdef SIZE_OVERFLOW_PLUGIN
80152 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80153 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80154 +#endif
80155 +
80156 +#ifdef LATENT_ENTROPY_PLUGIN
80157 +#define __latent_entropy __attribute__((latent_entropy))
80158 +#endif
80159 +
80160 /*
80161 * Mark a position in code as unreachable. This can be used to
80162 * suppress control flow warnings after asm blocks that transfer
80163 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80164 index d5ad7b1..3b74638 100644
80165 --- a/include/linux/compiler.h
80166 +++ b/include/linux/compiler.h
80167 @@ -5,11 +5,14 @@
80168
80169 #ifdef __CHECKER__
80170 # define __user __attribute__((noderef, address_space(1)))
80171 +# define __force_user __force __user
80172 # define __kernel __attribute__((address_space(0)))
80173 +# define __force_kernel __force __kernel
80174 # define __safe __attribute__((safe))
80175 # define __force __attribute__((force))
80176 # define __nocast __attribute__((nocast))
80177 # define __iomem __attribute__((noderef, address_space(2)))
80178 +# define __force_iomem __force __iomem
80179 # define __must_hold(x) __attribute__((context(x,1,1)))
80180 # define __acquires(x) __attribute__((context(x,0,1)))
80181 # define __releases(x) __attribute__((context(x,1,0)))
80182 @@ -17,20 +20,37 @@
80183 # define __release(x) __context__(x,-1)
80184 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80185 # define __percpu __attribute__((noderef, address_space(3)))
80186 +# define __force_percpu __force __percpu
80187 #ifdef CONFIG_SPARSE_RCU_POINTER
80188 # define __rcu __attribute__((noderef, address_space(4)))
80189 +# define __force_rcu __force __rcu
80190 #else
80191 # define __rcu
80192 +# define __force_rcu
80193 #endif
80194 extern void __chk_user_ptr(const volatile void __user *);
80195 extern void __chk_io_ptr(const volatile void __iomem *);
80196 #else
80197 -# define __user
80198 -# define __kernel
80199 +# ifdef CHECKER_PLUGIN
80200 +//# define __user
80201 +//# define __force_user
80202 +//# define __kernel
80203 +//# define __force_kernel
80204 +# else
80205 +# ifdef STRUCTLEAK_PLUGIN
80206 +# define __user __attribute__((user))
80207 +# else
80208 +# define __user
80209 +# endif
80210 +# define __force_user
80211 +# define __kernel
80212 +# define __force_kernel
80213 +# endif
80214 # define __safe
80215 # define __force
80216 # define __nocast
80217 # define __iomem
80218 +# define __force_iomem
80219 # define __chk_user_ptr(x) (void)0
80220 # define __chk_io_ptr(x) (void)0
80221 # define __builtin_warning(x, y...) (1)
80222 @@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80223 # define __release(x) (void)0
80224 # define __cond_lock(x,c) (c)
80225 # define __percpu
80226 +# define __force_percpu
80227 # define __rcu
80228 +# define __force_rcu
80229 #endif
80230
80231 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80232 @@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80233 # define __attribute_const__ /* unimplemented */
80234 #endif
80235
80236 +#ifndef __randomize_layout
80237 +# define __randomize_layout
80238 +#endif
80239 +
80240 +#ifndef __no_randomize_layout
80241 +# define __no_randomize_layout
80242 +#endif
80243 +
80244 +#ifndef __no_const
80245 +# define __no_const
80246 +#endif
80247 +
80248 +#ifndef __do_const
80249 +# define __do_const
80250 +#endif
80251 +
80252 +#ifndef __size_overflow
80253 +# define __size_overflow(...)
80254 +#endif
80255 +
80256 +#ifndef __intentional_overflow
80257 +# define __intentional_overflow(...)
80258 +#endif
80259 +
80260 +#ifndef __latent_entropy
80261 +# define __latent_entropy
80262 +#endif
80263 +
80264 /*
80265 * Tell gcc if a function is cold. The compiler will assume any path
80266 * directly leading to the call is unlikely.
80267 @@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80268 #define __cold
80269 #endif
80270
80271 +#ifndef __alloc_size
80272 +#define __alloc_size(...)
80273 +#endif
80274 +
80275 +#ifndef __bos
80276 +#define __bos(ptr, arg)
80277 +#endif
80278 +
80279 +#ifndef __bos0
80280 +#define __bos0(ptr)
80281 +#endif
80282 +
80283 +#ifndef __bos1
80284 +#define __bos1(ptr)
80285 +#endif
80286 +
80287 /* Simple shorthand for a section definition */
80288 #ifndef __section
80289 # define __section(S) __attribute__ ((__section__(#S)))
80290 @@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80291 * use is to mediate communication between process-level code and irq/NMI
80292 * handlers, all running on the same CPU.
80293 */
80294 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80295 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80296 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80297
80298 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80299 #ifdef CONFIG_KPROBES
80300 diff --git a/include/linux/completion.h b/include/linux/completion.h
80301 index 5d5aaae..0ea9b84 100644
80302 --- a/include/linux/completion.h
80303 +++ b/include/linux/completion.h
80304 @@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80305
80306 extern void wait_for_completion(struct completion *);
80307 extern void wait_for_completion_io(struct completion *);
80308 -extern int wait_for_completion_interruptible(struct completion *x);
80309 -extern int wait_for_completion_killable(struct completion *x);
80310 +extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80311 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80312 extern unsigned long wait_for_completion_timeout(struct completion *x,
80313 - unsigned long timeout);
80314 + unsigned long timeout) __intentional_overflow(-1);
80315 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80316 - unsigned long timeout);
80317 + unsigned long timeout) __intentional_overflow(-1);
80318 extern long wait_for_completion_interruptible_timeout(
80319 - struct completion *x, unsigned long timeout);
80320 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80321 extern long wait_for_completion_killable_timeout(
80322 - struct completion *x, unsigned long timeout);
80323 + struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80324 extern bool try_wait_for_completion(struct completion *x);
80325 extern bool completion_done(struct completion *x);
80326
80327 diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80328 index 34025df..d94bbbc 100644
80329 --- a/include/linux/configfs.h
80330 +++ b/include/linux/configfs.h
80331 @@ -125,7 +125,7 @@ struct configfs_attribute {
80332 const char *ca_name;
80333 struct module *ca_owner;
80334 umode_t ca_mode;
80335 -};
80336 +} __do_const;
80337
80338 /*
80339 * Users often need to create attribute structures for their configurable
80340 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80341 index 503b085b..1638c9e 100644
80342 --- a/include/linux/cpufreq.h
80343 +++ b/include/linux/cpufreq.h
80344 @@ -206,6 +206,7 @@ struct global_attr {
80345 ssize_t (*store)(struct kobject *a, struct attribute *b,
80346 const char *c, size_t count);
80347 };
80348 +typedef struct global_attr __no_const global_attr_no_const;
80349
80350 #define define_one_global_ro(_name) \
80351 static struct global_attr _name = \
80352 @@ -273,7 +274,7 @@ struct cpufreq_driver {
80353 bool boost_supported;
80354 bool boost_enabled;
80355 int (*set_boost) (int state);
80356 -};
80357 +} __do_const;
80358
80359 /* flags */
80360 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80361 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80362 index 25e0df6..952dffd 100644
80363 --- a/include/linux/cpuidle.h
80364 +++ b/include/linux/cpuidle.h
80365 @@ -50,7 +50,8 @@ struct cpuidle_state {
80366 int index);
80367
80368 int (*enter_dead) (struct cpuidle_device *dev, int index);
80369 -};
80370 +} __do_const;
80371 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80372
80373 /* Idle State Flags */
80374 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80375 @@ -209,7 +210,7 @@ struct cpuidle_governor {
80376 void (*reflect) (struct cpuidle_device *dev, int index);
80377
80378 struct module *owner;
80379 -};
80380 +} __do_const;
80381
80382 #ifdef CONFIG_CPU_IDLE
80383 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80384 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80385 index 0a9a6da..ea597ca 100644
80386 --- a/include/linux/cpumask.h
80387 +++ b/include/linux/cpumask.h
80388 @@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80389 }
80390
80391 /* Valid inputs for n are -1 and 0. */
80392 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80393 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80394 {
80395 return n+1;
80396 }
80397
80398 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80399 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80400 {
80401 return n+1;
80402 }
80403
80404 -static inline unsigned int cpumask_next_and(int n,
80405 +static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80406 const struct cpumask *srcp,
80407 const struct cpumask *andp)
80408 {
80409 @@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80410 *
80411 * Returns >= nr_cpu_ids if no further cpus set.
80412 */
80413 -static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80414 +static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80415 {
80416 /* -1 is a legal arg here. */
80417 if (n != -1)
80418 @@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80419 *
80420 * Returns >= nr_cpu_ids if no further cpus unset.
80421 */
80422 -static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80423 +static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80424 {
80425 /* -1 is a legal arg here. */
80426 if (n != -1)
80427 @@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80428 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80429 }
80430
80431 -int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80432 +int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80433 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80434 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80435
80436 diff --git a/include/linux/cred.h b/include/linux/cred.h
80437 index 2fb2ca2..d6a3340 100644
80438 --- a/include/linux/cred.h
80439 +++ b/include/linux/cred.h
80440 @@ -35,7 +35,7 @@ struct group_info {
80441 int nblocks;
80442 kgid_t small_block[NGROUPS_SMALL];
80443 kgid_t *blocks[0];
80444 -};
80445 +} __randomize_layout;
80446
80447 /**
80448 * get_group_info - Get a reference to a group info structure
80449 @@ -137,7 +137,7 @@ struct cred {
80450 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80451 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80452 struct rcu_head rcu; /* RCU deletion hook */
80453 -};
80454 +} __randomize_layout;
80455
80456 extern void __put_cred(struct cred *);
80457 extern void exit_creds(struct task_struct *);
80458 @@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80459 static inline void validate_process_creds(void)
80460 {
80461 }
80462 +static inline void validate_task_creds(struct task_struct *task)
80463 +{
80464 +}
80465 #endif
80466
80467 /**
80468 @@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
80469
80470 #define task_uid(task) (task_cred_xxx((task), uid))
80471 #define task_euid(task) (task_cred_xxx((task), euid))
80472 +#define task_securebits(task) (task_cred_xxx((task), securebits))
80473
80474 #define current_cred_xxx(xxx) \
80475 ({ \
80476 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80477 index d45e949..51cf5ea 100644
80478 --- a/include/linux/crypto.h
80479 +++ b/include/linux/crypto.h
80480 @@ -373,7 +373,7 @@ struct cipher_tfm {
80481 const u8 *key, unsigned int keylen);
80482 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80483 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80484 -};
80485 +} __no_const;
80486
80487 struct hash_tfm {
80488 int (*init)(struct hash_desc *desc);
80489 @@ -394,13 +394,13 @@ struct compress_tfm {
80490 int (*cot_decompress)(struct crypto_tfm *tfm,
80491 const u8 *src, unsigned int slen,
80492 u8 *dst, unsigned int *dlen);
80493 -};
80494 +} __no_const;
80495
80496 struct rng_tfm {
80497 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80498 unsigned int dlen);
80499 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80500 -};
80501 +} __no_const;
80502
80503 #define crt_ablkcipher crt_u.ablkcipher
80504 #define crt_aead crt_u.aead
80505 diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80506 index 653589e..4ef254a 100644
80507 --- a/include/linux/ctype.h
80508 +++ b/include/linux/ctype.h
80509 @@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80510 * Fast implementation of tolower() for internal usage. Do not use in your
80511 * code.
80512 */
80513 -static inline char _tolower(const char c)
80514 +static inline unsigned char _tolower(const unsigned char c)
80515 {
80516 return c | 0x20;
80517 }
80518 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80519 index 1c2f1b8..c67151e 100644
80520 --- a/include/linux/dcache.h
80521 +++ b/include/linux/dcache.h
80522 @@ -133,7 +133,7 @@ struct dentry {
80523 struct hlist_node d_alias; /* inode alias list */
80524 struct rcu_head d_rcu;
80525 } d_u;
80526 -};
80527 +} __randomize_layout;
80528
80529 /*
80530 * dentry->d_lock spinlock nesting subclasses:
80531 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80532 index 7925bf0..d5143d2 100644
80533 --- a/include/linux/decompress/mm.h
80534 +++ b/include/linux/decompress/mm.h
80535 @@ -77,7 +77,7 @@ static void free(void *where)
80536 * warnings when not needed (indeed large_malloc / large_free are not
80537 * needed by inflate */
80538
80539 -#define malloc(a) kmalloc(a, GFP_KERNEL)
80540 +#define malloc(a) kmalloc((a), GFP_KERNEL)
80541 #define free(a) kfree(a)
80542
80543 #define large_malloc(a) vmalloc(a)
80544 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80545 index f1863dc..5c26074 100644
80546 --- a/include/linux/devfreq.h
80547 +++ b/include/linux/devfreq.h
80548 @@ -114,7 +114,7 @@ struct devfreq_governor {
80549 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80550 int (*event_handler)(struct devfreq *devfreq,
80551 unsigned int event, void *data);
80552 -};
80553 +} __do_const;
80554
80555 /**
80556 * struct devfreq - Device devfreq structure
80557 diff --git a/include/linux/device.h b/include/linux/device.h
80558 index ce1f2160..189bc33 100644
80559 --- a/include/linux/device.h
80560 +++ b/include/linux/device.h
80561 @@ -311,7 +311,7 @@ struct subsys_interface {
80562 struct list_head node;
80563 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80564 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80565 -};
80566 +} __do_const;
80567
80568 int subsys_interface_register(struct subsys_interface *sif);
80569 void subsys_interface_unregister(struct subsys_interface *sif);
80570 @@ -507,7 +507,7 @@ struct device_type {
80571 void (*release)(struct device *dev);
80572
80573 const struct dev_pm_ops *pm;
80574 -};
80575 +} __do_const;
80576
80577 /* interface for exporting device attributes */
80578 struct device_attribute {
80579 @@ -517,11 +517,12 @@ struct device_attribute {
80580 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80581 const char *buf, size_t count);
80582 };
80583 +typedef struct device_attribute __no_const device_attribute_no_const;
80584
80585 struct dev_ext_attribute {
80586 struct device_attribute attr;
80587 void *var;
80588 -};
80589 +} __do_const;
80590
80591 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80592 char *buf);
80593 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80594 index d5d3881..7ed54af 100644
80595 --- a/include/linux/dma-mapping.h
80596 +++ b/include/linux/dma-mapping.h
80597 @@ -60,7 +60,7 @@ struct dma_map_ops {
80598 u64 (*get_required_mask)(struct device *dev);
80599 #endif
80600 int is_phys;
80601 -};
80602 +} __do_const;
80603
80604 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80605
80606 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80607 index 653a1fd..9133cd1 100644
80608 --- a/include/linux/dmaengine.h
80609 +++ b/include/linux/dmaengine.h
80610 @@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80611 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80612 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80613
80614 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80615 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80616 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80617 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80618 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80619 struct dma_pinned_list *pinned_list, struct page *page,
80620 unsigned int offset, size_t len);
80621
80622 diff --git a/include/linux/efi.h b/include/linux/efi.h
80623 index 0949f9c..04cb9a5 100644
80624 --- a/include/linux/efi.h
80625 +++ b/include/linux/efi.h
80626 @@ -1050,6 +1050,7 @@ struct efivar_operations {
80627 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80628 efi_query_variable_store_t *query_variable_store;
80629 };
80630 +typedef struct efivar_operations __no_const efivar_operations_no_const;
80631
80632 struct efivars {
80633 /*
80634 diff --git a/include/linux/elf.h b/include/linux/elf.h
80635 index 67a5fa7..b817372 100644
80636 --- a/include/linux/elf.h
80637 +++ b/include/linux/elf.h
80638 @@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80639 #define elf_note elf32_note
80640 #define elf_addr_t Elf32_Off
80641 #define Elf_Half Elf32_Half
80642 +#define elf_dyn Elf32_Dyn
80643
80644 #else
80645
80646 @@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80647 #define elf_note elf64_note
80648 #define elf_addr_t Elf64_Off
80649 #define Elf_Half Elf64_Half
80650 +#define elf_dyn Elf64_Dyn
80651
80652 #endif
80653
80654 diff --git a/include/linux/err.h b/include/linux/err.h
80655 index a729120..6ede2c9 100644
80656 --- a/include/linux/err.h
80657 +++ b/include/linux/err.h
80658 @@ -20,12 +20,12 @@
80659
80660 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80661
80662 -static inline void * __must_check ERR_PTR(long error)
80663 +static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80664 {
80665 return (void *) error;
80666 }
80667
80668 -static inline long __must_check PTR_ERR(__force const void *ptr)
80669 +static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80670 {
80671 return (long) ptr;
80672 }
80673 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80674 index 36f49c4..a2a1f4c 100644
80675 --- a/include/linux/extcon.h
80676 +++ b/include/linux/extcon.h
80677 @@ -135,7 +135,7 @@ struct extcon_dev {
80678 /* /sys/class/extcon/.../mutually_exclusive/... */
80679 struct attribute_group attr_g_muex;
80680 struct attribute **attrs_muex;
80681 - struct device_attribute *d_attrs_muex;
80682 + device_attribute_no_const *d_attrs_muex;
80683 };
80684
80685 /**
80686 diff --git a/include/linux/fb.h b/include/linux/fb.h
80687 index 09bb7a1..d98870a 100644
80688 --- a/include/linux/fb.h
80689 +++ b/include/linux/fb.h
80690 @@ -305,7 +305,7 @@ struct fb_ops {
80691 /* called at KDB enter and leave time to prepare the console */
80692 int (*fb_debug_enter)(struct fb_info *info);
80693 int (*fb_debug_leave)(struct fb_info *info);
80694 -};
80695 +} __do_const;
80696
80697 #ifdef CONFIG_FB_TILEBLITTING
80698 #define FB_TILE_CURSOR_NONE 0
80699 diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80700 index 230f87b..1fd0485 100644
80701 --- a/include/linux/fdtable.h
80702 +++ b/include/linux/fdtable.h
80703 @@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80704 void put_files_struct(struct files_struct *fs);
80705 void reset_files_struct(struct files_struct *);
80706 int unshare_files(struct files_struct **);
80707 -struct files_struct *dup_fd(struct files_struct *, int *);
80708 +struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80709 void do_close_on_exec(struct files_struct *);
80710 int iterate_fd(struct files_struct *, unsigned,
80711 int (*)(const void *, struct file *, unsigned),
80712 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80713 index 8293262..2b3b8bd 100644
80714 --- a/include/linux/frontswap.h
80715 +++ b/include/linux/frontswap.h
80716 @@ -11,7 +11,7 @@ struct frontswap_ops {
80717 int (*load)(unsigned, pgoff_t, struct page *);
80718 void (*invalidate_page)(unsigned, pgoff_t);
80719 void (*invalidate_area)(unsigned);
80720 -};
80721 +} __no_const;
80722
80723 extern bool frontswap_enabled;
80724 extern struct frontswap_ops *
80725 diff --git a/include/linux/fs.h b/include/linux/fs.h
80726 index 9ab779e..0c636f2 100644
80727 --- a/include/linux/fs.h
80728 +++ b/include/linux/fs.h
80729 @@ -412,7 +412,7 @@ struct address_space {
80730 spinlock_t private_lock; /* for use by the address_space */
80731 struct list_head private_list; /* ditto */
80732 void *private_data; /* ditto */
80733 -} __attribute__((aligned(sizeof(long))));
80734 +} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80735 /*
80736 * On most architectures that alignment is already the case; but
80737 * must be enforced here for CRIS, to let the least significant bit
80738 @@ -455,7 +455,7 @@ struct block_device {
80739 int bd_fsfreeze_count;
80740 /* Mutex for freeze */
80741 struct mutex bd_fsfreeze_mutex;
80742 -};
80743 +} __randomize_layout;
80744
80745 /*
80746 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80747 @@ -624,7 +624,7 @@ struct inode {
80748 #endif
80749
80750 void *i_private; /* fs or device private pointer */
80751 -};
80752 +} __randomize_layout;
80753
80754 static inline int inode_unhashed(struct inode *inode)
80755 {
80756 @@ -820,7 +820,7 @@ struct file {
80757 struct list_head f_tfile_llink;
80758 #endif /* #ifdef CONFIG_EPOLL */
80759 struct address_space *f_mapping;
80760 -} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
80761 +} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
80762
80763 struct file_handle {
80764 __u32 handle_bytes;
80765 @@ -945,7 +945,7 @@ struct file_lock {
80766 int state; /* state of grant or error if -ve */
80767 } afs;
80768 } fl_u;
80769 -};
80770 +} __randomize_layout;
80771
80772 /* The following constant reflects the upper bound of the file/locking space */
80773 #ifndef OFFSET_MAX
80774 @@ -1287,7 +1287,7 @@ struct super_block {
80775 * Indicates how deep in a filesystem stack this SB is
80776 */
80777 int s_stack_depth;
80778 -};
80779 +} __randomize_layout;
80780
80781 extern struct timespec current_fs_time(struct super_block *sb);
80782
80783 @@ -1514,7 +1514,8 @@ struct file_operations {
80784 long (*fallocate)(struct file *file, int mode, loff_t offset,
80785 loff_t len);
80786 int (*show_fdinfo)(struct seq_file *m, struct file *f);
80787 -};
80788 +} __do_const __randomize_layout;
80789 +typedef struct file_operations __no_const file_operations_no_const;
80790
80791 struct inode_operations {
80792 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
80793 @@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
80794 return !IS_DEADDIR(inode);
80795 }
80796
80797 +static inline bool is_sidechannel_device(const struct inode *inode)
80798 +{
80799 +#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
80800 + umode_t mode = inode->i_mode;
80801 + return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
80802 +#else
80803 + return false;
80804 +#endif
80805 +}
80806 +
80807 #endif /* _LINUX_FS_H */
80808 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
80809 index 0efc3e6..fd23610 100644
80810 --- a/include/linux/fs_struct.h
80811 +++ b/include/linux/fs_struct.h
80812 @@ -6,13 +6,13 @@
80813 #include <linux/seqlock.h>
80814
80815 struct fs_struct {
80816 - int users;
80817 + atomic_t users;
80818 spinlock_t lock;
80819 seqcount_t seq;
80820 int umask;
80821 int in_exec;
80822 struct path root, pwd;
80823 -};
80824 +} __randomize_layout;
80825
80826 extern struct kmem_cache *fs_cachep;
80827
80828 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
80829 index 7714849..a4a5c7a 100644
80830 --- a/include/linux/fscache-cache.h
80831 +++ b/include/linux/fscache-cache.h
80832 @@ -113,7 +113,7 @@ struct fscache_operation {
80833 fscache_operation_release_t release;
80834 };
80835
80836 -extern atomic_t fscache_op_debug_id;
80837 +extern atomic_unchecked_t fscache_op_debug_id;
80838 extern void fscache_op_work_func(struct work_struct *work);
80839
80840 extern void fscache_enqueue_operation(struct fscache_operation *);
80841 @@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
80842 INIT_WORK(&op->work, fscache_op_work_func);
80843 atomic_set(&op->usage, 1);
80844 op->state = FSCACHE_OP_ST_INITIALISED;
80845 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
80846 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
80847 op->processor = processor;
80848 op->release = release;
80849 INIT_LIST_HEAD(&op->pend_link);
80850 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
80851 index 115bb81..e7b812b 100644
80852 --- a/include/linux/fscache.h
80853 +++ b/include/linux/fscache.h
80854 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
80855 * - this is mandatory for any object that may have data
80856 */
80857 void (*now_uncached)(void *cookie_netfs_data);
80858 -};
80859 +} __do_const;
80860
80861 /*
80862 * fscache cached network filesystem type
80863 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
80864 index 1c804b0..1432c2b 100644
80865 --- a/include/linux/fsnotify.h
80866 +++ b/include/linux/fsnotify.h
80867 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
80868 struct inode *inode = file_inode(file);
80869 __u32 mask = FS_ACCESS;
80870
80871 + if (is_sidechannel_device(inode))
80872 + return;
80873 +
80874 if (S_ISDIR(inode->i_mode))
80875 mask |= FS_ISDIR;
80876
80877 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
80878 struct inode *inode = file_inode(file);
80879 __u32 mask = FS_MODIFY;
80880
80881 + if (is_sidechannel_device(inode))
80882 + return;
80883 +
80884 if (S_ISDIR(inode->i_mode))
80885 mask |= FS_ISDIR;
80886
80887 @@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
80888 */
80889 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
80890 {
80891 - return kstrdup(name, GFP_KERNEL);
80892 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
80893 }
80894
80895 /*
80896 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
80897 index ec274e0..e678159 100644
80898 --- a/include/linux/genhd.h
80899 +++ b/include/linux/genhd.h
80900 @@ -194,7 +194,7 @@ struct gendisk {
80901 struct kobject *slave_dir;
80902
80903 struct timer_rand_state *random;
80904 - atomic_t sync_io; /* RAID */
80905 + atomic_unchecked_t sync_io; /* RAID */
80906 struct disk_events *ev;
80907 #ifdef CONFIG_BLK_DEV_INTEGRITY
80908 struct blk_integrity *integrity;
80909 @@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
80910 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
80911
80912 /* drivers/char/random.c */
80913 -extern void add_disk_randomness(struct gendisk *disk);
80914 +extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
80915 extern void rand_initialize_disk(struct gendisk *disk);
80916
80917 static inline sector_t get_start_sect(struct block_device *bdev)
80918 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
80919 index 667c311..abac2a7 100644
80920 --- a/include/linux/genl_magic_func.h
80921 +++ b/include/linux/genl_magic_func.h
80922 @@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
80923 },
80924
80925 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
80926 -static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
80927 +static struct genl_ops ZZZ_genl_ops[] = {
80928 #include GENL_MAGIC_INCLUDE_FILE
80929 };
80930
80931 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
80932 index 41b30fd..a3718cf 100644
80933 --- a/include/linux/gfp.h
80934 +++ b/include/linux/gfp.h
80935 @@ -34,6 +34,13 @@ struct vm_area_struct;
80936 #define ___GFP_NO_KSWAPD 0x400000u
80937 #define ___GFP_OTHER_NODE 0x800000u
80938 #define ___GFP_WRITE 0x1000000u
80939 +
80940 +#ifdef CONFIG_PAX_USERCOPY_SLABS
80941 +#define ___GFP_USERCOPY 0x2000000u
80942 +#else
80943 +#define ___GFP_USERCOPY 0
80944 +#endif
80945 +
80946 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
80947
80948 /*
80949 @@ -90,6 +97,7 @@ struct vm_area_struct;
80950 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
80951 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
80952 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
80953 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
80954
80955 /*
80956 * This may seem redundant, but it's a way of annotating false positives vs.
80957 @@ -97,7 +105,7 @@ struct vm_area_struct;
80958 */
80959 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
80960
80961 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
80962 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
80963 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
80964
80965 /* This equals 0, but use constants in case they ever change */
80966 @@ -155,6 +163,8 @@ struct vm_area_struct;
80967 /* 4GB DMA on some platforms */
80968 #define GFP_DMA32 __GFP_DMA32
80969
80970 +#define GFP_USERCOPY __GFP_USERCOPY
80971 +
80972 /* Convert GFP flags to their corresponding migrate type */
80973 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
80974 {
80975 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
80976 new file mode 100644
80977 index 0000000..edb2cb6
80978 --- /dev/null
80979 +++ b/include/linux/gracl.h
80980 @@ -0,0 +1,340 @@
80981 +#ifndef GR_ACL_H
80982 +#define GR_ACL_H
80983 +
80984 +#include <linux/grdefs.h>
80985 +#include <linux/resource.h>
80986 +#include <linux/capability.h>
80987 +#include <linux/dcache.h>
80988 +#include <asm/resource.h>
80989 +
80990 +/* Major status information */
80991 +
80992 +#define GR_VERSION "grsecurity 3.0"
80993 +#define GRSECURITY_VERSION 0x3000
80994 +
80995 +enum {
80996 + GR_SHUTDOWN = 0,
80997 + GR_ENABLE = 1,
80998 + GR_SPROLE = 2,
80999 + GR_OLDRELOAD = 3,
81000 + GR_SEGVMOD = 4,
81001 + GR_STATUS = 5,
81002 + GR_UNSPROLE = 6,
81003 + GR_PASSSET = 7,
81004 + GR_SPROLEPAM = 8,
81005 + GR_RELOAD = 9,
81006 +};
81007 +
81008 +/* Password setup definitions
81009 + * kernel/grhash.c */
81010 +enum {
81011 + GR_PW_LEN = 128,
81012 + GR_SALT_LEN = 16,
81013 + GR_SHA_LEN = 32,
81014 +};
81015 +
81016 +enum {
81017 + GR_SPROLE_LEN = 64,
81018 +};
81019 +
81020 +enum {
81021 + GR_NO_GLOB = 0,
81022 + GR_REG_GLOB,
81023 + GR_CREATE_GLOB
81024 +};
81025 +
81026 +#define GR_NLIMITS 32
81027 +
81028 +/* Begin Data Structures */
81029 +
81030 +struct sprole_pw {
81031 + unsigned char *rolename;
81032 + unsigned char salt[GR_SALT_LEN];
81033 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
81034 +};
81035 +
81036 +struct name_entry {
81037 + __u32 key;
81038 + ino_t inode;
81039 + dev_t device;
81040 + char *name;
81041 + __u16 len;
81042 + __u8 deleted;
81043 + struct name_entry *prev;
81044 + struct name_entry *next;
81045 +};
81046 +
81047 +struct inodev_entry {
81048 + struct name_entry *nentry;
81049 + struct inodev_entry *prev;
81050 + struct inodev_entry *next;
81051 +};
81052 +
81053 +struct acl_role_db {
81054 + struct acl_role_label **r_hash;
81055 + __u32 r_size;
81056 +};
81057 +
81058 +struct inodev_db {
81059 + struct inodev_entry **i_hash;
81060 + __u32 i_size;
81061 +};
81062 +
81063 +struct name_db {
81064 + struct name_entry **n_hash;
81065 + __u32 n_size;
81066 +};
81067 +
81068 +struct crash_uid {
81069 + uid_t uid;
81070 + unsigned long expires;
81071 +};
81072 +
81073 +struct gr_hash_struct {
81074 + void **table;
81075 + void **nametable;
81076 + void *first;
81077 + __u32 table_size;
81078 + __u32 used_size;
81079 + int type;
81080 +};
81081 +
81082 +/* Userspace Grsecurity ACL data structures */
81083 +
81084 +struct acl_subject_label {
81085 + char *filename;
81086 + ino_t inode;
81087 + dev_t device;
81088 + __u32 mode;
81089 + kernel_cap_t cap_mask;
81090 + kernel_cap_t cap_lower;
81091 + kernel_cap_t cap_invert_audit;
81092 +
81093 + struct rlimit res[GR_NLIMITS];
81094 + __u32 resmask;
81095 +
81096 + __u8 user_trans_type;
81097 + __u8 group_trans_type;
81098 + uid_t *user_transitions;
81099 + gid_t *group_transitions;
81100 + __u16 user_trans_num;
81101 + __u16 group_trans_num;
81102 +
81103 + __u32 sock_families[2];
81104 + __u32 ip_proto[8];
81105 + __u32 ip_type;
81106 + struct acl_ip_label **ips;
81107 + __u32 ip_num;
81108 + __u32 inaddr_any_override;
81109 +
81110 + __u32 crashes;
81111 + unsigned long expires;
81112 +
81113 + struct acl_subject_label *parent_subject;
81114 + struct gr_hash_struct *hash;
81115 + struct acl_subject_label *prev;
81116 + struct acl_subject_label *next;
81117 +
81118 + struct acl_object_label **obj_hash;
81119 + __u32 obj_hash_size;
81120 + __u16 pax_flags;
81121 +};
81122 +
81123 +struct role_allowed_ip {
81124 + __u32 addr;
81125 + __u32 netmask;
81126 +
81127 + struct role_allowed_ip *prev;
81128 + struct role_allowed_ip *next;
81129 +};
81130 +
81131 +struct role_transition {
81132 + char *rolename;
81133 +
81134 + struct role_transition *prev;
81135 + struct role_transition *next;
81136 +};
81137 +
81138 +struct acl_role_label {
81139 + char *rolename;
81140 + uid_t uidgid;
81141 + __u16 roletype;
81142 +
81143 + __u16 auth_attempts;
81144 + unsigned long expires;
81145 +
81146 + struct acl_subject_label *root_label;
81147 + struct gr_hash_struct *hash;
81148 +
81149 + struct acl_role_label *prev;
81150 + struct acl_role_label *next;
81151 +
81152 + struct role_transition *transitions;
81153 + struct role_allowed_ip *allowed_ips;
81154 + uid_t *domain_children;
81155 + __u16 domain_child_num;
81156 +
81157 + umode_t umask;
81158 +
81159 + struct acl_subject_label **subj_hash;
81160 + __u32 subj_hash_size;
81161 +};
81162 +
81163 +struct user_acl_role_db {
81164 + struct acl_role_label **r_table;
81165 + __u32 num_pointers; /* Number of allocations to track */
81166 + __u32 num_roles; /* Number of roles */
81167 + __u32 num_domain_children; /* Number of domain children */
81168 + __u32 num_subjects; /* Number of subjects */
81169 + __u32 num_objects; /* Number of objects */
81170 +};
81171 +
81172 +struct acl_object_label {
81173 + char *filename;
81174 + ino_t inode;
81175 + dev_t device;
81176 + __u32 mode;
81177 +
81178 + struct acl_subject_label *nested;
81179 + struct acl_object_label *globbed;
81180 +
81181 + /* next two structures not used */
81182 +
81183 + struct acl_object_label *prev;
81184 + struct acl_object_label *next;
81185 +};
81186 +
81187 +struct acl_ip_label {
81188 + char *iface;
81189 + __u32 addr;
81190 + __u32 netmask;
81191 + __u16 low, high;
81192 + __u8 mode;
81193 + __u32 type;
81194 + __u32 proto[8];
81195 +
81196 + /* next two structures not used */
81197 +
81198 + struct acl_ip_label *prev;
81199 + struct acl_ip_label *next;
81200 +};
81201 +
81202 +struct gr_arg {
81203 + struct user_acl_role_db role_db;
81204 + unsigned char pw[GR_PW_LEN];
81205 + unsigned char salt[GR_SALT_LEN];
81206 + unsigned char sum[GR_SHA_LEN];
81207 + unsigned char sp_role[GR_SPROLE_LEN];
81208 + struct sprole_pw *sprole_pws;
81209 + dev_t segv_device;
81210 + ino_t segv_inode;
81211 + uid_t segv_uid;
81212 + __u16 num_sprole_pws;
81213 + __u16 mode;
81214 +};
81215 +
81216 +struct gr_arg_wrapper {
81217 + struct gr_arg *arg;
81218 + __u32 version;
81219 + __u32 size;
81220 +};
81221 +
81222 +struct subject_map {
81223 + struct acl_subject_label *user;
81224 + struct acl_subject_label *kernel;
81225 + struct subject_map *prev;
81226 + struct subject_map *next;
81227 +};
81228 +
81229 +struct acl_subj_map_db {
81230 + struct subject_map **s_hash;
81231 + __u32 s_size;
81232 +};
81233 +
81234 +struct gr_policy_state {
81235 + struct sprole_pw **acl_special_roles;
81236 + __u16 num_sprole_pws;
81237 + struct acl_role_label *kernel_role;
81238 + struct acl_role_label *role_list;
81239 + struct acl_role_label *default_role;
81240 + struct acl_role_db acl_role_set;
81241 + struct acl_subj_map_db subj_map_set;
81242 + struct name_db name_set;
81243 + struct inodev_db inodev_set;
81244 +};
81245 +
81246 +struct gr_alloc_state {
81247 + unsigned long alloc_stack_next;
81248 + unsigned long alloc_stack_size;
81249 + void **alloc_stack;
81250 +};
81251 +
81252 +struct gr_reload_state {
81253 + struct gr_policy_state oldpolicy;
81254 + struct gr_alloc_state oldalloc;
81255 + struct gr_policy_state newpolicy;
81256 + struct gr_alloc_state newalloc;
81257 + struct gr_policy_state *oldpolicy_ptr;
81258 + struct gr_alloc_state *oldalloc_ptr;
81259 + unsigned char oldmode;
81260 +};
81261 +
81262 +/* End Data Structures Section */
81263 +
81264 +/* Hash functions generated by empirical testing by Brad Spengler
81265 + Makes good use of the low bits of the inode. Generally 0-1 times
81266 + in loop for successful match. 0-3 for unsuccessful match.
81267 + Shift/add algorithm with modulus of table size and an XOR*/
81268 +
81269 +static __inline__ unsigned int
81270 +gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81271 +{
81272 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
81273 +}
81274 +
81275 + static __inline__ unsigned int
81276 +gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81277 +{
81278 + return ((const unsigned long)userp % sz);
81279 +}
81280 +
81281 +static __inline__ unsigned int
81282 +gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81283 +{
81284 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81285 +}
81286 +
81287 +static __inline__ unsigned int
81288 +gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81289 +{
81290 + return full_name_hash((const unsigned char *)name, len) % sz;
81291 +}
81292 +
81293 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81294 + subj = NULL; \
81295 + iter = 0; \
81296 + while (iter < role->subj_hash_size) { \
81297 + if (subj == NULL) \
81298 + subj = role->subj_hash[iter]; \
81299 + if (subj == NULL) { \
81300 + iter++; \
81301 + continue; \
81302 + }
81303 +
81304 +#define FOR_EACH_SUBJECT_END(subj,iter) \
81305 + subj = subj->next; \
81306 + if (subj == NULL) \
81307 + iter++; \
81308 + }
81309 +
81310 +
81311 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81312 + subj = role->hash->first; \
81313 + while (subj != NULL) {
81314 +
81315 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81316 + subj = subj->next; \
81317 + }
81318 +
81319 +#endif
81320 +
81321 diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81322 new file mode 100644
81323 index 0000000..33ebd1f
81324 --- /dev/null
81325 +++ b/include/linux/gracl_compat.h
81326 @@ -0,0 +1,156 @@
81327 +#ifndef GR_ACL_COMPAT_H
81328 +#define GR_ACL_COMPAT_H
81329 +
81330 +#include <linux/resource.h>
81331 +#include <asm/resource.h>
81332 +
81333 +struct sprole_pw_compat {
81334 + compat_uptr_t rolename;
81335 + unsigned char salt[GR_SALT_LEN];
81336 + unsigned char sum[GR_SHA_LEN];
81337 +};
81338 +
81339 +struct gr_hash_struct_compat {
81340 + compat_uptr_t table;
81341 + compat_uptr_t nametable;
81342 + compat_uptr_t first;
81343 + __u32 table_size;
81344 + __u32 used_size;
81345 + int type;
81346 +};
81347 +
81348 +struct acl_subject_label_compat {
81349 + compat_uptr_t filename;
81350 + compat_ino_t inode;
81351 + __u32 device;
81352 + __u32 mode;
81353 + kernel_cap_t cap_mask;
81354 + kernel_cap_t cap_lower;
81355 + kernel_cap_t cap_invert_audit;
81356 +
81357 + struct compat_rlimit res[GR_NLIMITS];
81358 + __u32 resmask;
81359 +
81360 + __u8 user_trans_type;
81361 + __u8 group_trans_type;
81362 + compat_uptr_t user_transitions;
81363 + compat_uptr_t group_transitions;
81364 + __u16 user_trans_num;
81365 + __u16 group_trans_num;
81366 +
81367 + __u32 sock_families[2];
81368 + __u32 ip_proto[8];
81369 + __u32 ip_type;
81370 + compat_uptr_t ips;
81371 + __u32 ip_num;
81372 + __u32 inaddr_any_override;
81373 +
81374 + __u32 crashes;
81375 + compat_ulong_t expires;
81376 +
81377 + compat_uptr_t parent_subject;
81378 + compat_uptr_t hash;
81379 + compat_uptr_t prev;
81380 + compat_uptr_t next;
81381 +
81382 + compat_uptr_t obj_hash;
81383 + __u32 obj_hash_size;
81384 + __u16 pax_flags;
81385 +};
81386 +
81387 +struct role_allowed_ip_compat {
81388 + __u32 addr;
81389 + __u32 netmask;
81390 +
81391 + compat_uptr_t prev;
81392 + compat_uptr_t next;
81393 +};
81394 +
81395 +struct role_transition_compat {
81396 + compat_uptr_t rolename;
81397 +
81398 + compat_uptr_t prev;
81399 + compat_uptr_t next;
81400 +};
81401 +
81402 +struct acl_role_label_compat {
81403 + compat_uptr_t rolename;
81404 + uid_t uidgid;
81405 + __u16 roletype;
81406 +
81407 + __u16 auth_attempts;
81408 + compat_ulong_t expires;
81409 +
81410 + compat_uptr_t root_label;
81411 + compat_uptr_t hash;
81412 +
81413 + compat_uptr_t prev;
81414 + compat_uptr_t next;
81415 +
81416 + compat_uptr_t transitions;
81417 + compat_uptr_t allowed_ips;
81418 + compat_uptr_t domain_children;
81419 + __u16 domain_child_num;
81420 +
81421 + umode_t umask;
81422 +
81423 + compat_uptr_t subj_hash;
81424 + __u32 subj_hash_size;
81425 +};
81426 +
81427 +struct user_acl_role_db_compat {
81428 + compat_uptr_t r_table;
81429 + __u32 num_pointers;
81430 + __u32 num_roles;
81431 + __u32 num_domain_children;
81432 + __u32 num_subjects;
81433 + __u32 num_objects;
81434 +};
81435 +
81436 +struct acl_object_label_compat {
81437 + compat_uptr_t filename;
81438 + compat_ino_t inode;
81439 + __u32 device;
81440 + __u32 mode;
81441 +
81442 + compat_uptr_t nested;
81443 + compat_uptr_t globbed;
81444 +
81445 + compat_uptr_t prev;
81446 + compat_uptr_t next;
81447 +};
81448 +
81449 +struct acl_ip_label_compat {
81450 + compat_uptr_t iface;
81451 + __u32 addr;
81452 + __u32 netmask;
81453 + __u16 low, high;
81454 + __u8 mode;
81455 + __u32 type;
81456 + __u32 proto[8];
81457 +
81458 + compat_uptr_t prev;
81459 + compat_uptr_t next;
81460 +};
81461 +
81462 +struct gr_arg_compat {
81463 + struct user_acl_role_db_compat role_db;
81464 + unsigned char pw[GR_PW_LEN];
81465 + unsigned char salt[GR_SALT_LEN];
81466 + unsigned char sum[GR_SHA_LEN];
81467 + unsigned char sp_role[GR_SPROLE_LEN];
81468 + compat_uptr_t sprole_pws;
81469 + __u32 segv_device;
81470 + compat_ino_t segv_inode;
81471 + uid_t segv_uid;
81472 + __u16 num_sprole_pws;
81473 + __u16 mode;
81474 +};
81475 +
81476 +struct gr_arg_wrapper_compat {
81477 + compat_uptr_t arg;
81478 + __u32 version;
81479 + __u32 size;
81480 +};
81481 +
81482 +#endif
81483 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81484 new file mode 100644
81485 index 0000000..323ecf2
81486 --- /dev/null
81487 +++ b/include/linux/gralloc.h
81488 @@ -0,0 +1,9 @@
81489 +#ifndef __GRALLOC_H
81490 +#define __GRALLOC_H
81491 +
81492 +void acl_free_all(void);
81493 +int acl_alloc_stack_init(unsigned long size);
81494 +void *acl_alloc(unsigned long len);
81495 +void *acl_alloc_num(unsigned long num, unsigned long len);
81496 +
81497 +#endif
81498 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81499 new file mode 100644
81500 index 0000000..be66033
81501 --- /dev/null
81502 +++ b/include/linux/grdefs.h
81503 @@ -0,0 +1,140 @@
81504 +#ifndef GRDEFS_H
81505 +#define GRDEFS_H
81506 +
81507 +/* Begin grsecurity status declarations */
81508 +
81509 +enum {
81510 + GR_READY = 0x01,
81511 + GR_STATUS_INIT = 0x00 // disabled state
81512 +};
81513 +
81514 +/* Begin ACL declarations */
81515 +
81516 +/* Role flags */
81517 +
81518 +enum {
81519 + GR_ROLE_USER = 0x0001,
81520 + GR_ROLE_GROUP = 0x0002,
81521 + GR_ROLE_DEFAULT = 0x0004,
81522 + GR_ROLE_SPECIAL = 0x0008,
81523 + GR_ROLE_AUTH = 0x0010,
81524 + GR_ROLE_NOPW = 0x0020,
81525 + GR_ROLE_GOD = 0x0040,
81526 + GR_ROLE_LEARN = 0x0080,
81527 + GR_ROLE_TPE = 0x0100,
81528 + GR_ROLE_DOMAIN = 0x0200,
81529 + GR_ROLE_PAM = 0x0400,
81530 + GR_ROLE_PERSIST = 0x0800
81531 +};
81532 +
81533 +/* ACL Subject and Object mode flags */
81534 +enum {
81535 + GR_DELETED = 0x80000000
81536 +};
81537 +
81538 +/* ACL Object-only mode flags */
81539 +enum {
81540 + GR_READ = 0x00000001,
81541 + GR_APPEND = 0x00000002,
81542 + GR_WRITE = 0x00000004,
81543 + GR_EXEC = 0x00000008,
81544 + GR_FIND = 0x00000010,
81545 + GR_INHERIT = 0x00000020,
81546 + GR_SETID = 0x00000040,
81547 + GR_CREATE = 0x00000080,
81548 + GR_DELETE = 0x00000100,
81549 + GR_LINK = 0x00000200,
81550 + GR_AUDIT_READ = 0x00000400,
81551 + GR_AUDIT_APPEND = 0x00000800,
81552 + GR_AUDIT_WRITE = 0x00001000,
81553 + GR_AUDIT_EXEC = 0x00002000,
81554 + GR_AUDIT_FIND = 0x00004000,
81555 + GR_AUDIT_INHERIT= 0x00008000,
81556 + GR_AUDIT_SETID = 0x00010000,
81557 + GR_AUDIT_CREATE = 0x00020000,
81558 + GR_AUDIT_DELETE = 0x00040000,
81559 + GR_AUDIT_LINK = 0x00080000,
81560 + GR_PTRACERD = 0x00100000,
81561 + GR_NOPTRACE = 0x00200000,
81562 + GR_SUPPRESS = 0x00400000,
81563 + GR_NOLEARN = 0x00800000,
81564 + GR_INIT_TRANSFER= 0x01000000
81565 +};
81566 +
81567 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81568 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81569 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81570 +
81571 +/* ACL subject-only mode flags */
81572 +enum {
81573 + GR_KILL = 0x00000001,
81574 + GR_VIEW = 0x00000002,
81575 + GR_PROTECTED = 0x00000004,
81576 + GR_LEARN = 0x00000008,
81577 + GR_OVERRIDE = 0x00000010,
81578 + /* just a placeholder, this mode is only used in userspace */
81579 + GR_DUMMY = 0x00000020,
81580 + GR_PROTSHM = 0x00000040,
81581 + GR_KILLPROC = 0x00000080,
81582 + GR_KILLIPPROC = 0x00000100,
81583 + /* just a placeholder, this mode is only used in userspace */
81584 + GR_NOTROJAN = 0x00000200,
81585 + GR_PROTPROCFD = 0x00000400,
81586 + GR_PROCACCT = 0x00000800,
81587 + GR_RELAXPTRACE = 0x00001000,
81588 + //GR_NESTED = 0x00002000,
81589 + GR_INHERITLEARN = 0x00004000,
81590 + GR_PROCFIND = 0x00008000,
81591 + GR_POVERRIDE = 0x00010000,
81592 + GR_KERNELAUTH = 0x00020000,
81593 + GR_ATSECURE = 0x00040000,
81594 + GR_SHMEXEC = 0x00080000
81595 +};
81596 +
81597 +enum {
81598 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81599 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81600 + GR_PAX_ENABLE_MPROTECT = 0x0004,
81601 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
81602 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81603 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81604 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81605 + GR_PAX_DISABLE_MPROTECT = 0x0400,
81606 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
81607 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81608 +};
81609 +
81610 +enum {
81611 + GR_ID_USER = 0x01,
81612 + GR_ID_GROUP = 0x02,
81613 +};
81614 +
81615 +enum {
81616 + GR_ID_ALLOW = 0x01,
81617 + GR_ID_DENY = 0x02,
81618 +};
81619 +
81620 +#define GR_CRASH_RES 31
81621 +#define GR_UIDTABLE_MAX 500
81622 +
81623 +/* begin resource learning section */
81624 +enum {
81625 + GR_RLIM_CPU_BUMP = 60,
81626 + GR_RLIM_FSIZE_BUMP = 50000,
81627 + GR_RLIM_DATA_BUMP = 10000,
81628 + GR_RLIM_STACK_BUMP = 1000,
81629 + GR_RLIM_CORE_BUMP = 10000,
81630 + GR_RLIM_RSS_BUMP = 500000,
81631 + GR_RLIM_NPROC_BUMP = 1,
81632 + GR_RLIM_NOFILE_BUMP = 5,
81633 + GR_RLIM_MEMLOCK_BUMP = 50000,
81634 + GR_RLIM_AS_BUMP = 500000,
81635 + GR_RLIM_LOCKS_BUMP = 2,
81636 + GR_RLIM_SIGPENDING_BUMP = 5,
81637 + GR_RLIM_MSGQUEUE_BUMP = 10000,
81638 + GR_RLIM_NICE_BUMP = 1,
81639 + GR_RLIM_RTPRIO_BUMP = 1,
81640 + GR_RLIM_RTTIME_BUMP = 1000000
81641 +};
81642 +
81643 +#endif
81644 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81645 new file mode 100644
81646 index 0000000..d25522e
81647 --- /dev/null
81648 +++ b/include/linux/grinternal.h
81649 @@ -0,0 +1,229 @@
81650 +#ifndef __GRINTERNAL_H
81651 +#define __GRINTERNAL_H
81652 +
81653 +#ifdef CONFIG_GRKERNSEC
81654 +
81655 +#include <linux/fs.h>
81656 +#include <linux/mnt_namespace.h>
81657 +#include <linux/nsproxy.h>
81658 +#include <linux/gracl.h>
81659 +#include <linux/grdefs.h>
81660 +#include <linux/grmsg.h>
81661 +
81662 +void gr_add_learn_entry(const char *fmt, ...)
81663 + __attribute__ ((format (printf, 1, 2)));
81664 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81665 + const struct vfsmount *mnt);
81666 +__u32 gr_check_create(const struct dentry *new_dentry,
81667 + const struct dentry *parent,
81668 + const struct vfsmount *mnt, const __u32 mode);
81669 +int gr_check_protected_task(const struct task_struct *task);
81670 +__u32 to_gr_audit(const __u32 reqmode);
81671 +int gr_set_acls(const int type);
81672 +int gr_acl_is_enabled(void);
81673 +char gr_roletype_to_char(void);
81674 +
81675 +void gr_handle_alertkill(struct task_struct *task);
81676 +char *gr_to_filename(const struct dentry *dentry,
81677 + const struct vfsmount *mnt);
81678 +char *gr_to_filename1(const struct dentry *dentry,
81679 + const struct vfsmount *mnt);
81680 +char *gr_to_filename2(const struct dentry *dentry,
81681 + const struct vfsmount *mnt);
81682 +char *gr_to_filename3(const struct dentry *dentry,
81683 + const struct vfsmount *mnt);
81684 +
81685 +extern int grsec_enable_ptrace_readexec;
81686 +extern int grsec_enable_harden_ptrace;
81687 +extern int grsec_enable_link;
81688 +extern int grsec_enable_fifo;
81689 +extern int grsec_enable_execve;
81690 +extern int grsec_enable_shm;
81691 +extern int grsec_enable_execlog;
81692 +extern int grsec_enable_signal;
81693 +extern int grsec_enable_audit_ptrace;
81694 +extern int grsec_enable_forkfail;
81695 +extern int grsec_enable_time;
81696 +extern int grsec_enable_rofs;
81697 +extern int grsec_deny_new_usb;
81698 +extern int grsec_enable_chroot_shmat;
81699 +extern int grsec_enable_chroot_mount;
81700 +extern int grsec_enable_chroot_double;
81701 +extern int grsec_enable_chroot_pivot;
81702 +extern int grsec_enable_chroot_chdir;
81703 +extern int grsec_enable_chroot_chmod;
81704 +extern int grsec_enable_chroot_mknod;
81705 +extern int grsec_enable_chroot_fchdir;
81706 +extern int grsec_enable_chroot_nice;
81707 +extern int grsec_enable_chroot_execlog;
81708 +extern int grsec_enable_chroot_caps;
81709 +extern int grsec_enable_chroot_sysctl;
81710 +extern int grsec_enable_chroot_unix;
81711 +extern int grsec_enable_symlinkown;
81712 +extern kgid_t grsec_symlinkown_gid;
81713 +extern int grsec_enable_tpe;
81714 +extern kgid_t grsec_tpe_gid;
81715 +extern int grsec_enable_tpe_all;
81716 +extern int grsec_enable_tpe_invert;
81717 +extern int grsec_enable_socket_all;
81718 +extern kgid_t grsec_socket_all_gid;
81719 +extern int grsec_enable_socket_client;
81720 +extern kgid_t grsec_socket_client_gid;
81721 +extern int grsec_enable_socket_server;
81722 +extern kgid_t grsec_socket_server_gid;
81723 +extern kgid_t grsec_audit_gid;
81724 +extern int grsec_enable_group;
81725 +extern int grsec_enable_log_rwxmaps;
81726 +extern int grsec_enable_mount;
81727 +extern int grsec_enable_chdir;
81728 +extern int grsec_resource_logging;
81729 +extern int grsec_enable_blackhole;
81730 +extern int grsec_lastack_retries;
81731 +extern int grsec_enable_brute;
81732 +extern int grsec_enable_harden_ipc;
81733 +extern int grsec_lock;
81734 +
81735 +extern spinlock_t grsec_alert_lock;
81736 +extern unsigned long grsec_alert_wtime;
81737 +extern unsigned long grsec_alert_fyet;
81738 +
81739 +extern spinlock_t grsec_audit_lock;
81740 +
81741 +extern rwlock_t grsec_exec_file_lock;
81742 +
81743 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81744 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81745 + (tsk)->exec_file->f_path.mnt) : "/")
81746 +
81747 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81748 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81749 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81750 +
81751 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81752 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
81753 + (tsk)->exec_file->f_path.mnt) : "/")
81754 +
81755 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
81756 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
81757 + (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81758 +
81759 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
81760 +
81761 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
81762 +
81763 +static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
81764 +{
81765 + if (file1 && file2) {
81766 + const struct inode *inode1 = file1->f_path.dentry->d_inode;
81767 + const struct inode *inode2 = file2->f_path.dentry->d_inode;
81768 + if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
81769 + return true;
81770 + }
81771 +
81772 + return false;
81773 +}
81774 +
81775 +#define GR_CHROOT_CAPS {{ \
81776 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
81777 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
81778 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
81779 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
81780 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
81781 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
81782 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
81783 +
81784 +#define security_learn(normal_msg,args...) \
81785 +({ \
81786 + read_lock(&grsec_exec_file_lock); \
81787 + gr_add_learn_entry(normal_msg "\n", ## args); \
81788 + read_unlock(&grsec_exec_file_lock); \
81789 +})
81790 +
81791 +enum {
81792 + GR_DO_AUDIT,
81793 + GR_DONT_AUDIT,
81794 + /* used for non-audit messages that we shouldn't kill the task on */
81795 + GR_DONT_AUDIT_GOOD
81796 +};
81797 +
81798 +enum {
81799 + GR_TTYSNIFF,
81800 + GR_RBAC,
81801 + GR_RBAC_STR,
81802 + GR_STR_RBAC,
81803 + GR_RBAC_MODE2,
81804 + GR_RBAC_MODE3,
81805 + GR_FILENAME,
81806 + GR_SYSCTL_HIDDEN,
81807 + GR_NOARGS,
81808 + GR_ONE_INT,
81809 + GR_ONE_INT_TWO_STR,
81810 + GR_ONE_STR,
81811 + GR_STR_INT,
81812 + GR_TWO_STR_INT,
81813 + GR_TWO_INT,
81814 + GR_TWO_U64,
81815 + GR_THREE_INT,
81816 + GR_FIVE_INT_TWO_STR,
81817 + GR_TWO_STR,
81818 + GR_THREE_STR,
81819 + GR_FOUR_STR,
81820 + GR_STR_FILENAME,
81821 + GR_FILENAME_STR,
81822 + GR_FILENAME_TWO_INT,
81823 + GR_FILENAME_TWO_INT_STR,
81824 + GR_TEXTREL,
81825 + GR_PTRACE,
81826 + GR_RESOURCE,
81827 + GR_CAP,
81828 + GR_SIG,
81829 + GR_SIG2,
81830 + GR_CRASH1,
81831 + GR_CRASH2,
81832 + GR_PSACCT,
81833 + GR_RWXMAP,
81834 + GR_RWXMAPVMA
81835 +};
81836 +
81837 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
81838 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
81839 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
81840 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
81841 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
81842 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
81843 +#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)
81844 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
81845 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
81846 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
81847 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
81848 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
81849 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
81850 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
81851 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
81852 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
81853 +#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)
81854 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
81855 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
81856 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
81857 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
81858 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
81859 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
81860 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
81861 +#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)
81862 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
81863 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
81864 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
81865 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
81866 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
81867 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
81868 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
81869 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
81870 +#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)
81871 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
81872 +#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
81873 +
81874 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
81875 +
81876 +#endif
81877 +
81878 +#endif
81879 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
81880 new file mode 100644
81881 index 0000000..b02ba9d
81882 --- /dev/null
81883 +++ b/include/linux/grmsg.h
81884 @@ -0,0 +1,117 @@
81885 +#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"
81886 +#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"
81887 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
81888 +#define GR_STOPMOD_MSG "denied modification of module state by "
81889 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
81890 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
81891 +#define GR_IOPERM_MSG "denied use of ioperm() by "
81892 +#define GR_IOPL_MSG "denied use of iopl() by "
81893 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
81894 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
81895 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
81896 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
81897 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
81898 +#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"
81899 +#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"
81900 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
81901 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
81902 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
81903 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
81904 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
81905 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
81906 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
81907 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
81908 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
81909 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
81910 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
81911 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
81912 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
81913 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
81914 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
81915 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
81916 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
81917 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
81918 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
81919 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
81920 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
81921 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
81922 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
81923 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
81924 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
81925 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
81926 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
81927 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
81928 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
81929 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
81930 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
81931 +#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
81932 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
81933 +#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
81934 +#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
81935 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
81936 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
81937 +#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"
81938 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
81939 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
81940 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
81941 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
81942 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
81943 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
81944 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
81945 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
81946 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
81947 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
81948 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
81949 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
81950 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
81951 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
81952 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
81953 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
81954 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
81955 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
81956 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
81957 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
81958 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
81959 +#define GR_NICE_CHROOT_MSG "denied priority change by "
81960 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
81961 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
81962 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
81963 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
81964 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
81965 +#define GR_TIME_MSG "time set by "
81966 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
81967 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
81968 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
81969 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
81970 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
81971 +#define GR_BIND_MSG "denied bind() by "
81972 +#define GR_CONNECT_MSG "denied connect() by "
81973 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
81974 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
81975 +#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"
81976 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
81977 +#define GR_CAP_ACL_MSG "use of %s denied for "
81978 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
81979 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
81980 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
81981 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
81982 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
81983 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
81984 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
81985 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
81986 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
81987 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
81988 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
81989 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
81990 +#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
81991 +#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
81992 +#define GR_VM86_MSG "denied use of vm86 by "
81993 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
81994 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
81995 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
81996 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
81997 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
81998 +#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 "
81999 +#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 "
82000 +#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
82001 +#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
82002 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
82003 new file mode 100644
82004 index 0000000..c3b0738
82005 --- /dev/null
82006 +++ b/include/linux/grsecurity.h
82007 @@ -0,0 +1,244 @@
82008 +#ifndef GR_SECURITY_H
82009 +#define GR_SECURITY_H
82010 +#include <linux/fs.h>
82011 +#include <linux/fs_struct.h>
82012 +#include <linux/binfmts.h>
82013 +#include <linux/gracl.h>
82014 +
82015 +/* notify of brain-dead configs */
82016 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82017 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
82018 +#endif
82019 +#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
82020 +#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
82021 +#endif
82022 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
82023 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
82024 +#endif
82025 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
82026 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
82027 +#endif
82028 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
82029 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
82030 +#endif
82031 +
82032 +int gr_handle_new_usb(void);
82033 +
82034 +void gr_handle_brute_attach(int dumpable);
82035 +void gr_handle_brute_check(void);
82036 +void gr_handle_kernel_exploit(void);
82037 +
82038 +char gr_roletype_to_char(void);
82039 +
82040 +int gr_proc_is_restricted(void);
82041 +
82042 +int gr_acl_enable_at_secure(void);
82043 +
82044 +int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
82045 +int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
82046 +
82047 +int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
82048 +
82049 +void gr_del_task_from_ip_table(struct task_struct *p);
82050 +
82051 +int gr_pid_is_chrooted(struct task_struct *p);
82052 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
82053 +int gr_handle_chroot_nice(void);
82054 +int gr_handle_chroot_sysctl(const int op);
82055 +int gr_handle_chroot_setpriority(struct task_struct *p,
82056 + const int niceval);
82057 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
82058 +int gr_chroot_fhandle(void);
82059 +int gr_handle_chroot_chroot(const struct dentry *dentry,
82060 + const struct vfsmount *mnt);
82061 +void gr_handle_chroot_chdir(const struct path *path);
82062 +int gr_handle_chroot_chmod(const struct dentry *dentry,
82063 + const struct vfsmount *mnt, const int mode);
82064 +int gr_handle_chroot_mknod(const struct dentry *dentry,
82065 + const struct vfsmount *mnt, const int mode);
82066 +int gr_handle_chroot_mount(const struct dentry *dentry,
82067 + const struct vfsmount *mnt,
82068 + const char *dev_name);
82069 +int gr_handle_chroot_pivot(void);
82070 +int gr_handle_chroot_unix(const pid_t pid);
82071 +
82072 +int gr_handle_rawio(const struct inode *inode);
82073 +
82074 +void gr_handle_ioperm(void);
82075 +void gr_handle_iopl(void);
82076 +void gr_handle_msr_write(void);
82077 +
82078 +umode_t gr_acl_umask(void);
82079 +
82080 +int gr_tpe_allow(const struct file *file);
82081 +
82082 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
82083 +void gr_clear_chroot_entries(struct task_struct *task);
82084 +
82085 +void gr_log_forkfail(const int retval);
82086 +void gr_log_timechange(void);
82087 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
82088 +void gr_log_chdir(const struct dentry *dentry,
82089 + const struct vfsmount *mnt);
82090 +void gr_log_chroot_exec(const struct dentry *dentry,
82091 + const struct vfsmount *mnt);
82092 +void gr_log_remount(const char *devname, const int retval);
82093 +void gr_log_unmount(const char *devname, const int retval);
82094 +void gr_log_mount(const char *from, struct path *to, const int retval);
82095 +void gr_log_textrel(struct vm_area_struct *vma);
82096 +void gr_log_ptgnustack(struct file *file);
82097 +void gr_log_rwxmmap(struct file *file);
82098 +void gr_log_rwxmprotect(struct vm_area_struct *vma);
82099 +
82100 +int gr_handle_follow_link(const struct inode *parent,
82101 + const struct inode *inode,
82102 + const struct dentry *dentry,
82103 + const struct vfsmount *mnt);
82104 +int gr_handle_fifo(const struct dentry *dentry,
82105 + const struct vfsmount *mnt,
82106 + const struct dentry *dir, const int flag,
82107 + const int acc_mode);
82108 +int gr_handle_hardlink(const struct dentry *dentry,
82109 + const struct vfsmount *mnt,
82110 + struct inode *inode,
82111 + const int mode, const struct filename *to);
82112 +
82113 +int gr_is_capable(const int cap);
82114 +int gr_is_capable_nolog(const int cap);
82115 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82116 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82117 +
82118 +void gr_copy_label(struct task_struct *tsk);
82119 +void gr_handle_crash(struct task_struct *task, const int sig);
82120 +int gr_handle_signal(const struct task_struct *p, const int sig);
82121 +int gr_check_crash_uid(const kuid_t uid);
82122 +int gr_check_protected_task(const struct task_struct *task);
82123 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82124 +int gr_acl_handle_mmap(const struct file *file,
82125 + const unsigned long prot);
82126 +int gr_acl_handle_mprotect(const struct file *file,
82127 + const unsigned long prot);
82128 +int gr_check_hidden_task(const struct task_struct *tsk);
82129 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82130 + const struct vfsmount *mnt);
82131 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
82132 + const struct vfsmount *mnt);
82133 +__u32 gr_acl_handle_access(const struct dentry *dentry,
82134 + const struct vfsmount *mnt, const int fmode);
82135 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82136 + const struct vfsmount *mnt, umode_t *mode);
82137 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
82138 + const struct vfsmount *mnt);
82139 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82140 + const struct vfsmount *mnt);
82141 +__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82142 + const struct vfsmount *mnt);
82143 +int gr_handle_ptrace(struct task_struct *task, const long request);
82144 +int gr_handle_proc_ptrace(struct task_struct *task);
82145 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
82146 + const struct vfsmount *mnt);
82147 +int gr_check_crash_exec(const struct file *filp);
82148 +int gr_acl_is_enabled(void);
82149 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82150 + const kgid_t gid);
82151 +int gr_set_proc_label(const struct dentry *dentry,
82152 + const struct vfsmount *mnt,
82153 + const int unsafe_flags);
82154 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82155 + const struct vfsmount *mnt);
82156 +__u32 gr_acl_handle_open(const struct dentry *dentry,
82157 + const struct vfsmount *mnt, int acc_mode);
82158 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
82159 + const struct dentry *p_dentry,
82160 + const struct vfsmount *p_mnt,
82161 + int open_flags, int acc_mode, const int imode);
82162 +void gr_handle_create(const struct dentry *dentry,
82163 + const struct vfsmount *mnt);
82164 +void gr_handle_proc_create(const struct dentry *dentry,
82165 + const struct inode *inode);
82166 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
82167 + const struct dentry *parent_dentry,
82168 + const struct vfsmount *parent_mnt,
82169 + const int mode);
82170 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
82171 + const struct dentry *parent_dentry,
82172 + const struct vfsmount *parent_mnt);
82173 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
82174 + const struct vfsmount *mnt);
82175 +void gr_handle_delete(const ino_t ino, const dev_t dev);
82176 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
82177 + const struct vfsmount *mnt);
82178 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
82179 + const struct dentry *parent_dentry,
82180 + const struct vfsmount *parent_mnt,
82181 + const struct filename *from);
82182 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
82183 + const struct dentry *parent_dentry,
82184 + const struct vfsmount *parent_mnt,
82185 + const struct dentry *old_dentry,
82186 + const struct vfsmount *old_mnt, const struct filename *to);
82187 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
82188 +int gr_acl_handle_rename(struct dentry *new_dentry,
82189 + struct dentry *parent_dentry,
82190 + const struct vfsmount *parent_mnt,
82191 + struct dentry *old_dentry,
82192 + struct inode *old_parent_inode,
82193 + struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
82194 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
82195 + struct dentry *old_dentry,
82196 + struct dentry *new_dentry,
82197 + struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82198 +__u32 gr_check_link(const struct dentry *new_dentry,
82199 + const struct dentry *parent_dentry,
82200 + const struct vfsmount *parent_mnt,
82201 + const struct dentry *old_dentry,
82202 + const struct vfsmount *old_mnt);
82203 +int gr_acl_handle_filldir(const struct file *file, const char *name,
82204 + const unsigned int namelen, const ino_t ino);
82205 +
82206 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
82207 + const struct vfsmount *mnt);
82208 +void gr_acl_handle_exit(void);
82209 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
82210 +int gr_acl_handle_procpidmem(const struct task_struct *task);
82211 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82212 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82213 +void gr_audit_ptrace(struct task_struct *task);
82214 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82215 +void gr_put_exec_file(struct task_struct *task);
82216 +
82217 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82218 +
82219 +#ifdef CONFIG_GRKERNSEC_RESLOG
82220 +extern void gr_log_resource(const struct task_struct *task, const int res,
82221 + const unsigned long wanted, const int gt);
82222 +#else
82223 +static inline void gr_log_resource(const struct task_struct *task, const int res,
82224 + const unsigned long wanted, const int gt)
82225 +{
82226 +}
82227 +#endif
82228 +
82229 +#ifdef CONFIG_GRKERNSEC
82230 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82231 +void gr_handle_vm86(void);
82232 +void gr_handle_mem_readwrite(u64 from, u64 to);
82233 +
82234 +void gr_log_badprocpid(const char *entry);
82235 +
82236 +extern int grsec_enable_dmesg;
82237 +extern int grsec_disable_privio;
82238 +
82239 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82240 +extern kgid_t grsec_proc_gid;
82241 +#endif
82242 +
82243 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82244 +extern int grsec_enable_chroot_findtask;
82245 +#endif
82246 +#ifdef CONFIG_GRKERNSEC_SETXID
82247 +extern int grsec_enable_setxid;
82248 +#endif
82249 +#endif
82250 +
82251 +#endif
82252 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82253 new file mode 100644
82254 index 0000000..e7ffaaf
82255 --- /dev/null
82256 +++ b/include/linux/grsock.h
82257 @@ -0,0 +1,19 @@
82258 +#ifndef __GRSOCK_H
82259 +#define __GRSOCK_H
82260 +
82261 +extern void gr_attach_curr_ip(const struct sock *sk);
82262 +extern int gr_handle_sock_all(const int family, const int type,
82263 + const int protocol);
82264 +extern int gr_handle_sock_server(const struct sockaddr *sck);
82265 +extern int gr_handle_sock_server_other(const struct sock *sck);
82266 +extern int gr_handle_sock_client(const struct sockaddr *sck);
82267 +extern int gr_search_connect(struct socket * sock,
82268 + struct sockaddr_in * addr);
82269 +extern int gr_search_bind(struct socket * sock,
82270 + struct sockaddr_in * addr);
82271 +extern int gr_search_listen(struct socket * sock);
82272 +extern int gr_search_accept(struct socket * sock);
82273 +extern int gr_search_socket(const int domain, const int type,
82274 + const int protocol);
82275 +
82276 +#endif
82277 diff --git a/include/linux/hash.h b/include/linux/hash.h
82278 index d0494c3..69b7715 100644
82279 --- a/include/linux/hash.h
82280 +++ b/include/linux/hash.h
82281 @@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82282 struct fast_hash_ops {
82283 u32 (*hash)(const void *data, u32 len, u32 seed);
82284 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82285 -};
82286 +} __no_const;
82287
82288 /**
82289 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82290 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82291 index 9286a46..373f27f 100644
82292 --- a/include/linux/highmem.h
82293 +++ b/include/linux/highmem.h
82294 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82295 kunmap_atomic(kaddr);
82296 }
82297
82298 +static inline void sanitize_highpage(struct page *page)
82299 +{
82300 + void *kaddr;
82301 + unsigned long flags;
82302 +
82303 + local_irq_save(flags);
82304 + kaddr = kmap_atomic(page);
82305 + clear_page(kaddr);
82306 + kunmap_atomic(kaddr);
82307 + local_irq_restore(flags);
82308 +}
82309 +
82310 static inline void zero_user_segments(struct page *page,
82311 unsigned start1, unsigned end1,
82312 unsigned start2, unsigned end2)
82313 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82314 index 1c7b89a..7dda400 100644
82315 --- a/include/linux/hwmon-sysfs.h
82316 +++ b/include/linux/hwmon-sysfs.h
82317 @@ -25,7 +25,8 @@
82318 struct sensor_device_attribute{
82319 struct device_attribute dev_attr;
82320 int index;
82321 -};
82322 +} __do_const;
82323 +typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82324 #define to_sensor_dev_attr(_dev_attr) \
82325 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82326
82327 @@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82328 struct device_attribute dev_attr;
82329 u8 index;
82330 u8 nr;
82331 -};
82332 +} __do_const;
82333 +typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82334 #define to_sensor_dev_attr_2(_dev_attr) \
82335 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82336
82337 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82338 index b556e0a..c10a515 100644
82339 --- a/include/linux/i2c.h
82340 +++ b/include/linux/i2c.h
82341 @@ -378,6 +378,7 @@ struct i2c_algorithm {
82342 /* To determine what the adapter supports */
82343 u32 (*functionality) (struct i2c_adapter *);
82344 };
82345 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82346
82347 /**
82348 * struct i2c_bus_recovery_info - I2C bus recovery information
82349 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82350 index d23c3c2..eb63c81 100644
82351 --- a/include/linux/i2o.h
82352 +++ b/include/linux/i2o.h
82353 @@ -565,7 +565,7 @@ struct i2o_controller {
82354 struct i2o_device *exec; /* Executive */
82355 #if BITS_PER_LONG == 64
82356 spinlock_t context_list_lock; /* lock for context_list */
82357 - atomic_t context_list_counter; /* needed for unique contexts */
82358 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82359 struct list_head context_list; /* list of context id's
82360 and pointers */
82361 #endif
82362 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82363 index aff7ad8..3942bbd 100644
82364 --- a/include/linux/if_pppox.h
82365 +++ b/include/linux/if_pppox.h
82366 @@ -76,7 +76,7 @@ struct pppox_proto {
82367 int (*ioctl)(struct socket *sock, unsigned int cmd,
82368 unsigned long arg);
82369 struct module *owner;
82370 -};
82371 +} __do_const;
82372
82373 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82374 extern void unregister_pppox_proto(int proto_num);
82375 diff --git a/include/linux/init.h b/include/linux/init.h
82376 index 2df8e8d..3e1280d 100644
82377 --- a/include/linux/init.h
82378 +++ b/include/linux/init.h
82379 @@ -37,9 +37,17 @@
82380 * section.
82381 */
82382
82383 +#define add_init_latent_entropy __latent_entropy
82384 +
82385 +#ifdef CONFIG_MEMORY_HOTPLUG
82386 +#define add_meminit_latent_entropy
82387 +#else
82388 +#define add_meminit_latent_entropy __latent_entropy
82389 +#endif
82390 +
82391 /* These are for everybody (although not all archs will actually
82392 discard it in modules) */
82393 -#define __init __section(.init.text) __cold notrace
82394 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82395 #define __initdata __section(.init.data)
82396 #define __initconst __constsection(.init.rodata)
82397 #define __exitdata __section(.exit.data)
82398 @@ -100,7 +108,7 @@
82399 #define __cpuexitconst
82400
82401 /* Used for MEMORY_HOTPLUG */
82402 -#define __meminit __section(.meminit.text) __cold notrace
82403 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82404 #define __meminitdata __section(.meminit.data)
82405 #define __meminitconst __constsection(.meminit.rodata)
82406 #define __memexit __section(.memexit.text) __exitused __cold notrace
82407 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82408 index 77fc43f..73caf92 100644
82409 --- a/include/linux/init_task.h
82410 +++ b/include/linux/init_task.h
82411 @@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82412
82413 #define INIT_TASK_COMM "swapper"
82414
82415 +#ifdef CONFIG_X86
82416 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82417 +#else
82418 +#define INIT_TASK_THREAD_INFO
82419 +#endif
82420 +
82421 #ifdef CONFIG_RT_MUTEXES
82422 # define INIT_RT_MUTEXES(tsk) \
82423 .pi_waiters = RB_ROOT, \
82424 @@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82425 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82426 .comm = INIT_TASK_COMM, \
82427 .thread = INIT_THREAD, \
82428 + INIT_TASK_THREAD_INFO \
82429 .fs = &init_fs, \
82430 .files = &init_files, \
82431 .signal = &init_signals, \
82432 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82433 index 69517a2..6b12d37 100644
82434 --- a/include/linux/interrupt.h
82435 +++ b/include/linux/interrupt.h
82436 @@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82437
82438 struct softirq_action
82439 {
82440 - void (*action)(struct softirq_action *);
82441 -};
82442 + void (*action)(void);
82443 +} __no_const;
82444
82445 asmlinkage void do_softirq(void);
82446 asmlinkage void __do_softirq(void);
82447 @@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82448 }
82449 #endif
82450
82451 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82452 +extern void open_softirq(int nr, void (*action)(void));
82453 extern void softirq_init(void);
82454 extern void __raise_softirq_irqoff(unsigned int nr);
82455
82456 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82457 index e6a7c9f..5804745 100644
82458 --- a/include/linux/iommu.h
82459 +++ b/include/linux/iommu.h
82460 @@ -133,7 +133,7 @@ struct iommu_ops {
82461 u32 (*domain_get_windows)(struct iommu_domain *domain);
82462
82463 unsigned long pgsize_bitmap;
82464 -};
82465 +} __do_const;
82466
82467 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82468 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82469 diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82470 index 2c525022..345b106 100644
82471 --- a/include/linux/ioport.h
82472 +++ b/include/linux/ioport.h
82473 @@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82474 int adjust_resource(struct resource *res, resource_size_t start,
82475 resource_size_t size);
82476 resource_size_t resource_alignment(struct resource *res);
82477 -static inline resource_size_t resource_size(const struct resource *res)
82478 +static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82479 {
82480 return res->end - res->start + 1;
82481 }
82482 diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82483 index 35e7eca..6afb7ad 100644
82484 --- a/include/linux/ipc_namespace.h
82485 +++ b/include/linux/ipc_namespace.h
82486 @@ -69,7 +69,7 @@ struct ipc_namespace {
82487 struct user_namespace *user_ns;
82488
82489 unsigned int proc_inum;
82490 -};
82491 +} __randomize_layout;
82492
82493 extern struct ipc_namespace init_ipc_ns;
82494 extern atomic_t nr_ipc_ns;
82495 diff --git a/include/linux/irq.h b/include/linux/irq.h
82496 index 03f48d9..e86af0c 100644
82497 --- a/include/linux/irq.h
82498 +++ b/include/linux/irq.h
82499 @@ -352,7 +352,8 @@ struct irq_chip {
82500 void (*irq_release_resources)(struct irq_data *data);
82501
82502 unsigned long flags;
82503 -};
82504 +} __do_const;
82505 +typedef struct irq_chip __no_const irq_chip_no_const;
82506
82507 /*
82508 * irq_chip specific flags
82509 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82510 index 13eed92..3261c86 100644
82511 --- a/include/linux/irqchip/arm-gic.h
82512 +++ b/include/linux/irqchip/arm-gic.h
82513 @@ -91,9 +91,11 @@
82514
82515 #ifndef __ASSEMBLY__
82516
82517 +#include <linux/irq.h>
82518 +
82519 struct device_node;
82520
82521 -extern struct irq_chip gic_arch_extn;
82522 +extern irq_chip_no_const gic_arch_extn;
82523
82524 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82525 u32 offset, struct device_node *);
82526 diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82527 index c367cbd..c9b79e6 100644
82528 --- a/include/linux/jiffies.h
82529 +++ b/include/linux/jiffies.h
82530 @@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82531 /*
82532 * Convert various time units to each other:
82533 */
82534 -extern unsigned int jiffies_to_msecs(const unsigned long j);
82535 -extern unsigned int jiffies_to_usecs(const unsigned long j);
82536 +extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82537 +extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82538
82539 -static inline u64 jiffies_to_nsecs(const unsigned long j)
82540 +static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82541 {
82542 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82543 }
82544
82545 -extern unsigned long msecs_to_jiffies(const unsigned int m);
82546 -extern unsigned long usecs_to_jiffies(const unsigned int u);
82547 +extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82548 +extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82549 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82550 extern void jiffies_to_timespec(const unsigned long jiffies,
82551 - struct timespec *value);
82552 -extern unsigned long timeval_to_jiffies(const struct timeval *value);
82553 + struct timespec *value) __intentional_overflow(-1);
82554 +extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82555 extern void jiffies_to_timeval(const unsigned long jiffies,
82556 struct timeval *value);
82557
82558 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82559 index 6883e19..e854fcb 100644
82560 --- a/include/linux/kallsyms.h
82561 +++ b/include/linux/kallsyms.h
82562 @@ -15,7 +15,8 @@
82563
82564 struct module;
82565
82566 -#ifdef CONFIG_KALLSYMS
82567 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82568 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82569 /* Lookup the address for a symbol. Returns 0 if not found. */
82570 unsigned long kallsyms_lookup_name(const char *name);
82571
82572 @@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82573 /* Stupid that this does nothing, but I didn't create this mess. */
82574 #define __print_symbol(fmt, addr)
82575 #endif /*CONFIG_KALLSYMS*/
82576 +#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82577 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82578 +extern unsigned long kallsyms_lookup_name(const char *name);
82579 +extern void __print_symbol(const char *fmt, unsigned long address);
82580 +extern int sprint_backtrace(char *buffer, unsigned long address);
82581 +extern int sprint_symbol(char *buffer, unsigned long address);
82582 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82583 +const char *kallsyms_lookup(unsigned long addr,
82584 + unsigned long *symbolsize,
82585 + unsigned long *offset,
82586 + char **modname, char *namebuf);
82587 +extern int kallsyms_lookup_size_offset(unsigned long addr,
82588 + unsigned long *symbolsize,
82589 + unsigned long *offset);
82590 +#endif
82591
82592 /* This macro allows us to keep printk typechecking */
82593 static __printf(1, 2)
82594 diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82595 index ff9f1d3..6712be5 100644
82596 --- a/include/linux/key-type.h
82597 +++ b/include/linux/key-type.h
82598 @@ -152,7 +152,7 @@ struct key_type {
82599 /* internal fields */
82600 struct list_head link; /* link in types list */
82601 struct lock_class_key lock_class; /* key->sem lock class */
82602 -};
82603 +} __do_const;
82604
82605 extern struct key_type key_type_keyring;
82606
82607 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82608 index e465bb1..19f605f 100644
82609 --- a/include/linux/kgdb.h
82610 +++ b/include/linux/kgdb.h
82611 @@ -52,7 +52,7 @@ extern int kgdb_connected;
82612 extern int kgdb_io_module_registered;
82613
82614 extern atomic_t kgdb_setting_breakpoint;
82615 -extern atomic_t kgdb_cpu_doing_single_step;
82616 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82617
82618 extern struct task_struct *kgdb_usethread;
82619 extern struct task_struct *kgdb_contthread;
82620 @@ -254,7 +254,7 @@ struct kgdb_arch {
82621 void (*correct_hw_break)(void);
82622
82623 void (*enable_nmi)(bool on);
82624 -};
82625 +} __do_const;
82626
82627 /**
82628 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82629 @@ -279,7 +279,7 @@ struct kgdb_io {
82630 void (*pre_exception) (void);
82631 void (*post_exception) (void);
82632 int is_console;
82633 -};
82634 +} __do_const;
82635
82636 extern struct kgdb_arch arch_kgdb_ops;
82637
82638 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82639 index 0555cc6..40116ce 100644
82640 --- a/include/linux/kmod.h
82641 +++ b/include/linux/kmod.h
82642 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82643 * usually useless though. */
82644 extern __printf(2, 3)
82645 int __request_module(bool wait, const char *name, ...);
82646 +extern __printf(3, 4)
82647 +int ___request_module(bool wait, char *param_name, const char *name, ...);
82648 #define request_module(mod...) __request_module(true, mod)
82649 #define request_module_nowait(mod...) __request_module(false, mod)
82650 #define try_then_request_module(x, mod...) \
82651 @@ -57,6 +59,9 @@ struct subprocess_info {
82652 struct work_struct work;
82653 struct completion *complete;
82654 char *path;
82655 +#ifdef CONFIG_GRKERNSEC
82656 + char *origpath;
82657 +#endif
82658 char **argv;
82659 char **envp;
82660 int wait;
82661 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82662 index 2d61b90..a1d0a13 100644
82663 --- a/include/linux/kobject.h
82664 +++ b/include/linux/kobject.h
82665 @@ -118,7 +118,7 @@ struct kobj_type {
82666 struct attribute **default_attrs;
82667 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82668 const void *(*namespace)(struct kobject *kobj);
82669 -};
82670 +} __do_const;
82671
82672 struct kobj_uevent_env {
82673 char *argv[3];
82674 @@ -142,6 +142,7 @@ struct kobj_attribute {
82675 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82676 const char *buf, size_t count);
82677 };
82678 +typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82679
82680 extern const struct sysfs_ops kobj_sysfs_ops;
82681
82682 @@ -169,7 +170,7 @@ struct kset {
82683 spinlock_t list_lock;
82684 struct kobject kobj;
82685 const struct kset_uevent_ops *uevent_ops;
82686 -};
82687 +} __randomize_layout;
82688
82689 extern void kset_init(struct kset *kset);
82690 extern int __must_check kset_register(struct kset *kset);
82691 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82692 index df32d25..fb52e27 100644
82693 --- a/include/linux/kobject_ns.h
82694 +++ b/include/linux/kobject_ns.h
82695 @@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82696 const void *(*netlink_ns)(struct sock *sk);
82697 const void *(*initial_ns)(void);
82698 void (*drop_ns)(void *);
82699 -};
82700 +} __do_const;
82701
82702 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82703 int kobj_ns_type_registered(enum kobj_ns_type type);
82704 diff --git a/include/linux/kref.h b/include/linux/kref.h
82705 index 484604d..0f6c5b6 100644
82706 --- a/include/linux/kref.h
82707 +++ b/include/linux/kref.h
82708 @@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82709 static inline int kref_sub(struct kref *kref, unsigned int count,
82710 void (*release)(struct kref *kref))
82711 {
82712 - WARN_ON(release == NULL);
82713 + BUG_ON(release == NULL);
82714
82715 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82716 release(kref);
82717 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82718 index a6059bd..8126d5c 100644
82719 --- a/include/linux/kvm_host.h
82720 +++ b/include/linux/kvm_host.h
82721 @@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82722 {
82723 }
82724 #endif
82725 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82726 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82727 struct module *module);
82728 void kvm_exit(void);
82729
82730 @@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82731 struct kvm_guest_debug *dbg);
82732 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82733
82734 -int kvm_arch_init(void *opaque);
82735 +int kvm_arch_init(const void *opaque);
82736 void kvm_arch_exit(void);
82737
82738 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82739 diff --git a/include/linux/libata.h b/include/linux/libata.h
82740 index bd5fefe..2a8a8d2 100644
82741 --- a/include/linux/libata.h
82742 +++ b/include/linux/libata.h
82743 @@ -976,7 +976,7 @@ struct ata_port_operations {
82744 * fields must be pointers.
82745 */
82746 const struct ata_port_operations *inherits;
82747 -};
82748 +} __do_const;
82749
82750 struct ata_port_info {
82751 unsigned long flags;
82752 diff --git a/include/linux/linkage.h b/include/linux/linkage.h
82753 index a6a42dd..6c5ebce 100644
82754 --- a/include/linux/linkage.h
82755 +++ b/include/linux/linkage.h
82756 @@ -36,6 +36,7 @@
82757 #endif
82758
82759 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
82760 +#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
82761 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
82762
82763 /*
82764 diff --git a/include/linux/list.h b/include/linux/list.h
82765 index f33f831..1ffe5e2 100644
82766 --- a/include/linux/list.h
82767 +++ b/include/linux/list.h
82768 @@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
82769 extern void list_del(struct list_head *entry);
82770 #endif
82771
82772 +extern void __pax_list_add(struct list_head *new,
82773 + struct list_head *prev,
82774 + struct list_head *next);
82775 +static inline void pax_list_add(struct list_head *new, struct list_head *head)
82776 +{
82777 + __pax_list_add(new, head, head->next);
82778 +}
82779 +static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
82780 +{
82781 + __pax_list_add(new, head->prev, head);
82782 +}
82783 +extern void pax_list_del(struct list_head *entry);
82784 +
82785 /**
82786 * list_replace - replace old entry by new one
82787 * @old : the element to be replaced
82788 @@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
82789 INIT_LIST_HEAD(entry);
82790 }
82791
82792 +extern void pax_list_del_init(struct list_head *entry);
82793 +
82794 /**
82795 * list_move - delete from one list and add as another's head
82796 * @list: the entry to move
82797 diff --git a/include/linux/lockref.h b/include/linux/lockref.h
82798 index 4bfde0e..d6e2e09 100644
82799 --- a/include/linux/lockref.h
82800 +++ b/include/linux/lockref.h
82801 @@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
82802 return ((int)l->count < 0);
82803 }
82804
82805 +static inline unsigned int __lockref_read(struct lockref *lockref)
82806 +{
82807 + return lockref->count;
82808 +}
82809 +
82810 +static inline void __lockref_set(struct lockref *lockref, unsigned int count)
82811 +{
82812 + lockref->count = count;
82813 +}
82814 +
82815 +static inline void __lockref_inc(struct lockref *lockref)
82816 +{
82817 +
82818 +#ifdef CONFIG_PAX_REFCOUNT
82819 + atomic_inc((atomic_t *)&lockref->count);
82820 +#else
82821 + lockref->count++;
82822 +#endif
82823 +
82824 +}
82825 +
82826 +static inline void __lockref_dec(struct lockref *lockref)
82827 +{
82828 +
82829 +#ifdef CONFIG_PAX_REFCOUNT
82830 + atomic_dec((atomic_t *)&lockref->count);
82831 +#else
82832 + lockref->count--;
82833 +#endif
82834 +
82835 +}
82836 +
82837 #endif /* __LINUX_LOCKREF_H */
82838 diff --git a/include/linux/math64.h b/include/linux/math64.h
82839 index c45c089..298841c 100644
82840 --- a/include/linux/math64.h
82841 +++ b/include/linux/math64.h
82842 @@ -15,7 +15,7 @@
82843 * This is commonly provided by 32bit archs to provide an optimized 64bit
82844 * divide.
82845 */
82846 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82847 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82848 {
82849 *remainder = dividend % divisor;
82850 return dividend / divisor;
82851 @@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
82852 /**
82853 * div64_u64 - unsigned 64bit divide with 64bit divisor
82854 */
82855 -static inline u64 div64_u64(u64 dividend, u64 divisor)
82856 +static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
82857 {
82858 return dividend / divisor;
82859 }
82860 @@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
82861 #define div64_ul(x, y) div_u64((x), (y))
82862
82863 #ifndef div_u64_rem
82864 -static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82865 +static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82866 {
82867 *remainder = do_div(dividend, divisor);
82868 return dividend;
82869 @@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
82870 #endif
82871
82872 #ifndef div64_u64
82873 -extern u64 div64_u64(u64 dividend, u64 divisor);
82874 +extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
82875 #endif
82876
82877 #ifndef div64_s64
82878 @@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
82879 * divide.
82880 */
82881 #ifndef div_u64
82882 -static inline u64 div_u64(u64 dividend, u32 divisor)
82883 +static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
82884 {
82885 u32 remainder;
82886 return div_u64_rem(dividend, divisor, &remainder);
82887 diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
82888 index 3d385c8..deacb6a 100644
82889 --- a/include/linux/mempolicy.h
82890 +++ b/include/linux/mempolicy.h
82891 @@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
82892 }
82893
82894 #define vma_policy(vma) ((vma)->vm_policy)
82895 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82896 +{
82897 + vma->vm_policy = pol;
82898 +}
82899
82900 static inline void mpol_get(struct mempolicy *pol)
82901 {
82902 @@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
82903 }
82904
82905 #define vma_policy(vma) NULL
82906 +static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82907 +{
82908 +}
82909
82910 static inline int
82911 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
82912 diff --git a/include/linux/mm.h b/include/linux/mm.h
82913 index 5ab2da9..5f0b3df 100644
82914 --- a/include/linux/mm.h
82915 +++ b/include/linux/mm.h
82916 @@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
82917 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
82918 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
82919 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
82920 +
82921 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
82922 +#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
82923 +#endif
82924 +
82925 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
82926
82927 #ifdef CONFIG_MEM_SOFT_DIRTY
82928 @@ -238,8 +243,8 @@ struct vm_operations_struct {
82929 /* called by access_process_vm when get_user_pages() fails, typically
82930 * for use by special VMAs that can switch between memory and hardware
82931 */
82932 - int (*access)(struct vm_area_struct *vma, unsigned long addr,
82933 - void *buf, int len, int write);
82934 + ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
82935 + void *buf, size_t len, int write);
82936
82937 /* Called by the /proc/PID/maps code to ask the vma whether it
82938 * has a special name. Returning non-NULL will also cause this
82939 @@ -275,6 +280,7 @@ struct vm_operations_struct {
82940 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
82941 unsigned long size, pgoff_t pgoff);
82942 };
82943 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
82944
82945 struct mmu_gather;
82946 struct inode;
82947 @@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
82948 unsigned long *pfn);
82949 int follow_phys(struct vm_area_struct *vma, unsigned long address,
82950 unsigned int flags, unsigned long *prot, resource_size_t *phys);
82951 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82952 - void *buf, int len, int write);
82953 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82954 + void *buf, size_t len, int write);
82955
82956 static inline void unmap_shared_mapping_range(struct address_space *mapping,
82957 loff_t const holebegin, loff_t const holelen)
82958 @@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
82959 }
82960 #endif
82961
82962 -extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
82963 -extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
82964 - void *buf, int len, int write);
82965 +extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
82966 +extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
82967 + void *buf, size_t len, int write);
82968
82969 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
82970 unsigned long start, unsigned long nr_pages,
82971 @@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
82972 int clear_page_dirty_for_io(struct page *page);
82973 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
82974
82975 -/* Is the vma a continuation of the stack vma above it? */
82976 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
82977 -{
82978 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
82979 -}
82980 -
82981 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
82982 - unsigned long addr)
82983 -{
82984 - return (vma->vm_flags & VM_GROWSDOWN) &&
82985 - (vma->vm_start == addr) &&
82986 - !vma_growsdown(vma->vm_prev, addr);
82987 -}
82988 -
82989 -/* Is the vma a continuation of the stack vma below it? */
82990 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
82991 -{
82992 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
82993 -}
82994 -
82995 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
82996 - unsigned long addr)
82997 -{
82998 - return (vma->vm_flags & VM_GROWSUP) &&
82999 - (vma->vm_end == addr) &&
83000 - !vma_growsup(vma->vm_next, addr);
83001 -}
83002 -
83003 extern struct task_struct *task_of_stack(struct task_struct *task,
83004 struct vm_area_struct *vma, bool in_group);
83005
83006 @@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
83007 {
83008 return 0;
83009 }
83010 +
83011 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
83012 + unsigned long address)
83013 +{
83014 + return 0;
83015 +}
83016 #else
83017 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83018 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
83019 #endif
83020
83021 #ifdef __PAGETABLE_PMD_FOLDED
83022 @@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
83023 {
83024 return 0;
83025 }
83026 +
83027 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
83028 + unsigned long address)
83029 +{
83030 + return 0;
83031 +}
83032 #else
83033 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
83034 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
83035 #endif
83036
83037 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
83038 @@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
83039 NULL: pud_offset(pgd, address);
83040 }
83041
83042 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
83043 +{
83044 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
83045 + NULL: pud_offset(pgd, address);
83046 +}
83047 +
83048 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
83049 {
83050 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
83051 NULL: pmd_offset(pud, address);
83052 }
83053 +
83054 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
83055 +{
83056 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
83057 + NULL: pmd_offset(pud, address);
83058 +}
83059 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
83060
83061 #if USE_SPLIT_PTE_PTLOCKS
83062 @@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
83063 bool *need_rmap_locks);
83064 extern void exit_mmap(struct mm_struct *);
83065
83066 +#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
83067 +extern void gr_learn_resource(const struct task_struct *task, const int res,
83068 + const unsigned long wanted, const int gt);
83069 +#else
83070 +static inline void gr_learn_resource(const struct task_struct *task, const int res,
83071 + const unsigned long wanted, const int gt)
83072 +{
83073 +}
83074 +#endif
83075 +
83076 static inline int check_data_rlimit(unsigned long rlim,
83077 unsigned long new,
83078 unsigned long start,
83079 unsigned long end_data,
83080 unsigned long start_data)
83081 {
83082 + gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
83083 if (rlim < RLIM_INFINITY) {
83084 if (((new - start) + (end_data - start_data)) > rlim)
83085 return -ENOSPC;
83086 @@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
83087 unsigned long addr, unsigned long len,
83088 unsigned long flags, struct page **pages);
83089
83090 -extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83091 +extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83092
83093 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83094 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83095 @@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83096 unsigned long len, unsigned long prot, unsigned long flags,
83097 unsigned long pgoff, unsigned long *populate);
83098 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83099 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83100
83101 #ifdef CONFIG_MMU
83102 extern int __mm_populate(unsigned long addr, unsigned long len,
83103 @@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
83104 unsigned long high_limit;
83105 unsigned long align_mask;
83106 unsigned long align_offset;
83107 + unsigned long threadstack_offset;
83108 };
83109
83110 -extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83111 -extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83112 +extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
83113 +extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
83114
83115 /*
83116 * Search for an unmapped address range.
83117 @@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83118 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
83119 */
83120 static inline unsigned long
83121 -vm_unmapped_area(struct vm_unmapped_area_info *info)
83122 +vm_unmapped_area(const struct vm_unmapped_area_info *info)
83123 {
83124 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
83125 return unmapped_area(info);
83126 @@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
83127 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
83128 struct vm_area_struct **pprev);
83129
83130 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
83131 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
83132 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
83133 +
83134 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
83135 NULL if none. Assume start_addr < end_addr. */
83136 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
83137 @@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
83138 }
83139
83140 #ifdef CONFIG_MMU
83141 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
83142 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
83143 void vma_set_page_prot(struct vm_area_struct *vma);
83144 #else
83145 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
83146 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
83147 {
83148 return __pgprot(0);
83149 }
83150 @@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
83151 static inline void vm_stat_account(struct mm_struct *mm,
83152 unsigned long flags, struct file *file, long pages)
83153 {
83154 +
83155 +#ifdef CONFIG_PAX_RANDMMAP
83156 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
83157 +#endif
83158 +
83159 mm->total_vm += pages;
83160 }
83161 #endif /* CONFIG_PROC_FS */
83162 @@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
83163 extern int sysctl_memory_failure_early_kill;
83164 extern int sysctl_memory_failure_recovery;
83165 extern void shake_page(struct page *p, int access);
83166 -extern atomic_long_t num_poisoned_pages;
83167 +extern atomic_long_unchecked_t num_poisoned_pages;
83168 extern int soft_offline_page(struct page *page, int flags);
83169
83170 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
83171 @@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
83172 static inline void setup_nr_node_ids(void) {}
83173 #endif
83174
83175 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
83176 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
83177 +#else
83178 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
83179 +#endif
83180 +
83181 #endif /* __KERNEL__ */
83182 #endif /* _LINUX_MM_H */
83183 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
83184 index 6e0b286..90d9c0d 100644
83185 --- a/include/linux/mm_types.h
83186 +++ b/include/linux/mm_types.h
83187 @@ -308,7 +308,9 @@ struct vm_area_struct {
83188 #ifdef CONFIG_NUMA
83189 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
83190 #endif
83191 -};
83192 +
83193 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
83194 +} __randomize_layout;
83195
83196 struct core_thread {
83197 struct task_struct *task;
83198 @@ -454,7 +456,25 @@ struct mm_struct {
83199 bool tlb_flush_pending;
83200 #endif
83201 struct uprobes_state uprobes_state;
83202 -};
83203 +
83204 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83205 + unsigned long pax_flags;
83206 +#endif
83207 +
83208 +#ifdef CONFIG_PAX_DLRESOLVE
83209 + unsigned long call_dl_resolve;
83210 +#endif
83211 +
83212 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83213 + unsigned long call_syscall;
83214 +#endif
83215 +
83216 +#ifdef CONFIG_PAX_ASLR
83217 + unsigned long delta_mmap; /* randomized offset */
83218 + unsigned long delta_stack; /* randomized offset */
83219 +#endif
83220 +
83221 +} __randomize_layout;
83222
83223 static inline void mm_init_cpumask(struct mm_struct *mm)
83224 {
83225 diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83226 index c5d5278..f0b68c8 100644
83227 --- a/include/linux/mmiotrace.h
83228 +++ b/include/linux/mmiotrace.h
83229 @@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83230 /* Called from ioremap.c */
83231 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83232 void __iomem *addr);
83233 -extern void mmiotrace_iounmap(volatile void __iomem *addr);
83234 +extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83235
83236 /* For anyone to insert markers. Remember trailing newline. */
83237 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83238 @@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83239 {
83240 }
83241
83242 -static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83243 +static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83244 {
83245 }
83246
83247 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83248 index ffe66e3..b310722 100644
83249 --- a/include/linux/mmzone.h
83250 +++ b/include/linux/mmzone.h
83251 @@ -527,7 +527,7 @@ struct zone {
83252
83253 ZONE_PADDING(_pad3_)
83254 /* Zone statistics */
83255 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83256 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83257 } ____cacheline_internodealigned_in_smp;
83258
83259 enum zone_flags {
83260 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83261 index 44eeef0..a92d3f9 100644
83262 --- a/include/linux/mod_devicetable.h
83263 +++ b/include/linux/mod_devicetable.h
83264 @@ -139,7 +139,7 @@ struct usb_device_id {
83265 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83266 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83267
83268 -#define HID_ANY_ID (~0)
83269 +#define HID_ANY_ID (~0U)
83270 #define HID_BUS_ANY 0xffff
83271 #define HID_GROUP_ANY 0x0000
83272
83273 @@ -475,7 +475,7 @@ struct dmi_system_id {
83274 const char *ident;
83275 struct dmi_strmatch matches[4];
83276 void *driver_data;
83277 -};
83278 +} __do_const;
83279 /*
83280 * struct dmi_device_id appears during expansion of
83281 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83282 diff --git a/include/linux/module.h b/include/linux/module.h
83283 index 71f282a..b2387e2 100644
83284 --- a/include/linux/module.h
83285 +++ b/include/linux/module.h
83286 @@ -17,9 +17,11 @@
83287 #include <linux/moduleparam.h>
83288 #include <linux/jump_label.h>
83289 #include <linux/export.h>
83290 +#include <linux/fs.h>
83291
83292 #include <linux/percpu.h>
83293 #include <asm/module.h>
83294 +#include <asm/pgtable.h>
83295
83296 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83297 #define MODULE_SIG_STRING "~Module signature appended~\n"
83298 @@ -42,7 +44,7 @@ struct module_kobject {
83299 struct kobject *drivers_dir;
83300 struct module_param_attrs *mp;
83301 struct completion *kobj_completion;
83302 -};
83303 +} __randomize_layout;
83304
83305 struct module_attribute {
83306 struct attribute attr;
83307 @@ -54,12 +56,13 @@ struct module_attribute {
83308 int (*test)(struct module *);
83309 void (*free)(struct module *);
83310 };
83311 +typedef struct module_attribute __no_const module_attribute_no_const;
83312
83313 struct module_version_attribute {
83314 struct module_attribute mattr;
83315 const char *module_name;
83316 const char *version;
83317 -} __attribute__ ((__aligned__(sizeof(void *))));
83318 +} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83319
83320 extern ssize_t __modver_version_show(struct module_attribute *,
83321 struct module_kobject *, char *);
83322 @@ -235,7 +238,7 @@ struct module {
83323
83324 /* Sysfs stuff. */
83325 struct module_kobject mkobj;
83326 - struct module_attribute *modinfo_attrs;
83327 + module_attribute_no_const *modinfo_attrs;
83328 const char *version;
83329 const char *srcversion;
83330 struct kobject *holders_dir;
83331 @@ -284,19 +287,16 @@ struct module {
83332 int (*init)(void);
83333
83334 /* If this is non-NULL, vfree after init() returns */
83335 - void *module_init;
83336 + void *module_init_rx, *module_init_rw;
83337
83338 /* Here is the actual code + data, vfree'd on unload. */
83339 - void *module_core;
83340 + void *module_core_rx, *module_core_rw;
83341
83342 /* Here are the sizes of the init and core sections */
83343 - unsigned int init_size, core_size;
83344 + unsigned int init_size_rw, core_size_rw;
83345
83346 /* The size of the executable code in each section. */
83347 - unsigned int init_text_size, core_text_size;
83348 -
83349 - /* Size of RO sections of the module (text+rodata) */
83350 - unsigned int init_ro_size, core_ro_size;
83351 + unsigned int init_size_rx, core_size_rx;
83352
83353 /* Arch-specific module values */
83354 struct mod_arch_specific arch;
83355 @@ -352,6 +352,10 @@ struct module {
83356 #ifdef CONFIG_EVENT_TRACING
83357 struct ftrace_event_call **trace_events;
83358 unsigned int num_trace_events;
83359 + struct file_operations trace_id;
83360 + struct file_operations trace_enable;
83361 + struct file_operations trace_format;
83362 + struct file_operations trace_filter;
83363 #endif
83364 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83365 unsigned int num_ftrace_callsites;
83366 @@ -375,7 +379,7 @@ struct module {
83367 ctor_fn_t *ctors;
83368 unsigned int num_ctors;
83369 #endif
83370 -};
83371 +} __randomize_layout;
83372 #ifndef MODULE_ARCH_INIT
83373 #define MODULE_ARCH_INIT {}
83374 #endif
83375 @@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83376 bool is_module_percpu_address(unsigned long addr);
83377 bool is_module_text_address(unsigned long addr);
83378
83379 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83380 +{
83381 +
83382 +#ifdef CONFIG_PAX_KERNEXEC
83383 + if (ktla_ktva(addr) >= (unsigned long)start &&
83384 + ktla_ktva(addr) < (unsigned long)start + size)
83385 + return 1;
83386 +#endif
83387 +
83388 + return ((void *)addr >= start && (void *)addr < start + size);
83389 +}
83390 +
83391 +static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83392 +{
83393 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83394 +}
83395 +
83396 +static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83397 +{
83398 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83399 +}
83400 +
83401 +static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83402 +{
83403 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83404 +}
83405 +
83406 +static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83407 +{
83408 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83409 +}
83410 +
83411 static inline bool within_module_core(unsigned long addr,
83412 const struct module *mod)
83413 {
83414 - return (unsigned long)mod->module_core <= addr &&
83415 - addr < (unsigned long)mod->module_core + mod->core_size;
83416 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83417 }
83418
83419 static inline bool within_module_init(unsigned long addr,
83420 const struct module *mod)
83421 {
83422 - return (unsigned long)mod->module_init <= addr &&
83423 - addr < (unsigned long)mod->module_init + mod->init_size;
83424 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83425 }
83426
83427 static inline bool within_module(unsigned long addr, const struct module *mod)
83428 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83429 index 7eeb9bb..68f37e0 100644
83430 --- a/include/linux/moduleloader.h
83431 +++ b/include/linux/moduleloader.h
83432 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83433 sections. Returns NULL on failure. */
83434 void *module_alloc(unsigned long size);
83435
83436 +#ifdef CONFIG_PAX_KERNEXEC
83437 +void *module_alloc_exec(unsigned long size);
83438 +#else
83439 +#define module_alloc_exec(x) module_alloc(x)
83440 +#endif
83441 +
83442 /* Free memory returned from module_alloc. */
83443 void module_free(struct module *mod, void *module_region);
83444
83445 +#ifdef CONFIG_PAX_KERNEXEC
83446 +void module_free_exec(struct module *mod, void *module_region);
83447 +#else
83448 +#define module_free_exec(x, y) module_free((x), (y))
83449 +#endif
83450 +
83451 /*
83452 * Apply the given relocation to the (simplified) ELF. Return -error
83453 * or 0.
83454 @@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83455 unsigned int relsec,
83456 struct module *me)
83457 {
83458 +#ifdef CONFIG_MODULES
83459 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83460 module_name(me));
83461 +#endif
83462 return -ENOEXEC;
83463 }
83464 #endif
83465 @@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83466 unsigned int relsec,
83467 struct module *me)
83468 {
83469 +#ifdef CONFIG_MODULES
83470 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83471 module_name(me));
83472 +#endif
83473 return -ENOEXEC;
83474 }
83475 #endif
83476 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83477 index 1c9effa..1160bdd 100644
83478 --- a/include/linux/moduleparam.h
83479 +++ b/include/linux/moduleparam.h
83480 @@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83481 * @len is usually just sizeof(string).
83482 */
83483 #define module_param_string(name, string, len, perm) \
83484 - static const struct kparam_string __param_string_##name \
83485 + static const struct kparam_string __param_string_##name __used \
83486 = { len, string }; \
83487 __module_param_call(MODULE_PARAM_PREFIX, name, \
83488 &param_ops_string, \
83489 @@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83490 */
83491 #define module_param_array_named(name, array, type, nump, perm) \
83492 param_check_##type(name, &(array)[0]); \
83493 - static const struct kparam_array __param_arr_##name \
83494 + static const struct kparam_array __param_arr_##name __used \
83495 = { .max = ARRAY_SIZE(array), .num = nump, \
83496 .ops = &param_ops_##type, \
83497 .elemsize = sizeof(array[0]), .elem = array }; \
83498 diff --git a/include/linux/mount.h b/include/linux/mount.h
83499 index c2c561d..a5f2a8c 100644
83500 --- a/include/linux/mount.h
83501 +++ b/include/linux/mount.h
83502 @@ -66,7 +66,7 @@ struct vfsmount {
83503 struct dentry *mnt_root; /* root of the mounted tree */
83504 struct super_block *mnt_sb; /* pointer to superblock */
83505 int mnt_flags;
83506 -};
83507 +} __randomize_layout;
83508
83509 struct file; /* forward dec */
83510 struct path;
83511 diff --git a/include/linux/namei.h b/include/linux/namei.h
83512 index 492de72..1bddcd4 100644
83513 --- a/include/linux/namei.h
83514 +++ b/include/linux/namei.h
83515 @@ -19,7 +19,7 @@ struct nameidata {
83516 unsigned seq, m_seq;
83517 int last_type;
83518 unsigned depth;
83519 - char *saved_names[MAX_NESTED_LINKS + 1];
83520 + const char *saved_names[MAX_NESTED_LINKS + 1];
83521 };
83522
83523 /*
83524 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83525
83526 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83527
83528 -static inline void nd_set_link(struct nameidata *nd, char *path)
83529 +static inline void nd_set_link(struct nameidata *nd, const char *path)
83530 {
83531 nd->saved_names[nd->depth] = path;
83532 }
83533
83534 -static inline char *nd_get_link(struct nameidata *nd)
83535 +static inline const char *nd_get_link(const struct nameidata *nd)
83536 {
83537 return nd->saved_names[nd->depth];
83538 }
83539 diff --git a/include/linux/net.h b/include/linux/net.h
83540 index 17d8339..81656c0 100644
83541 --- a/include/linux/net.h
83542 +++ b/include/linux/net.h
83543 @@ -192,7 +192,7 @@ struct net_proto_family {
83544 int (*create)(struct net *net, struct socket *sock,
83545 int protocol, int kern);
83546 struct module *owner;
83547 -};
83548 +} __do_const;
83549
83550 struct iovec;
83551 struct kvec;
83552 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83553 index 74fd5d3..86a1e4f 100644
83554 --- a/include/linux/netdevice.h
83555 +++ b/include/linux/netdevice.h
83556 @@ -1156,6 +1156,7 @@ struct net_device_ops {
83557 bool (*ndo_gso_check) (struct sk_buff *skb,
83558 struct net_device *dev);
83559 };
83560 +typedef struct net_device_ops __no_const net_device_ops_no_const;
83561
83562 /**
83563 * enum net_device_priv_flags - &struct net_device priv_flags
83564 @@ -1498,10 +1499,10 @@ struct net_device {
83565
83566 struct net_device_stats stats;
83567
83568 - atomic_long_t rx_dropped;
83569 - atomic_long_t tx_dropped;
83570 + atomic_long_unchecked_t rx_dropped;
83571 + atomic_long_unchecked_t tx_dropped;
83572
83573 - atomic_t carrier_changes;
83574 + atomic_unchecked_t carrier_changes;
83575
83576 #ifdef CONFIG_WIRELESS_EXT
83577 const struct iw_handler_def * wireless_handlers;
83578 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83579 index 2517ece..0bbfcfb 100644
83580 --- a/include/linux/netfilter.h
83581 +++ b/include/linux/netfilter.h
83582 @@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83583 #endif
83584 /* Use the module struct to lock set/get code in place */
83585 struct module *owner;
83586 -};
83587 +} __do_const;
83588
83589 /* Function to register/unregister hook points. */
83590 int nf_register_hook(struct nf_hook_ops *reg);
83591 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83592 index e955d47..04a5338 100644
83593 --- a/include/linux/netfilter/nfnetlink.h
83594 +++ b/include/linux/netfilter/nfnetlink.h
83595 @@ -19,7 +19,7 @@ struct nfnl_callback {
83596 const struct nlattr * const cda[]);
83597 const struct nla_policy *policy; /* netlink attribute policy */
83598 const u_int16_t attr_count; /* number of nlattr's */
83599 -};
83600 +} __do_const;
83601
83602 struct nfnetlink_subsystem {
83603 const char *name;
83604 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83605 new file mode 100644
83606 index 0000000..33f4af8
83607 --- /dev/null
83608 +++ b/include/linux/netfilter/xt_gradm.h
83609 @@ -0,0 +1,9 @@
83610 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
83611 +#define _LINUX_NETFILTER_XT_GRADM_H 1
83612 +
83613 +struct xt_gradm_mtinfo {
83614 + __u16 flags;
83615 + __u16 invflags;
83616 +};
83617 +
83618 +#endif
83619 diff --git a/include/linux/nls.h b/include/linux/nls.h
83620 index 520681b..2b7fabb 100644
83621 --- a/include/linux/nls.h
83622 +++ b/include/linux/nls.h
83623 @@ -31,7 +31,7 @@ struct nls_table {
83624 const unsigned char *charset2upper;
83625 struct module *owner;
83626 struct nls_table *next;
83627 -};
83628 +} __do_const;
83629
83630 /* this value hold the maximum octet of charset */
83631 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83632 @@ -46,7 +46,7 @@ enum utf16_endian {
83633 /* nls_base.c */
83634 extern int __register_nls(struct nls_table *, struct module *);
83635 extern int unregister_nls(struct nls_table *);
83636 -extern struct nls_table *load_nls(char *);
83637 +extern struct nls_table *load_nls(const char *);
83638 extern void unload_nls(struct nls_table *);
83639 extern struct nls_table *load_nls_default(void);
83640 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83641 diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83642 index d14a4c3..a078786 100644
83643 --- a/include/linux/notifier.h
83644 +++ b/include/linux/notifier.h
83645 @@ -54,7 +54,8 @@ struct notifier_block {
83646 notifier_fn_t notifier_call;
83647 struct notifier_block __rcu *next;
83648 int priority;
83649 -};
83650 +} __do_const;
83651 +typedef struct notifier_block __no_const notifier_block_no_const;
83652
83653 struct atomic_notifier_head {
83654 spinlock_t lock;
83655 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83656 index b2a0f15..4d7da32 100644
83657 --- a/include/linux/oprofile.h
83658 +++ b/include/linux/oprofile.h
83659 @@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83660 int oprofilefs_create_ro_ulong(struct dentry * root,
83661 char const * name, ulong * val);
83662
83663 -/** Create a file for read-only access to an atomic_t. */
83664 +/** Create a file for read-only access to an atomic_unchecked_t. */
83665 int oprofilefs_create_ro_atomic(struct dentry * root,
83666 - char const * name, atomic_t * val);
83667 + char const * name, atomic_unchecked_t * val);
83668
83669 /** create a directory */
83670 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83671 diff --git a/include/linux/padata.h b/include/linux/padata.h
83672 index 4386946..f50c615 100644
83673 --- a/include/linux/padata.h
83674 +++ b/include/linux/padata.h
83675 @@ -129,7 +129,7 @@ struct parallel_data {
83676 struct padata_serial_queue __percpu *squeue;
83677 atomic_t reorder_objects;
83678 atomic_t refcnt;
83679 - atomic_t seq_nr;
83680 + atomic_unchecked_t seq_nr;
83681 struct padata_cpumask cpumask;
83682 spinlock_t lock ____cacheline_aligned;
83683 unsigned int processed;
83684 diff --git a/include/linux/path.h b/include/linux/path.h
83685 index d137218..be0c176 100644
83686 --- a/include/linux/path.h
83687 +++ b/include/linux/path.h
83688 @@ -1,13 +1,15 @@
83689 #ifndef _LINUX_PATH_H
83690 #define _LINUX_PATH_H
83691
83692 +#include <linux/compiler.h>
83693 +
83694 struct dentry;
83695 struct vfsmount;
83696
83697 struct path {
83698 struct vfsmount *mnt;
83699 struct dentry *dentry;
83700 -};
83701 +} __randomize_layout;
83702
83703 extern void path_get(const struct path *);
83704 extern void path_put(const struct path *);
83705 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83706 index 2706ee9..e691f7c 100644
83707 --- a/include/linux/pci_hotplug.h
83708 +++ b/include/linux/pci_hotplug.h
83709 @@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83710 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83711 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83712 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83713 -};
83714 +} __do_const;
83715 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83716
83717 /**
83718 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83719 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83720 index 893a0d0..d5f996e 100644
83721 --- a/include/linux/perf_event.h
83722 +++ b/include/linux/perf_event.h
83723 @@ -341,8 +341,8 @@ struct perf_event {
83724
83725 enum perf_event_active_state state;
83726 unsigned int attach_state;
83727 - local64_t count;
83728 - atomic64_t child_count;
83729 + local64_t count; /* PaX: fix it one day */
83730 + atomic64_unchecked_t child_count;
83731
83732 /*
83733 * These are the total time in nanoseconds that the event
83734 @@ -393,8 +393,8 @@ struct perf_event {
83735 * These accumulate total time (in nanoseconds) that children
83736 * events have been enabled and running, respectively.
83737 */
83738 - atomic64_t child_total_time_enabled;
83739 - atomic64_t child_total_time_running;
83740 + atomic64_unchecked_t child_total_time_enabled;
83741 + atomic64_unchecked_t child_total_time_running;
83742
83743 /*
83744 * Protect attach/detach and child_list:
83745 @@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83746 entry->ip[entry->nr++] = ip;
83747 }
83748
83749 -extern int sysctl_perf_event_paranoid;
83750 +extern int sysctl_perf_event_legitimately_concerned;
83751 extern int sysctl_perf_event_mlock;
83752 extern int sysctl_perf_event_sample_rate;
83753 extern int sysctl_perf_cpu_time_max_percent;
83754 @@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
83755 loff_t *ppos);
83756
83757
83758 +static inline bool perf_paranoid_any(void)
83759 +{
83760 + return sysctl_perf_event_legitimately_concerned > 2;
83761 +}
83762 +
83763 static inline bool perf_paranoid_tracepoint_raw(void)
83764 {
83765 - return sysctl_perf_event_paranoid > -1;
83766 + return sysctl_perf_event_legitimately_concerned > -1;
83767 }
83768
83769 static inline bool perf_paranoid_cpu(void)
83770 {
83771 - return sysctl_perf_event_paranoid > 0;
83772 + return sysctl_perf_event_legitimately_concerned > 0;
83773 }
83774
83775 static inline bool perf_paranoid_kernel(void)
83776 {
83777 - return sysctl_perf_event_paranoid > 1;
83778 + return sysctl_perf_event_legitimately_concerned > 1;
83779 }
83780
83781 extern void perf_event_init(void);
83782 @@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
83783 struct device_attribute attr;
83784 u64 id;
83785 const char *event_str;
83786 -};
83787 +} __do_const;
83788
83789 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
83790 static struct perf_pmu_events_attr _var = { \
83791 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
83792 index 1997ffc..4f1f44d 100644
83793 --- a/include/linux/pid_namespace.h
83794 +++ b/include/linux/pid_namespace.h
83795 @@ -44,7 +44,7 @@ struct pid_namespace {
83796 int hide_pid;
83797 int reboot; /* group exit code if this pidns was rebooted */
83798 unsigned int proc_inum;
83799 -};
83800 +} __randomize_layout;
83801
83802 extern struct pid_namespace init_pid_ns;
83803
83804 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
83805 index eb8b8ac..62649e1 100644
83806 --- a/include/linux/pipe_fs_i.h
83807 +++ b/include/linux/pipe_fs_i.h
83808 @@ -47,10 +47,10 @@ struct pipe_inode_info {
83809 struct mutex mutex;
83810 wait_queue_head_t wait;
83811 unsigned int nrbufs, curbuf, buffers;
83812 - unsigned int readers;
83813 - unsigned int writers;
83814 - unsigned int files;
83815 - unsigned int waiting_writers;
83816 + atomic_t readers;
83817 + atomic_t writers;
83818 + atomic_t files;
83819 + atomic_t waiting_writers;
83820 unsigned int r_counter;
83821 unsigned int w_counter;
83822 struct page *tmp_page;
83823 diff --git a/include/linux/pm.h b/include/linux/pm.h
83824 index 383fd68..7a11504 100644
83825 --- a/include/linux/pm.h
83826 +++ b/include/linux/pm.h
83827 @@ -621,6 +621,7 @@ struct dev_pm_domain {
83828 struct dev_pm_ops ops;
83829 void (*detach)(struct device *dev, bool power_off);
83830 };
83831 +typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
83832
83833 /*
83834 * The PM_EVENT_ messages are also used by drivers implementing the legacy
83835 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
83836 index 2e0e06d..824cc9b 100644
83837 --- a/include/linux/pm_domain.h
83838 +++ b/include/linux/pm_domain.h
83839 @@ -36,11 +36,11 @@ struct gpd_dev_ops {
83840 int (*save_state)(struct device *dev);
83841 int (*restore_state)(struct device *dev);
83842 bool (*active_wakeup)(struct device *dev);
83843 -};
83844 +} __no_const;
83845
83846 struct gpd_cpuidle_data {
83847 unsigned int saved_exit_latency;
83848 - struct cpuidle_state *idle_state;
83849 + cpuidle_state_no_const *idle_state;
83850 };
83851
83852 struct generic_pm_domain {
83853 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
83854 index 367f49b..d2f5a14 100644
83855 --- a/include/linux/pm_runtime.h
83856 +++ b/include/linux/pm_runtime.h
83857 @@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
83858
83859 static inline void pm_runtime_mark_last_busy(struct device *dev)
83860 {
83861 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
83862 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
83863 }
83864
83865 #else /* !CONFIG_PM_RUNTIME */
83866 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
83867 index 195aafc..49a7bc2 100644
83868 --- a/include/linux/pnp.h
83869 +++ b/include/linux/pnp.h
83870 @@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
83871 struct pnp_fixup {
83872 char id[7];
83873 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
83874 -};
83875 +} __do_const;
83876
83877 /* config parameters */
83878 #define PNP_CONFIG_NORMAL 0x0001
83879 diff --git a/include/linux/poison.h b/include/linux/poison.h
83880 index 2110a81..13a11bb 100644
83881 --- a/include/linux/poison.h
83882 +++ b/include/linux/poison.h
83883 @@ -19,8 +19,8 @@
83884 * under normal circumstances, used to verify that nobody uses
83885 * non-initialized list entries.
83886 */
83887 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
83888 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
83889 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
83890 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
83891
83892 /********** include/linux/timer.h **********/
83893 /*
83894 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
83895 index d8b187c3..9a9257a 100644
83896 --- a/include/linux/power/smartreflex.h
83897 +++ b/include/linux/power/smartreflex.h
83898 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
83899 int (*notify)(struct omap_sr *sr, u32 status);
83900 u8 notify_flags;
83901 u8 class_type;
83902 -};
83903 +} __do_const;
83904
83905 /**
83906 * struct omap_sr_nvalue_table - Smartreflex n-target value info
83907 diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
83908 index 4ea1d37..80f4b33 100644
83909 --- a/include/linux/ppp-comp.h
83910 +++ b/include/linux/ppp-comp.h
83911 @@ -84,7 +84,7 @@ struct compressor {
83912 struct module *owner;
83913 /* Extra skb space needed by the compressor algorithm */
83914 unsigned int comp_extra;
83915 -};
83916 +} __do_const;
83917
83918 /*
83919 * The return value from decompress routine is the length of the
83920 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
83921 index de83b4e..c4b997d 100644
83922 --- a/include/linux/preempt.h
83923 +++ b/include/linux/preempt.h
83924 @@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
83925 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
83926 #endif
83927
83928 +#define raw_preempt_count_add(val) __preempt_count_add(val)
83929 +#define raw_preempt_count_sub(val) __preempt_count_sub(val)
83930 +
83931 #define __preempt_count_inc() __preempt_count_add(1)
83932 #define __preempt_count_dec() __preempt_count_sub(1)
83933
83934 #define preempt_count_inc() preempt_count_add(1)
83935 +#define raw_preempt_count_inc() raw_preempt_count_add(1)
83936 #define preempt_count_dec() preempt_count_sub(1)
83937 +#define raw_preempt_count_dec() raw_preempt_count_sub(1)
83938
83939 #ifdef CONFIG_PREEMPT_COUNT
83940
83941 @@ -41,6 +46,12 @@ do { \
83942 barrier(); \
83943 } while (0)
83944
83945 +#define raw_preempt_disable() \
83946 +do { \
83947 + raw_preempt_count_inc(); \
83948 + barrier(); \
83949 +} while (0)
83950 +
83951 #define sched_preempt_enable_no_resched() \
83952 do { \
83953 barrier(); \
83954 @@ -49,6 +60,12 @@ do { \
83955
83956 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
83957
83958 +#define raw_preempt_enable_no_resched() \
83959 +do { \
83960 + barrier(); \
83961 + raw_preempt_count_dec(); \
83962 +} while (0)
83963 +
83964 #ifdef CONFIG_PREEMPT
83965 #define preempt_enable() \
83966 do { \
83967 @@ -113,8 +130,10 @@ do { \
83968 * region.
83969 */
83970 #define preempt_disable() barrier()
83971 +#define raw_preempt_disable() barrier()
83972 #define sched_preempt_enable_no_resched() barrier()
83973 #define preempt_enable_no_resched() barrier()
83974 +#define raw_preempt_enable_no_resched() barrier()
83975 #define preempt_enable() barrier()
83976 #define preempt_check_resched() do { } while (0)
83977
83978 @@ -128,11 +147,13 @@ do { \
83979 /*
83980 * Modules have no business playing preemption tricks.
83981 */
83982 +#ifndef CONFIG_PAX_KERNEXEC
83983 #undef sched_preempt_enable_no_resched
83984 #undef preempt_enable_no_resched
83985 #undef preempt_enable_no_resched_notrace
83986 #undef preempt_check_resched
83987 #endif
83988 +#endif
83989
83990 #define preempt_set_need_resched() \
83991 do { \
83992 diff --git a/include/linux/printk.h b/include/linux/printk.h
83993 index d78125f..7f36596 100644
83994 --- a/include/linux/printk.h
83995 +++ b/include/linux/printk.h
83996 @@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
83997 void early_printk(const char *s, ...) { }
83998 #endif
83999
84000 +extern int kptr_restrict;
84001 +
84002 #ifdef CONFIG_PRINTK
84003 asmlinkage __printf(5, 0)
84004 int vprintk_emit(int facility, int level,
84005 @@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
84006
84007 extern int printk_delay_msec;
84008 extern int dmesg_restrict;
84009 -extern int kptr_restrict;
84010
84011 extern void wake_up_klogd(void);
84012
84013 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
84014 index b97bf2e..f14c92d4 100644
84015 --- a/include/linux/proc_fs.h
84016 +++ b/include/linux/proc_fs.h
84017 @@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
84018 extern struct proc_dir_entry *proc_symlink(const char *,
84019 struct proc_dir_entry *, const char *);
84020 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
84021 +extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
84022 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
84023 struct proc_dir_entry *, void *);
84024 +extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
84025 + struct proc_dir_entry *, void *);
84026 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
84027 struct proc_dir_entry *);
84028
84029 @@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
84030 return proc_create_data(name, mode, parent, proc_fops, NULL);
84031 }
84032
84033 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
84034 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
84035 +{
84036 +#ifdef CONFIG_GRKERNSEC_PROC_USER
84037 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
84038 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
84039 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
84040 +#else
84041 + return proc_create_data(name, mode, parent, proc_fops, NULL);
84042 +#endif
84043 +}
84044 +
84045 +
84046 extern void proc_set_size(struct proc_dir_entry *, loff_t);
84047 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
84048 extern void *PDE_DATA(const struct inode *);
84049 @@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
84050 struct proc_dir_entry *parent,const char *dest) { return NULL;}
84051 static inline struct proc_dir_entry *proc_mkdir(const char *name,
84052 struct proc_dir_entry *parent) {return NULL;}
84053 +static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
84054 + struct proc_dir_entry *parent) { return NULL; }
84055 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
84056 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84057 +static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
84058 + umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
84059 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
84060 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
84061 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
84062 @@ -79,7 +99,7 @@ struct net;
84063 static inline struct proc_dir_entry *proc_net_mkdir(
84064 struct net *net, const char *name, struct proc_dir_entry *parent)
84065 {
84066 - return proc_mkdir_data(name, 0, parent, net);
84067 + return proc_mkdir_data_restrict(name, 0, parent, net);
84068 }
84069
84070 #endif /* _LINUX_PROC_FS_H */
84071 diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
84072 index 34a1e10..70f6bde 100644
84073 --- a/include/linux/proc_ns.h
84074 +++ b/include/linux/proc_ns.h
84075 @@ -14,7 +14,7 @@ struct proc_ns_operations {
84076 void (*put)(void *ns);
84077 int (*install)(struct nsproxy *nsproxy, void *ns);
84078 unsigned int (*inum)(void *ns);
84079 -};
84080 +} __do_const __randomize_layout;
84081
84082 struct proc_ns {
84083 void *ns;
84084 diff --git a/include/linux/quota.h b/include/linux/quota.h
84085 index 80d345a..9e89a9a 100644
84086 --- a/include/linux/quota.h
84087 +++ b/include/linux/quota.h
84088 @@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
84089
84090 extern bool qid_eq(struct kqid left, struct kqid right);
84091 extern bool qid_lt(struct kqid left, struct kqid right);
84092 -extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84093 +extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84094 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84095 extern bool qid_valid(struct kqid qid);
84096
84097 diff --git a/include/linux/random.h b/include/linux/random.h
84098 index b05856e..0a9f14e 100644
84099 --- a/include/linux/random.h
84100 +++ b/include/linux/random.h
84101 @@ -9,9 +9,19 @@
84102 #include <uapi/linux/random.h>
84103
84104 extern void add_device_randomness(const void *, unsigned int);
84105 +
84106 +static inline void add_latent_entropy(void)
84107 +{
84108 +
84109 +#ifdef LATENT_ENTROPY_PLUGIN
84110 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
84111 +#endif
84112 +
84113 +}
84114 +
84115 extern void add_input_randomness(unsigned int type, unsigned int code,
84116 - unsigned int value);
84117 -extern void add_interrupt_randomness(int irq, int irq_flags);
84118 + unsigned int value) __latent_entropy;
84119 +extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
84120
84121 extern void get_random_bytes(void *buf, int nbytes);
84122 extern void get_random_bytes_arch(void *buf, int nbytes);
84123 @@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
84124 extern const struct file_operations random_fops, urandom_fops;
84125 #endif
84126
84127 -unsigned int get_random_int(void);
84128 +unsigned int __intentional_overflow(-1) get_random_int(void);
84129 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
84130
84131 -u32 prandom_u32(void);
84132 +u32 prandom_u32(void) __intentional_overflow(-1);
84133 void prandom_bytes(void *buf, size_t nbytes);
84134 void prandom_seed(u32 seed);
84135 void prandom_reseed_late(void);
84136 @@ -37,6 +47,11 @@ struct rnd_state {
84137 u32 prandom_u32_state(struct rnd_state *state);
84138 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84139
84140 +static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
84141 +{
84142 + return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
84143 +}
84144 +
84145 /**
84146 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
84147 * @ep_ro: right open interval endpoint
84148 @@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84149 *
84150 * Returns: pseudo-random number in interval [0, ep_ro)
84151 */
84152 -static inline u32 prandom_u32_max(u32 ep_ro)
84153 +static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
84154 {
84155 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
84156 }
84157 diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
84158 index 378c5ee..aa84a47 100644
84159 --- a/include/linux/rbtree_augmented.h
84160 +++ b/include/linux/rbtree_augmented.h
84161 @@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
84162 old->rbaugmented = rbcompute(old); \
84163 } \
84164 rbstatic const struct rb_augment_callbacks rbname = { \
84165 - rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
84166 + .propagate = rbname ## _propagate, \
84167 + .copy = rbname ## _copy, \
84168 + .rotate = rbname ## _rotate \
84169 };
84170
84171
84172 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
84173 index 372ad5e..d4373f8 100644
84174 --- a/include/linux/rculist.h
84175 +++ b/include/linux/rculist.h
84176 @@ -29,8 +29,8 @@
84177 */
84178 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
84179 {
84180 - ACCESS_ONCE(list->next) = list;
84181 - ACCESS_ONCE(list->prev) = list;
84182 + ACCESS_ONCE_RW(list->next) = list;
84183 + ACCESS_ONCE_RW(list->prev) = list;
84184 }
84185
84186 /*
84187 @@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
84188 struct list_head *prev, struct list_head *next);
84189 #endif
84190
84191 +void __pax_list_add_rcu(struct list_head *new,
84192 + struct list_head *prev, struct list_head *next);
84193 +
84194 /**
84195 * list_add_rcu - add a new entry to rcu-protected list
84196 * @new: new entry to be added
84197 @@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84198 __list_add_rcu(new, head, head->next);
84199 }
84200
84201 +static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84202 +{
84203 + __pax_list_add_rcu(new, head, head->next);
84204 +}
84205 +
84206 /**
84207 * list_add_tail_rcu - add a new entry to rcu-protected list
84208 * @new: new entry to be added
84209 @@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84210 __list_add_rcu(new, head->prev, head);
84211 }
84212
84213 +static inline void pax_list_add_tail_rcu(struct list_head *new,
84214 + struct list_head *head)
84215 +{
84216 + __pax_list_add_rcu(new, head->prev, head);
84217 +}
84218 +
84219 /**
84220 * list_del_rcu - deletes entry from list without re-initialization
84221 * @entry: the element to delete from the list.
84222 @@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84223 entry->prev = LIST_POISON2;
84224 }
84225
84226 +extern void pax_list_del_rcu(struct list_head *entry);
84227 +
84228 /**
84229 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84230 * @n: the element to delete from the hash list.
84231 diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84232 index 53ff1a7..c40f0ab 100644
84233 --- a/include/linux/rcupdate.h
84234 +++ b/include/linux/rcupdate.h
84235 @@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84236 #define rcu_note_voluntary_context_switch(t) \
84237 do { \
84238 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84239 - ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84240 + ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84241 } while (0)
84242 #else /* #ifdef CONFIG_TASKS_RCU */
84243 #define TASKS_RCU(x) do { } while (0)
84244 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84245 index 67fc8fc..a90f7d8 100644
84246 --- a/include/linux/reboot.h
84247 +++ b/include/linux/reboot.h
84248 @@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84249 */
84250
84251 extern void migrate_to_reboot_cpu(void);
84252 -extern void machine_restart(char *cmd);
84253 -extern void machine_halt(void);
84254 -extern void machine_power_off(void);
84255 +extern void machine_restart(char *cmd) __noreturn;
84256 +extern void machine_halt(void) __noreturn;
84257 +extern void machine_power_off(void) __noreturn;
84258
84259 extern void machine_shutdown(void);
84260 struct pt_regs;
84261 @@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84262 */
84263
84264 extern void kernel_restart_prepare(char *cmd);
84265 -extern void kernel_restart(char *cmd);
84266 -extern void kernel_halt(void);
84267 -extern void kernel_power_off(void);
84268 +extern void kernel_restart(char *cmd) __noreturn;
84269 +extern void kernel_halt(void) __noreturn;
84270 +extern void kernel_power_off(void) __noreturn;
84271
84272 extern int C_A_D; /* for sysctl */
84273 void ctrl_alt_del(void);
84274 @@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84275 * Emergency restart, callable from an interrupt handler.
84276 */
84277
84278 -extern void emergency_restart(void);
84279 +extern void emergency_restart(void) __noreturn;
84280 #include <asm/emergency-restart.h>
84281
84282 #endif /* _LINUX_REBOOT_H */
84283 diff --git a/include/linux/regset.h b/include/linux/regset.h
84284 index 8e0c9fe..ac4d221 100644
84285 --- a/include/linux/regset.h
84286 +++ b/include/linux/regset.h
84287 @@ -161,7 +161,8 @@ struct user_regset {
84288 unsigned int align;
84289 unsigned int bias;
84290 unsigned int core_note_type;
84291 -};
84292 +} __do_const;
84293 +typedef struct user_regset __no_const user_regset_no_const;
84294
84295 /**
84296 * struct user_regset_view - available regsets
84297 diff --git a/include/linux/relay.h b/include/linux/relay.h
84298 index d7c8359..818daf5 100644
84299 --- a/include/linux/relay.h
84300 +++ b/include/linux/relay.h
84301 @@ -157,7 +157,7 @@ struct rchan_callbacks
84302 * The callback should return 0 if successful, negative if not.
84303 */
84304 int (*remove_buf_file)(struct dentry *dentry);
84305 -};
84306 +} __no_const;
84307
84308 /*
84309 * CONFIG_RELAY kernel API, kernel/relay.c
84310 diff --git a/include/linux/rio.h b/include/linux/rio.h
84311 index 6bda06f..bf39a9b 100644
84312 --- a/include/linux/rio.h
84313 +++ b/include/linux/rio.h
84314 @@ -358,7 +358,7 @@ struct rio_ops {
84315 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84316 u64 rstart, u32 size, u32 flags);
84317 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84318 -};
84319 +} __no_const;
84320
84321 #define RIO_RESOURCE_MEM 0x00000100
84322 #define RIO_RESOURCE_DOORBELL 0x00000200
84323 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84324 index c0c2bce..4813524 100644
84325 --- a/include/linux/rmap.h
84326 +++ b/include/linux/rmap.h
84327 @@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84328 void anon_vma_init(void); /* create anon_vma_cachep */
84329 int anon_vma_prepare(struct vm_area_struct *);
84330 void unlink_anon_vmas(struct vm_area_struct *);
84331 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84332 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84333 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84334 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84335
84336 static inline void anon_vma_merge(struct vm_area_struct *vma,
84337 struct vm_area_struct *next)
84338 diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84339 index ed8f9e7..999bc96 100644
84340 --- a/include/linux/scatterlist.h
84341 +++ b/include/linux/scatterlist.h
84342 @@ -1,6 +1,7 @@
84343 #ifndef _LINUX_SCATTERLIST_H
84344 #define _LINUX_SCATTERLIST_H
84345
84346 +#include <linux/sched.h>
84347 #include <linux/string.h>
84348 #include <linux/bug.h>
84349 #include <linux/mm.h>
84350 @@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84351 #ifdef CONFIG_DEBUG_SG
84352 BUG_ON(!virt_addr_valid(buf));
84353 #endif
84354 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84355 + if (object_starts_on_stack(buf)) {
84356 + void *adjbuf = buf - current->stack + current->lowmem_stack;
84357 + sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84358 + } else
84359 +#endif
84360 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84361 }
84362
84363 diff --git a/include/linux/sched.h b/include/linux/sched.h
84364 index 5e344bb..0743255 100644
84365 --- a/include/linux/sched.h
84366 +++ b/include/linux/sched.h
84367 @@ -133,6 +133,7 @@ struct fs_struct;
84368 struct perf_event_context;
84369 struct blk_plug;
84370 struct filename;
84371 +struct linux_binprm;
84372
84373 #define VMACACHE_BITS 2
84374 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84375 @@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84376 extern int in_sched_functions(unsigned long addr);
84377
84378 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84379 -extern signed long schedule_timeout(signed long timeout);
84380 +extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84381 extern signed long schedule_timeout_interruptible(signed long timeout);
84382 extern signed long schedule_timeout_killable(signed long timeout);
84383 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84384 @@ -387,6 +388,19 @@ struct nsproxy;
84385 struct user_namespace;
84386
84387 #ifdef CONFIG_MMU
84388 +
84389 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84390 +extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84391 +#else
84392 +static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84393 +{
84394 + return 0;
84395 +}
84396 +#endif
84397 +
84398 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84399 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84400 +
84401 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84402 extern unsigned long
84403 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84404 @@ -685,6 +699,17 @@ struct signal_struct {
84405 #ifdef CONFIG_TASKSTATS
84406 struct taskstats *stats;
84407 #endif
84408 +
84409 +#ifdef CONFIG_GRKERNSEC
84410 + u32 curr_ip;
84411 + u32 saved_ip;
84412 + u32 gr_saddr;
84413 + u32 gr_daddr;
84414 + u16 gr_sport;
84415 + u16 gr_dport;
84416 + u8 used_accept:1;
84417 +#endif
84418 +
84419 #ifdef CONFIG_AUDIT
84420 unsigned audit_tty;
84421 unsigned audit_tty_log_passwd;
84422 @@ -711,7 +736,7 @@ struct signal_struct {
84423 struct mutex cred_guard_mutex; /* guard against foreign influences on
84424 * credential calculations
84425 * (notably. ptrace) */
84426 -};
84427 +} __randomize_layout;
84428
84429 /*
84430 * Bits in flags field of signal_struct.
84431 @@ -764,6 +789,14 @@ struct user_struct {
84432 struct key *session_keyring; /* UID's default session keyring */
84433 #endif
84434
84435 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84436 + unsigned char kernel_banned;
84437 +#endif
84438 +#ifdef CONFIG_GRKERNSEC_BRUTE
84439 + unsigned char suid_banned;
84440 + unsigned long suid_ban_expires;
84441 +#endif
84442 +
84443 /* Hash table maintenance information */
84444 struct hlist_node uidhash_node;
84445 kuid_t uid;
84446 @@ -771,7 +804,7 @@ struct user_struct {
84447 #ifdef CONFIG_PERF_EVENTS
84448 atomic_long_t locked_vm;
84449 #endif
84450 -};
84451 +} __randomize_layout;
84452
84453 extern int uids_sysfs_init(void);
84454
84455 @@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84456 struct task_struct {
84457 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84458 void *stack;
84459 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84460 + void *lowmem_stack;
84461 +#endif
84462 atomic_t usage;
84463 unsigned int flags; /* per process flags, defined below */
84464 unsigned int ptrace;
84465 @@ -1362,8 +1398,8 @@ struct task_struct {
84466 struct list_head thread_node;
84467
84468 struct completion *vfork_done; /* for vfork() */
84469 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84470 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84471 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84472 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84473
84474 cputime_t utime, stime, utimescaled, stimescaled;
84475 cputime_t gtime;
84476 @@ -1388,11 +1424,6 @@ struct task_struct {
84477 struct task_cputime cputime_expires;
84478 struct list_head cpu_timers[3];
84479
84480 -/* process credentials */
84481 - const struct cred __rcu *real_cred; /* objective and real subjective task
84482 - * credentials (COW) */
84483 - const struct cred __rcu *cred; /* effective (overridable) subjective task
84484 - * credentials (COW) */
84485 char comm[TASK_COMM_LEN]; /* executable name excluding path
84486 - access with [gs]et_task_comm (which lock
84487 it with task_lock())
84488 @@ -1410,6 +1441,10 @@ struct task_struct {
84489 #endif
84490 /* CPU-specific state of this task */
84491 struct thread_struct thread;
84492 +/* thread_info moved to task_struct */
84493 +#ifdef CONFIG_X86
84494 + struct thread_info tinfo;
84495 +#endif
84496 /* filesystem information */
84497 struct fs_struct *fs;
84498 /* open file information */
84499 @@ -1484,6 +1519,10 @@ struct task_struct {
84500 gfp_t lockdep_reclaim_gfp;
84501 #endif
84502
84503 +/* process credentials */
84504 + const struct cred __rcu *real_cred; /* objective and real subjective task
84505 + * credentials (COW) */
84506 +
84507 /* journalling filesystem info */
84508 void *journal_info;
84509
84510 @@ -1522,6 +1561,10 @@ struct task_struct {
84511 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84512 struct list_head cg_list;
84513 #endif
84514 +
84515 + const struct cred __rcu *cred; /* effective (overridable) subjective task
84516 + * credentials (COW) */
84517 +
84518 #ifdef CONFIG_FUTEX
84519 struct robust_list_head __user *robust_list;
84520 #ifdef CONFIG_COMPAT
84521 @@ -1635,7 +1678,7 @@ struct task_struct {
84522 * Number of functions that haven't been traced
84523 * because of depth overrun.
84524 */
84525 - atomic_t trace_overrun;
84526 + atomic_unchecked_t trace_overrun;
84527 /* Pause for the tracing */
84528 atomic_t tracing_graph_pause;
84529 #endif
84530 @@ -1661,7 +1704,78 @@ struct task_struct {
84531 unsigned int sequential_io;
84532 unsigned int sequential_io_avg;
84533 #endif
84534 -};
84535 +
84536 +#ifdef CONFIG_GRKERNSEC
84537 + /* grsecurity */
84538 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84539 + u64 exec_id;
84540 +#endif
84541 +#ifdef CONFIG_GRKERNSEC_SETXID
84542 + const struct cred *delayed_cred;
84543 +#endif
84544 + struct dentry *gr_chroot_dentry;
84545 + struct acl_subject_label *acl;
84546 + struct acl_subject_label *tmpacl;
84547 + struct acl_role_label *role;
84548 + struct file *exec_file;
84549 + unsigned long brute_expires;
84550 + u16 acl_role_id;
84551 + u8 inherited;
84552 + /* is this the task that authenticated to the special role */
84553 + u8 acl_sp_role;
84554 + u8 is_writable;
84555 + u8 brute;
84556 + u8 gr_is_chrooted;
84557 +#endif
84558 +
84559 +} __randomize_layout;
84560 +
84561 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84562 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84563 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84564 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84565 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84566 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84567 +
84568 +#ifdef CONFIG_PAX_SOFTMODE
84569 +extern int pax_softmode;
84570 +#endif
84571 +
84572 +extern int pax_check_flags(unsigned long *);
84573 +#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84574 +
84575 +/* if tsk != current then task_lock must be held on it */
84576 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84577 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
84578 +{
84579 + if (likely(tsk->mm))
84580 + return tsk->mm->pax_flags;
84581 + else
84582 + return 0UL;
84583 +}
84584 +
84585 +/* if tsk != current then task_lock must be held on it */
84586 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84587 +{
84588 + if (likely(tsk->mm)) {
84589 + tsk->mm->pax_flags = flags;
84590 + return 0;
84591 + }
84592 + return -EINVAL;
84593 +}
84594 +#endif
84595 +
84596 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84597 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
84598 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84599 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84600 +#endif
84601 +
84602 +struct path;
84603 +extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84604 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84605 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84606 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
84607
84608 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84609 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84610 @@ -1743,7 +1857,7 @@ struct pid_namespace;
84611 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84612 struct pid_namespace *ns);
84613
84614 -static inline pid_t task_pid_nr(struct task_struct *tsk)
84615 +static inline pid_t task_pid_nr(const struct task_struct *tsk)
84616 {
84617 return tsk->pid;
84618 }
84619 @@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84620
84621 extern void sched_clock_init(void);
84622
84623 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84624 +static inline void populate_stack(void)
84625 +{
84626 + struct task_struct *curtask = current;
84627 + int c;
84628 + int *ptr = curtask->stack;
84629 + int *end = curtask->stack + THREAD_SIZE;
84630 +
84631 + while (ptr < end) {
84632 + c = *(volatile int *)ptr;
84633 + ptr += PAGE_SIZE/sizeof(int);
84634 + }
84635 +}
84636 +#else
84637 +static inline void populate_stack(void)
84638 +{
84639 +}
84640 +#endif
84641 +
84642 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84643 static inline void sched_clock_tick(void)
84644 {
84645 @@ -2239,7 +2372,9 @@ void yield(void);
84646 extern struct exec_domain default_exec_domain;
84647
84648 union thread_union {
84649 +#ifndef CONFIG_X86
84650 struct thread_info thread_info;
84651 +#endif
84652 unsigned long stack[THREAD_SIZE/sizeof(long)];
84653 };
84654
84655 @@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84656 */
84657
84658 extern struct task_struct *find_task_by_vpid(pid_t nr);
84659 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84660 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84661 struct pid_namespace *ns);
84662
84663 @@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84664 extern void exit_itimers(struct signal_struct *);
84665 extern void flush_itimer_signals(void);
84666
84667 -extern void do_group_exit(int);
84668 +extern __noreturn void do_group_exit(int);
84669
84670 extern int do_execve(struct filename *,
84671 const char __user * const __user *,
84672 @@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84673 #define task_stack_end_corrupted(task) \
84674 (*(end_of_stack(task)) != STACK_END_MAGIC)
84675
84676 -static inline int object_is_on_stack(void *obj)
84677 +static inline int object_starts_on_stack(const void *obj)
84678 {
84679 - void *stack = task_stack_page(current);
84680 + const void *stack = task_stack_page(current);
84681
84682 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84683 }
84684 diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84685 index 596a0e0..bea77ec 100644
84686 --- a/include/linux/sched/sysctl.h
84687 +++ b/include/linux/sched/sysctl.h
84688 @@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84689 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84690
84691 extern int sysctl_max_map_count;
84692 +extern unsigned long sysctl_heap_stack_gap;
84693
84694 extern unsigned int sysctl_sched_latency;
84695 extern unsigned int sysctl_sched_min_granularity;
84696 diff --git a/include/linux/security.h b/include/linux/security.h
84697 index ba96471..74fb3f6 100644
84698 --- a/include/linux/security.h
84699 +++ b/include/linux/security.h
84700 @@ -27,6 +27,7 @@
84701 #include <linux/slab.h>
84702 #include <linux/err.h>
84703 #include <linux/string.h>
84704 +#include <linux/grsecurity.h>
84705
84706 struct linux_binprm;
84707 struct cred;
84708 @@ -116,8 +117,6 @@ struct seq_file;
84709
84710 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84711
84712 -void reset_security_ops(void);
84713 -
84714 #ifdef CONFIG_MMU
84715 extern unsigned long mmap_min_addr;
84716 extern unsigned long dac_mmap_min_addr;
84717 @@ -1729,7 +1728,7 @@ struct security_operations {
84718 struct audit_context *actx);
84719 void (*audit_rule_free) (void *lsmrule);
84720 #endif /* CONFIG_AUDIT */
84721 -};
84722 +} __randomize_layout;
84723
84724 /* prototypes */
84725 extern int security_init(void);
84726 diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84727 index dc368b8..e895209 100644
84728 --- a/include/linux/semaphore.h
84729 +++ b/include/linux/semaphore.h
84730 @@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84731 }
84732
84733 extern void down(struct semaphore *sem);
84734 -extern int __must_check down_interruptible(struct semaphore *sem);
84735 +extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84736 extern int __must_check down_killable(struct semaphore *sem);
84737 extern int __must_check down_trylock(struct semaphore *sem);
84738 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84739 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84740 index 52e0097..383f21d 100644
84741 --- a/include/linux/seq_file.h
84742 +++ b/include/linux/seq_file.h
84743 @@ -27,6 +27,9 @@ struct seq_file {
84744 struct mutex lock;
84745 const struct seq_operations *op;
84746 int poll_event;
84747 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84748 + u64 exec_id;
84749 +#endif
84750 #ifdef CONFIG_USER_NS
84751 struct user_namespace *user_ns;
84752 #endif
84753 @@ -39,6 +42,7 @@ struct seq_operations {
84754 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
84755 int (*show) (struct seq_file *m, void *v);
84756 };
84757 +typedef struct seq_operations __no_const seq_operations_no_const;
84758
84759 #define SEQ_SKIP 1
84760
84761 @@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
84762
84763 char *mangle_path(char *s, const char *p, const char *esc);
84764 int seq_open(struct file *, const struct seq_operations *);
84765 +int seq_open_restrict(struct file *, const struct seq_operations *);
84766 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
84767 loff_t seq_lseek(struct file *, loff_t, int);
84768 int seq_release(struct inode *, struct file *);
84769 @@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
84770 }
84771
84772 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
84773 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
84774 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
84775 int single_release(struct inode *, struct file *);
84776 void *__seq_open_private(struct file *, const struct seq_operations *, int);
84777 diff --git a/include/linux/shm.h b/include/linux/shm.h
84778 index 6fb8016..ab4465e 100644
84779 --- a/include/linux/shm.h
84780 +++ b/include/linux/shm.h
84781 @@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
84782 /* The task created the shm object. NULL if the task is dead. */
84783 struct task_struct *shm_creator;
84784 struct list_head shm_clist; /* list by creator */
84785 +#ifdef CONFIG_GRKERNSEC
84786 + u64 shm_createtime;
84787 + pid_t shm_lapid;
84788 +#endif
84789 };
84790
84791 /* shm_mode upper byte flags */
84792 diff --git a/include/linux/signal.h b/include/linux/signal.h
84793 index ab1e039..ad4229e 100644
84794 --- a/include/linux/signal.h
84795 +++ b/include/linux/signal.h
84796 @@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
84797 * know it'll be handled, so that they don't get converted to
84798 * SIGKILL or just silently dropped.
84799 */
84800 - kernel_sigaction(sig, (__force __sighandler_t)2);
84801 + kernel_sigaction(sig, (__force_user __sighandler_t)2);
84802 }
84803
84804 static inline void disallow_signal(int sig)
84805 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
84806 index 6c8b6f6..5a0f4bd 100644
84807 --- a/include/linux/skbuff.h
84808 +++ b/include/linux/skbuff.h
84809 @@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
84810 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
84811 int node);
84812 struct sk_buff *build_skb(void *data, unsigned int frag_size);
84813 -static inline struct sk_buff *alloc_skb(unsigned int size,
84814 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
84815 gfp_t priority)
84816 {
84817 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
84818 @@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
84819 return skb->inner_transport_header - skb->inner_network_header;
84820 }
84821
84822 -static inline int skb_network_offset(const struct sk_buff *skb)
84823 +static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
84824 {
84825 return skb_network_header(skb) - skb->data;
84826 }
84827 @@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
84828 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
84829 */
84830 #ifndef NET_SKB_PAD
84831 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
84832 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
84833 #endif
84834
84835 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
84836 @@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
84837 int *err);
84838 unsigned int datagram_poll(struct file *file, struct socket *sock,
84839 struct poll_table_struct *wait);
84840 -int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84841 +int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84842 struct iovec *to, int size);
84843 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
84844 struct iovec *iov);
84845 @@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
84846 nf_bridge_put(skb->nf_bridge);
84847 skb->nf_bridge = NULL;
84848 #endif
84849 +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
84850 + skb->nf_trace = 0;
84851 +#endif
84852 }
84853
84854 static inline void nf_reset_trace(struct sk_buff *skb)
84855 diff --git a/include/linux/slab.h b/include/linux/slab.h
84856 index c265bec..4867d28 100644
84857 --- a/include/linux/slab.h
84858 +++ b/include/linux/slab.h
84859 @@ -14,15 +14,29 @@
84860 #include <linux/gfp.h>
84861 #include <linux/types.h>
84862 #include <linux/workqueue.h>
84863 -
84864 +#include <linux/err.h>
84865
84866 /*
84867 * Flags to pass to kmem_cache_create().
84868 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
84869 */
84870 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
84871 +
84872 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84873 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
84874 +#else
84875 +#define SLAB_USERCOPY 0x00000000UL
84876 +#endif
84877 +
84878 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
84879 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
84880 +
84881 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84882 +#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
84883 +#else
84884 +#define SLAB_NO_SANITIZE 0x00000000UL
84885 +#endif
84886 +
84887 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
84888 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
84889 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
84890 @@ -98,10 +112,13 @@
84891 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
84892 * Both make kfree a no-op.
84893 */
84894 -#define ZERO_SIZE_PTR ((void *)16)
84895 +#define ZERO_SIZE_PTR \
84896 +({ \
84897 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
84898 + (void *)(-MAX_ERRNO-1L); \
84899 +})
84900
84901 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
84902 - (unsigned long)ZERO_SIZE_PTR)
84903 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
84904
84905 #include <linux/kmemleak.h>
84906
84907 @@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
84908 void kfree(const void *);
84909 void kzfree(const void *);
84910 size_t ksize(const void *);
84911 +const char *check_heap_object(const void *ptr, unsigned long n);
84912 +bool is_usercopy_object(const void *ptr);
84913
84914 /*
84915 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
84916 @@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
84917 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84918 #endif
84919
84920 +#ifdef CONFIG_PAX_USERCOPY_SLABS
84921 +extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
84922 +#endif
84923 +
84924 /*
84925 * Figure out which kmalloc slab an allocation of a certain size
84926 * belongs to.
84927 @@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84928 * 2 = 120 .. 192 bytes
84929 * n = 2^(n-1) .. 2^n -1
84930 */
84931 -static __always_inline int kmalloc_index(size_t size)
84932 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
84933 {
84934 if (!size)
84935 return 0;
84936 @@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
84937 }
84938 #endif /* !CONFIG_SLOB */
84939
84940 -void *__kmalloc(size_t size, gfp_t flags);
84941 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
84942 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
84943
84944 #ifdef CONFIG_NUMA
84945 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
84946 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
84947 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
84948 #else
84949 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
84950 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
84951 index b869d16..1453c73 100644
84952 --- a/include/linux/slab_def.h
84953 +++ b/include/linux/slab_def.h
84954 @@ -40,7 +40,7 @@ struct kmem_cache {
84955 /* 4) cache creation/removal */
84956 const char *name;
84957 struct list_head list;
84958 - int refcount;
84959 + atomic_t refcount;
84960 int object_size;
84961 int align;
84962
84963 @@ -56,10 +56,14 @@ struct kmem_cache {
84964 unsigned long node_allocs;
84965 unsigned long node_frees;
84966 unsigned long node_overflow;
84967 - atomic_t allochit;
84968 - atomic_t allocmiss;
84969 - atomic_t freehit;
84970 - atomic_t freemiss;
84971 + atomic_unchecked_t allochit;
84972 + atomic_unchecked_t allocmiss;
84973 + atomic_unchecked_t freehit;
84974 + atomic_unchecked_t freemiss;
84975 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
84976 + atomic_unchecked_t sanitized;
84977 + atomic_unchecked_t not_sanitized;
84978 +#endif
84979
84980 /*
84981 * If debugging is enabled, then the allocator can add additional
84982 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
84983 index d82abd4..408c3a0 100644
84984 --- a/include/linux/slub_def.h
84985 +++ b/include/linux/slub_def.h
84986 @@ -74,7 +74,7 @@ struct kmem_cache {
84987 struct kmem_cache_order_objects max;
84988 struct kmem_cache_order_objects min;
84989 gfp_t allocflags; /* gfp flags to use on each alloc */
84990 - int refcount; /* Refcount for slab cache destroy */
84991 + atomic_t refcount; /* Refcount for slab cache destroy */
84992 void (*ctor)(void *);
84993 int inuse; /* Offset to metadata */
84994 int align; /* Alignment */
84995 diff --git a/include/linux/smp.h b/include/linux/smp.h
84996 index 93dff5f..933c561 100644
84997 --- a/include/linux/smp.h
84998 +++ b/include/linux/smp.h
84999 @@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
85000 #endif
85001
85002 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
85003 +#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
85004 #define put_cpu() preempt_enable()
85005 +#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
85006
85007 /*
85008 * Callback to arch code if there's nosmp or maxcpus=0 on the
85009 diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
85010 index 46cca4c..3323536 100644
85011 --- a/include/linux/sock_diag.h
85012 +++ b/include/linux/sock_diag.h
85013 @@ -11,7 +11,7 @@ struct sock;
85014 struct sock_diag_handler {
85015 __u8 family;
85016 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
85017 -};
85018 +} __do_const;
85019
85020 int sock_diag_register(const struct sock_diag_handler *h);
85021 void sock_diag_unregister(const struct sock_diag_handler *h);
85022 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
85023 index 680f9a3..f13aeb0 100644
85024 --- a/include/linux/sonet.h
85025 +++ b/include/linux/sonet.h
85026 @@ -7,7 +7,7 @@
85027 #include <uapi/linux/sonet.h>
85028
85029 struct k_sonet_stats {
85030 -#define __HANDLE_ITEM(i) atomic_t i
85031 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
85032 __SONET_ITEMS
85033 #undef __HANDLE_ITEM
85034 };
85035 diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
85036 index 07d8e53..dc934c9 100644
85037 --- a/include/linux/sunrpc/addr.h
85038 +++ b/include/linux/sunrpc/addr.h
85039 @@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
85040 {
85041 switch (sap->sa_family) {
85042 case AF_INET:
85043 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
85044 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
85045 case AF_INET6:
85046 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
85047 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
85048 }
85049 return 0;
85050 }
85051 @@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
85052 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
85053 const struct sockaddr *src)
85054 {
85055 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
85056 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
85057 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
85058
85059 dsin->sin_family = ssin->sin_family;
85060 @@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
85061 if (sa->sa_family != AF_INET6)
85062 return 0;
85063
85064 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
85065 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
85066 }
85067
85068 #endif /* _LINUX_SUNRPC_ADDR_H */
85069 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
85070 index 70736b9..37f33db 100644
85071 --- a/include/linux/sunrpc/clnt.h
85072 +++ b/include/linux/sunrpc/clnt.h
85073 @@ -97,7 +97,7 @@ struct rpc_procinfo {
85074 unsigned int p_timer; /* Which RTT timer to use */
85075 u32 p_statidx; /* Which procedure to account */
85076 const char * p_name; /* name of procedure */
85077 -};
85078 +} __do_const;
85079
85080 #ifdef __KERNEL__
85081
85082 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
85083 index 2167846..0648fc3 100644
85084 --- a/include/linux/sunrpc/svc.h
85085 +++ b/include/linux/sunrpc/svc.h
85086 @@ -416,7 +416,7 @@ struct svc_procedure {
85087 unsigned int pc_count; /* call count */
85088 unsigned int pc_cachetype; /* cache info (NFS) */
85089 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85090 -};
85091 +} __do_const;
85092
85093 /*
85094 * Function prototypes.
85095 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
85096 index 975da75..318c083 100644
85097 --- a/include/linux/sunrpc/svc_rdma.h
85098 +++ b/include/linux/sunrpc/svc_rdma.h
85099 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
85100 extern unsigned int svcrdma_max_requests;
85101 extern unsigned int svcrdma_max_req_size;
85102
85103 -extern atomic_t rdma_stat_recv;
85104 -extern atomic_t rdma_stat_read;
85105 -extern atomic_t rdma_stat_write;
85106 -extern atomic_t rdma_stat_sq_starve;
85107 -extern atomic_t rdma_stat_rq_starve;
85108 -extern atomic_t rdma_stat_rq_poll;
85109 -extern atomic_t rdma_stat_rq_prod;
85110 -extern atomic_t rdma_stat_sq_poll;
85111 -extern atomic_t rdma_stat_sq_prod;
85112 +extern atomic_unchecked_t rdma_stat_recv;
85113 +extern atomic_unchecked_t rdma_stat_read;
85114 +extern atomic_unchecked_t rdma_stat_write;
85115 +extern atomic_unchecked_t rdma_stat_sq_starve;
85116 +extern atomic_unchecked_t rdma_stat_rq_starve;
85117 +extern atomic_unchecked_t rdma_stat_rq_poll;
85118 +extern atomic_unchecked_t rdma_stat_rq_prod;
85119 +extern atomic_unchecked_t rdma_stat_sq_poll;
85120 +extern atomic_unchecked_t rdma_stat_sq_prod;
85121
85122 #define RPCRDMA_VERSION 1
85123
85124 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
85125 index 8d71d65..f79586e 100644
85126 --- a/include/linux/sunrpc/svcauth.h
85127 +++ b/include/linux/sunrpc/svcauth.h
85128 @@ -120,7 +120,7 @@ struct auth_ops {
85129 int (*release)(struct svc_rqst *rq);
85130 void (*domain_release)(struct auth_domain *);
85131 int (*set_client)(struct svc_rqst *rq);
85132 -};
85133 +} __do_const;
85134
85135 #define SVC_GARBAGE 1
85136 #define SVC_SYSERR 2
85137 diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
85138 index e7a018e..49f8b17 100644
85139 --- a/include/linux/swiotlb.h
85140 +++ b/include/linux/swiotlb.h
85141 @@ -60,7 +60,8 @@ extern void
85142
85143 extern void
85144 swiotlb_free_coherent(struct device *hwdev, size_t size,
85145 - void *vaddr, dma_addr_t dma_handle);
85146 + void *vaddr, dma_addr_t dma_handle,
85147 + struct dma_attrs *attrs);
85148
85149 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
85150 unsigned long offset, size_t size,
85151 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
85152 index bda9b81..629e06e 100644
85153 --- a/include/linux/syscalls.h
85154 +++ b/include/linux/syscalls.h
85155 @@ -99,10 +99,16 @@ union bpf_attr;
85156 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
85157
85158 #define __SC_DECL(t, a) t a
85159 +#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))
85160 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
85161 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
85162 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
85163 -#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
85164 +#define __SC_LONG(t, a) __typeof( \
85165 + __builtin_choose_expr( \
85166 + sizeof(t) > sizeof(int), \
85167 + (t) 0, \
85168 + __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
85169 + )) a
85170 #define __SC_CAST(t, a) (t) a
85171 #define __SC_ARGS(t, a) a
85172 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
85173 @@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
85174 asmlinkage long sys_fsync(unsigned int fd);
85175 asmlinkage long sys_fdatasync(unsigned int fd);
85176 asmlinkage long sys_bdflush(int func, long data);
85177 -asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
85178 - char __user *type, unsigned long flags,
85179 +asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
85180 + const char __user *type, unsigned long flags,
85181 void __user *data);
85182 -asmlinkage long sys_umount(char __user *name, int flags);
85183 -asmlinkage long sys_oldumount(char __user *name);
85184 +asmlinkage long sys_umount(const char __user *name, int flags);
85185 +asmlinkage long sys_oldumount(const char __user *name);
85186 asmlinkage long sys_truncate(const char __user *path, long length);
85187 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
85188 asmlinkage long sys_stat(const char __user *filename,
85189 @@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
85190 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
85191 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
85192 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
85193 - struct sockaddr __user *, int);
85194 + struct sockaddr __user *, int) __intentional_overflow(0);
85195 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
85196 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
85197 unsigned int vlen, unsigned flags);
85198 diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85199 index 27b3b0b..e093dd9 100644
85200 --- a/include/linux/syscore_ops.h
85201 +++ b/include/linux/syscore_ops.h
85202 @@ -16,7 +16,7 @@ struct syscore_ops {
85203 int (*suspend)(void);
85204 void (*resume)(void);
85205 void (*shutdown)(void);
85206 -};
85207 +} __do_const;
85208
85209 extern void register_syscore_ops(struct syscore_ops *ops);
85210 extern void unregister_syscore_ops(struct syscore_ops *ops);
85211 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85212 index b7361f8..341a15a 100644
85213 --- a/include/linux/sysctl.h
85214 +++ b/include/linux/sysctl.h
85215 @@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85216
85217 extern int proc_dostring(struct ctl_table *, int,
85218 void __user *, size_t *, loff_t *);
85219 +extern int proc_dostring_modpriv(struct ctl_table *, int,
85220 + void __user *, size_t *, loff_t *);
85221 extern int proc_dointvec(struct ctl_table *, int,
85222 void __user *, size_t *, loff_t *);
85223 extern int proc_dointvec_minmax(struct ctl_table *, int,
85224 @@ -113,7 +115,8 @@ struct ctl_table
85225 struct ctl_table_poll *poll;
85226 void *extra1;
85227 void *extra2;
85228 -};
85229 +} __do_const __randomize_layout;
85230 +typedef struct ctl_table __no_const ctl_table_no_const;
85231
85232 struct ctl_node {
85233 struct rb_node node;
85234 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85235 index f97d0db..c1187dc 100644
85236 --- a/include/linux/sysfs.h
85237 +++ b/include/linux/sysfs.h
85238 @@ -34,7 +34,8 @@ struct attribute {
85239 struct lock_class_key *key;
85240 struct lock_class_key skey;
85241 #endif
85242 -};
85243 +} __do_const;
85244 +typedef struct attribute __no_const attribute_no_const;
85245
85246 /**
85247 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85248 @@ -63,7 +64,8 @@ struct attribute_group {
85249 struct attribute *, int);
85250 struct attribute **attrs;
85251 struct bin_attribute **bin_attrs;
85252 -};
85253 +} __do_const;
85254 +typedef struct attribute_group __no_const attribute_group_no_const;
85255
85256 /**
85257 * Use these macros to make defining attributes easier. See include/linux/device.h
85258 @@ -128,7 +130,8 @@ struct bin_attribute {
85259 char *, loff_t, size_t);
85260 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85261 struct vm_area_struct *vma);
85262 -};
85263 +} __do_const;
85264 +typedef struct bin_attribute __no_const bin_attribute_no_const;
85265
85266 /**
85267 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85268 diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85269 index 387fa7d..3fcde6b 100644
85270 --- a/include/linux/sysrq.h
85271 +++ b/include/linux/sysrq.h
85272 @@ -16,6 +16,7 @@
85273
85274 #include <linux/errno.h>
85275 #include <linux/types.h>
85276 +#include <linux/compiler.h>
85277
85278 /* Possible values of bitmask for enabling sysrq functions */
85279 /* 0x0001 is reserved for enable everything */
85280 @@ -33,7 +34,7 @@ struct sysrq_key_op {
85281 char *help_msg;
85282 char *action_msg;
85283 int enable_mask;
85284 -};
85285 +} __do_const;
85286
85287 #ifdef CONFIG_MAGIC_SYSRQ
85288
85289 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85290 index ff307b5..f1a4468 100644
85291 --- a/include/linux/thread_info.h
85292 +++ b/include/linux/thread_info.h
85293 @@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85294 #error "no set_restore_sigmask() provided and default one won't work"
85295 #endif
85296
85297 +extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85298 +
85299 +static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85300 +{
85301 + __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85302 +}
85303 +
85304 #endif /* __KERNEL__ */
85305
85306 #endif /* _LINUX_THREAD_INFO_H */
85307 diff --git a/include/linux/tty.h b/include/linux/tty.h
85308 index 5171ef8..1048d83e 100644
85309 --- a/include/linux/tty.h
85310 +++ b/include/linux/tty.h
85311 @@ -202,7 +202,7 @@ struct tty_port {
85312 const struct tty_port_operations *ops; /* Port operations */
85313 spinlock_t lock; /* Lock protecting tty field */
85314 int blocked_open; /* Waiting to open */
85315 - int count; /* Usage count */
85316 + atomic_t count; /* Usage count */
85317 wait_queue_head_t open_wait; /* Open waiters */
85318 wait_queue_head_t close_wait; /* Close waiters */
85319 wait_queue_head_t delta_msr_wait; /* Modem status change */
85320 @@ -290,7 +290,7 @@ struct tty_struct {
85321 /* If the tty has a pending do_SAK, queue it here - akpm */
85322 struct work_struct SAK_work;
85323 struct tty_port *port;
85324 -};
85325 +} __randomize_layout;
85326
85327 /* Each of a tty's open files has private_data pointing to tty_file_private */
85328 struct tty_file_private {
85329 @@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85330 struct tty_struct *tty, struct file *filp);
85331 static inline int tty_port_users(struct tty_port *port)
85332 {
85333 - return port->count + port->blocked_open;
85334 + return atomic_read(&port->count) + port->blocked_open;
85335 }
85336
85337 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85338 diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85339 index 92e337c..f46757b 100644
85340 --- a/include/linux/tty_driver.h
85341 +++ b/include/linux/tty_driver.h
85342 @@ -291,7 +291,7 @@ struct tty_operations {
85343 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85344 #endif
85345 const struct file_operations *proc_fops;
85346 -};
85347 +} __do_const __randomize_layout;
85348
85349 struct tty_driver {
85350 int magic; /* magic number for this structure */
85351 @@ -325,7 +325,7 @@ struct tty_driver {
85352
85353 const struct tty_operations *ops;
85354 struct list_head tty_drivers;
85355 -};
85356 +} __randomize_layout;
85357
85358 extern struct list_head tty_drivers;
85359
85360 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85361 index 00c9d68..bc0188b 100644
85362 --- a/include/linux/tty_ldisc.h
85363 +++ b/include/linux/tty_ldisc.h
85364 @@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85365
85366 struct module *owner;
85367
85368 - int refcount;
85369 + atomic_t refcount;
85370 };
85371
85372 struct tty_ldisc {
85373 diff --git a/include/linux/types.h b/include/linux/types.h
85374 index a0bb704..f511c77 100644
85375 --- a/include/linux/types.h
85376 +++ b/include/linux/types.h
85377 @@ -177,10 +177,26 @@ typedef struct {
85378 int counter;
85379 } atomic_t;
85380
85381 +#ifdef CONFIG_PAX_REFCOUNT
85382 +typedef struct {
85383 + int counter;
85384 +} atomic_unchecked_t;
85385 +#else
85386 +typedef atomic_t atomic_unchecked_t;
85387 +#endif
85388 +
85389 #ifdef CONFIG_64BIT
85390 typedef struct {
85391 long counter;
85392 } atomic64_t;
85393 +
85394 +#ifdef CONFIG_PAX_REFCOUNT
85395 +typedef struct {
85396 + long counter;
85397 +} atomic64_unchecked_t;
85398 +#else
85399 +typedef atomic64_t atomic64_unchecked_t;
85400 +#endif
85401 #endif
85402
85403 struct list_head {
85404 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85405 index ecd3319..8a36ded 100644
85406 --- a/include/linux/uaccess.h
85407 +++ b/include/linux/uaccess.h
85408 @@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85409 long ret; \
85410 mm_segment_t old_fs = get_fs(); \
85411 \
85412 - set_fs(KERNEL_DS); \
85413 pagefault_disable(); \
85414 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85415 - pagefault_enable(); \
85416 + set_fs(KERNEL_DS); \
85417 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85418 set_fs(old_fs); \
85419 + pagefault_enable(); \
85420 ret; \
85421 })
85422
85423 diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85424 index 2d1f9b6..d7a9fce 100644
85425 --- a/include/linux/uidgid.h
85426 +++ b/include/linux/uidgid.h
85427 @@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85428
85429 #endif /* CONFIG_USER_NS */
85430
85431 +#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85432 +#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85433 +#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85434 +#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85435 +
85436 #endif /* _LINUX_UIDGID_H */
85437 diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85438 index baa8171..9ca98ba 100644
85439 --- a/include/linux/uio_driver.h
85440 +++ b/include/linux/uio_driver.h
85441 @@ -67,7 +67,7 @@ struct uio_device {
85442 struct module *owner;
85443 struct device *dev;
85444 int minor;
85445 - atomic_t event;
85446 + atomic_unchecked_t event;
85447 struct fasync_struct *async_queue;
85448 wait_queue_head_t wait;
85449 struct uio_info *info;
85450 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85451 index 99c1b4d..562e6f3 100644
85452 --- a/include/linux/unaligned/access_ok.h
85453 +++ b/include/linux/unaligned/access_ok.h
85454 @@ -4,34 +4,34 @@
85455 #include <linux/kernel.h>
85456 #include <asm/byteorder.h>
85457
85458 -static inline u16 get_unaligned_le16(const void *p)
85459 +static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85460 {
85461 - return le16_to_cpup((__le16 *)p);
85462 + return le16_to_cpup((const __le16 *)p);
85463 }
85464
85465 -static inline u32 get_unaligned_le32(const void *p)
85466 +static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85467 {
85468 - return le32_to_cpup((__le32 *)p);
85469 + return le32_to_cpup((const __le32 *)p);
85470 }
85471
85472 -static inline u64 get_unaligned_le64(const void *p)
85473 +static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85474 {
85475 - return le64_to_cpup((__le64 *)p);
85476 + return le64_to_cpup((const __le64 *)p);
85477 }
85478
85479 -static inline u16 get_unaligned_be16(const void *p)
85480 +static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85481 {
85482 - return be16_to_cpup((__be16 *)p);
85483 + return be16_to_cpup((const __be16 *)p);
85484 }
85485
85486 -static inline u32 get_unaligned_be32(const void *p)
85487 +static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85488 {
85489 - return be32_to_cpup((__be32 *)p);
85490 + return be32_to_cpup((const __be32 *)p);
85491 }
85492
85493 -static inline u64 get_unaligned_be64(const void *p)
85494 +static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85495 {
85496 - return be64_to_cpup((__be64 *)p);
85497 + return be64_to_cpup((const __be64 *)p);
85498 }
85499
85500 static inline void put_unaligned_le16(u16 val, void *p)
85501 diff --git a/include/linux/usb.h b/include/linux/usb.h
85502 index 447a7e2..9cea7e9 100644
85503 --- a/include/linux/usb.h
85504 +++ b/include/linux/usb.h
85505 @@ -571,7 +571,7 @@ struct usb_device {
85506 int maxchild;
85507
85508 u32 quirks;
85509 - atomic_t urbnum;
85510 + atomic_unchecked_t urbnum;
85511
85512 unsigned long active_duration;
85513
85514 @@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85515
85516 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85517 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85518 - void *data, __u16 size, int timeout);
85519 + void *data, __u16 size, int timeout) __intentional_overflow(-1);
85520 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85521 void *data, int len, int *actual_length, int timeout);
85522 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85523 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85524 index d5952bb..9a626d4 100644
85525 --- a/include/linux/usb/renesas_usbhs.h
85526 +++ b/include/linux/usb/renesas_usbhs.h
85527 @@ -39,7 +39,7 @@ enum {
85528 */
85529 struct renesas_usbhs_driver_callback {
85530 int (*notify_hotplug)(struct platform_device *pdev);
85531 -};
85532 +} __no_const;
85533
85534 /*
85535 * callback functions for platform
85536 diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85537 index 9f3579f..3b2afa5 100644
85538 --- a/include/linux/user_namespace.h
85539 +++ b/include/linux/user_namespace.h
85540 @@ -38,7 +38,7 @@ struct user_namespace {
85541 struct key *persistent_keyring_register;
85542 struct rw_semaphore persistent_keyring_register_sem;
85543 #endif
85544 -};
85545 +} __randomize_layout;
85546
85547 extern struct user_namespace init_user_ns;
85548
85549 diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85550 index 239e277..22a5cf5 100644
85551 --- a/include/linux/utsname.h
85552 +++ b/include/linux/utsname.h
85553 @@ -24,7 +24,7 @@ struct uts_namespace {
85554 struct new_utsname name;
85555 struct user_namespace *user_ns;
85556 unsigned int proc_inum;
85557 -};
85558 +} __randomize_layout;
85559 extern struct uts_namespace init_uts_ns;
85560
85561 #ifdef CONFIG_UTS_NS
85562 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85563 index 6f8fbcf..4efc177 100644
85564 --- a/include/linux/vermagic.h
85565 +++ b/include/linux/vermagic.h
85566 @@ -25,9 +25,42 @@
85567 #define MODULE_ARCH_VERMAGIC ""
85568 #endif
85569
85570 +#ifdef CONFIG_PAX_REFCOUNT
85571 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
85572 +#else
85573 +#define MODULE_PAX_REFCOUNT ""
85574 +#endif
85575 +
85576 +#ifdef CONSTIFY_PLUGIN
85577 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85578 +#else
85579 +#define MODULE_CONSTIFY_PLUGIN ""
85580 +#endif
85581 +
85582 +#ifdef STACKLEAK_PLUGIN
85583 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85584 +#else
85585 +#define MODULE_STACKLEAK_PLUGIN ""
85586 +#endif
85587 +
85588 +#ifdef RANDSTRUCT_PLUGIN
85589 +#include <generated/randomize_layout_hash.h>
85590 +#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85591 +#else
85592 +#define MODULE_RANDSTRUCT_PLUGIN
85593 +#endif
85594 +
85595 +#ifdef CONFIG_GRKERNSEC
85596 +#define MODULE_GRSEC "GRSEC "
85597 +#else
85598 +#define MODULE_GRSEC ""
85599 +#endif
85600 +
85601 #define VERMAGIC_STRING \
85602 UTS_RELEASE " " \
85603 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85604 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85605 - MODULE_ARCH_VERMAGIC
85606 + MODULE_ARCH_VERMAGIC \
85607 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85608 + MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85609
85610 diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85611 index b483abd..af305ad 100644
85612 --- a/include/linux/vga_switcheroo.h
85613 +++ b/include/linux/vga_switcheroo.h
85614 @@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85615
85616 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85617
85618 -int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85619 +int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85620 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85621 -int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85622 +int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85623 #else
85624
85625 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85626 @@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85627
85628 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85629
85630 -static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85631 +static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85632 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85633 -static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85634 +static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85635
85636 #endif
85637 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85638 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85639 index b87696f..1d11de7 100644
85640 --- a/include/linux/vmalloc.h
85641 +++ b/include/linux/vmalloc.h
85642 @@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85643 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85644 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85645 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85646 +
85647 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85648 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85649 +#endif
85650 +
85651 /* bits [20..32] reserved for arch specific ioremap internals */
85652
85653 /*
85654 @@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85655 unsigned long flags, pgprot_t prot);
85656 extern void vunmap(const void *addr);
85657
85658 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85659 +extern void unmap_process_stacks(struct task_struct *task);
85660 +#endif
85661 +
85662 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85663 unsigned long uaddr, void *kaddr,
85664 unsigned long size);
85665 @@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85666
85667 /* for /dev/kmem */
85668 extern long vread(char *buf, char *addr, unsigned long count);
85669 -extern long vwrite(char *buf, char *addr, unsigned long count);
85670 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85671
85672 /*
85673 * Internals. Dont't use..
85674 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85675 index 82e7db7..f8ce3d0 100644
85676 --- a/include/linux/vmstat.h
85677 +++ b/include/linux/vmstat.h
85678 @@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85679 /*
85680 * Zone based page accounting with per cpu differentials.
85681 */
85682 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85683 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85684
85685 static inline void zone_page_state_add(long x, struct zone *zone,
85686 enum zone_stat_item item)
85687 {
85688 - atomic_long_add(x, &zone->vm_stat[item]);
85689 - atomic_long_add(x, &vm_stat[item]);
85690 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85691 + atomic_long_add_unchecked(x, &vm_stat[item]);
85692 }
85693
85694 -static inline unsigned long global_page_state(enum zone_stat_item item)
85695 +static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85696 {
85697 - long x = atomic_long_read(&vm_stat[item]);
85698 + long x = atomic_long_read_unchecked(&vm_stat[item]);
85699 #ifdef CONFIG_SMP
85700 if (x < 0)
85701 x = 0;
85702 @@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85703 return x;
85704 }
85705
85706 -static inline unsigned long zone_page_state(struct zone *zone,
85707 +static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85708 enum zone_stat_item item)
85709 {
85710 - long x = atomic_long_read(&zone->vm_stat[item]);
85711 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85712 #ifdef CONFIG_SMP
85713 if (x < 0)
85714 x = 0;
85715 @@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85716 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85717 enum zone_stat_item item)
85718 {
85719 - long x = atomic_long_read(&zone->vm_stat[item]);
85720 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85721
85722 #ifdef CONFIG_SMP
85723 int cpu;
85724 @@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85725
85726 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85727 {
85728 - atomic_long_inc(&zone->vm_stat[item]);
85729 - atomic_long_inc(&vm_stat[item]);
85730 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
85731 + atomic_long_inc_unchecked(&vm_stat[item]);
85732 }
85733
85734 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85735 {
85736 - atomic_long_dec(&zone->vm_stat[item]);
85737 - atomic_long_dec(&vm_stat[item]);
85738 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
85739 + atomic_long_dec_unchecked(&vm_stat[item]);
85740 }
85741
85742 static inline void __inc_zone_page_state(struct page *page,
85743 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85744 index 91b0a68..0e9adf6 100644
85745 --- a/include/linux/xattr.h
85746 +++ b/include/linux/xattr.h
85747 @@ -28,7 +28,7 @@ struct xattr_handler {
85748 size_t size, int handler_flags);
85749 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
85750 size_t size, int flags, int handler_flags);
85751 -};
85752 +} __do_const;
85753
85754 struct xattr {
85755 const char *name;
85756 @@ -37,6 +37,9 @@ struct xattr {
85757 };
85758
85759 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
85760 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
85761 +ssize_t pax_getxattr(struct dentry *, void *, size_t);
85762 +#endif
85763 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
85764 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
85765 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
85766 diff --git a/include/linux/zlib.h b/include/linux/zlib.h
85767 index 92dbbd3..13ab0b3 100644
85768 --- a/include/linux/zlib.h
85769 +++ b/include/linux/zlib.h
85770 @@ -31,6 +31,7 @@
85771 #define _ZLIB_H
85772
85773 #include <linux/zconf.h>
85774 +#include <linux/compiler.h>
85775
85776 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
85777 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
85778 @@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
85779
85780 /* basic functions */
85781
85782 -extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
85783 +extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
85784 /*
85785 Returns the number of bytes that needs to be allocated for a per-
85786 stream workspace with the specified parameters. A pointer to this
85787 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
85788 index eb76cfd..9fd0e7c 100644
85789 --- a/include/media/v4l2-dev.h
85790 +++ b/include/media/v4l2-dev.h
85791 @@ -75,7 +75,7 @@ struct v4l2_file_operations {
85792 int (*mmap) (struct file *, struct vm_area_struct *);
85793 int (*open) (struct file *);
85794 int (*release) (struct file *);
85795 -};
85796 +} __do_const;
85797
85798 /*
85799 * Newer version of video_device, handled by videodev2.c
85800 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
85801 index ffb69da..040393e 100644
85802 --- a/include/media/v4l2-device.h
85803 +++ b/include/media/v4l2-device.h
85804 @@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
85805 this function returns 0. If the name ends with a digit (e.g. cx18),
85806 then the name will be set to cx18-0 since cx180 looks really odd. */
85807 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
85808 - atomic_t *instance);
85809 + atomic_unchecked_t *instance);
85810
85811 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
85812 Since the parent disappears this ensures that v4l2_dev doesn't have an
85813 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
85814 index 2a25dec..bf6dd8a 100644
85815 --- a/include/net/9p/transport.h
85816 +++ b/include/net/9p/transport.h
85817 @@ -62,7 +62,7 @@ struct p9_trans_module {
85818 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
85819 int (*zc_request)(struct p9_client *, struct p9_req_t *,
85820 char *, char *, int , int, int, int);
85821 -};
85822 +} __do_const;
85823
85824 void v9fs_register_trans(struct p9_trans_module *m);
85825 void v9fs_unregister_trans(struct p9_trans_module *m);
85826 diff --git a/include/net/af_unix.h b/include/net/af_unix.h
85827 index a175ba4..196eb8242 100644
85828 --- a/include/net/af_unix.h
85829 +++ b/include/net/af_unix.h
85830 @@ -36,7 +36,7 @@ struct unix_skb_parms {
85831 u32 secid; /* Security ID */
85832 #endif
85833 u32 consumed;
85834 -};
85835 +} __randomize_layout;
85836
85837 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
85838 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
85839 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
85840 index ead99f0..6263c4b 100644
85841 --- a/include/net/bluetooth/l2cap.h
85842 +++ b/include/net/bluetooth/l2cap.h
85843 @@ -608,7 +608,7 @@ struct l2cap_ops {
85844 unsigned char *kdata,
85845 struct iovec *iov,
85846 int len);
85847 -};
85848 +} __do_const;
85849
85850 struct l2cap_conn {
85851 struct hci_conn *hcon;
85852 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
85853 index f2ae33d..c457cf0 100644
85854 --- a/include/net/caif/cfctrl.h
85855 +++ b/include/net/caif/cfctrl.h
85856 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
85857 void (*radioset_rsp)(void);
85858 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
85859 struct cflayer *client_layer);
85860 -};
85861 +} __no_const;
85862
85863 /* Link Setup Parameters for CAIF-Links. */
85864 struct cfctrl_link_param {
85865 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
85866 struct cfctrl {
85867 struct cfsrvl serv;
85868 struct cfctrl_rsp res;
85869 - atomic_t req_seq_no;
85870 - atomic_t rsp_seq_no;
85871 + atomic_unchecked_t req_seq_no;
85872 + atomic_unchecked_t rsp_seq_no;
85873 struct list_head list;
85874 /* Protects from simultaneous access to first_req list */
85875 spinlock_t info_list_lock;
85876 diff --git a/include/net/flow.h b/include/net/flow.h
85877 index 8109a15..504466d 100644
85878 --- a/include/net/flow.h
85879 +++ b/include/net/flow.h
85880 @@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
85881
85882 void flow_cache_flush(struct net *net);
85883 void flow_cache_flush_deferred(struct net *net);
85884 -extern atomic_t flow_cache_genid;
85885 +extern atomic_unchecked_t flow_cache_genid;
85886
85887 #endif
85888 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
85889 index af10c2c..a431cc5 100644
85890 --- a/include/net/genetlink.h
85891 +++ b/include/net/genetlink.h
85892 @@ -120,7 +120,7 @@ struct genl_ops {
85893 u8 cmd;
85894 u8 internal_flags;
85895 u8 flags;
85896 -};
85897 +} __do_const;
85898
85899 int __genl_register_family(struct genl_family *family);
85900
85901 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
85902 index 734d9b5..48a9a4b 100644
85903 --- a/include/net/gro_cells.h
85904 +++ b/include/net/gro_cells.h
85905 @@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
85906 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
85907
85908 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
85909 - atomic_long_inc(&dev->rx_dropped);
85910 + atomic_long_inc_unchecked(&dev->rx_dropped);
85911 kfree_skb(skb);
85912 return;
85913 }
85914 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
85915 index 848e85c..051c7de 100644
85916 --- a/include/net/inet_connection_sock.h
85917 +++ b/include/net/inet_connection_sock.h
85918 @@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
85919 int (*bind_conflict)(const struct sock *sk,
85920 const struct inet_bind_bucket *tb, bool relax);
85921 void (*mtu_reduced)(struct sock *sk);
85922 -};
85923 +} __do_const;
85924
85925 /** inet_connection_sock - INET connection oriented sock
85926 *
85927 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
85928 index 80479ab..0c3f647 100644
85929 --- a/include/net/inetpeer.h
85930 +++ b/include/net/inetpeer.h
85931 @@ -47,7 +47,7 @@ struct inet_peer {
85932 */
85933 union {
85934 struct {
85935 - atomic_t rid; /* Frag reception counter */
85936 + atomic_unchecked_t rid; /* Frag reception counter */
85937 };
85938 struct rcu_head rcu;
85939 struct inet_peer *gc_next;
85940 diff --git a/include/net/ip.h b/include/net/ip.h
85941 index 0bb6207..a8878af 100644
85942 --- a/include/net/ip.h
85943 +++ b/include/net/ip.h
85944 @@ -316,7 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
85945 }
85946 }
85947
85948 -u32 ip_idents_reserve(u32 hash, int segs);
85949 +u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
85950 void __ip_select_ident(struct iphdr *iph, int segs);
85951
85952 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
85953 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
85954 index dc9d2a2..d985691 100644
85955 --- a/include/net/ip_fib.h
85956 +++ b/include/net/ip_fib.h
85957 @@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
85958
85959 #define FIB_RES_SADDR(net, res) \
85960 ((FIB_RES_NH(res).nh_saddr_genid == \
85961 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
85962 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
85963 FIB_RES_NH(res).nh_saddr : \
85964 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
85965 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
85966 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
85967 index 615b20b..fd4cbd8 100644
85968 --- a/include/net/ip_vs.h
85969 +++ b/include/net/ip_vs.h
85970 @@ -534,7 +534,7 @@ struct ip_vs_conn {
85971 struct ip_vs_conn *control; /* Master control connection */
85972 atomic_t n_control; /* Number of controlled ones */
85973 struct ip_vs_dest *dest; /* real server */
85974 - atomic_t in_pkts; /* incoming packet counter */
85975 + atomic_unchecked_t in_pkts; /* incoming packet counter */
85976
85977 /* Packet transmitter for different forwarding methods. If it
85978 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
85979 @@ -682,7 +682,7 @@ struct ip_vs_dest {
85980 __be16 port; /* port number of the server */
85981 union nf_inet_addr addr; /* IP address of the server */
85982 volatile unsigned int flags; /* dest status flags */
85983 - atomic_t conn_flags; /* flags to copy to conn */
85984 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
85985 atomic_t weight; /* server weight */
85986
85987 atomic_t refcnt; /* reference counter */
85988 @@ -928,11 +928,11 @@ struct netns_ipvs {
85989 /* ip_vs_lblc */
85990 int sysctl_lblc_expiration;
85991 struct ctl_table_header *lblc_ctl_header;
85992 - struct ctl_table *lblc_ctl_table;
85993 + ctl_table_no_const *lblc_ctl_table;
85994 /* ip_vs_lblcr */
85995 int sysctl_lblcr_expiration;
85996 struct ctl_table_header *lblcr_ctl_header;
85997 - struct ctl_table *lblcr_ctl_table;
85998 + ctl_table_no_const *lblcr_ctl_table;
85999 /* ip_vs_est */
86000 struct list_head est_list; /* estimator list */
86001 spinlock_t est_lock;
86002 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
86003 index 8d4f588..2e37ad2 100644
86004 --- a/include/net/irda/ircomm_tty.h
86005 +++ b/include/net/irda/ircomm_tty.h
86006 @@ -33,6 +33,7 @@
86007 #include <linux/termios.h>
86008 #include <linux/timer.h>
86009 #include <linux/tty.h> /* struct tty_struct */
86010 +#include <asm/local.h>
86011
86012 #include <net/irda/irias_object.h>
86013 #include <net/irda/ircomm_core.h>
86014 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
86015 index 714cc9a..ea05f3e 100644
86016 --- a/include/net/iucv/af_iucv.h
86017 +++ b/include/net/iucv/af_iucv.h
86018 @@ -149,7 +149,7 @@ struct iucv_skb_cb {
86019 struct iucv_sock_list {
86020 struct hlist_head head;
86021 rwlock_t lock;
86022 - atomic_t autobind_name;
86023 + atomic_unchecked_t autobind_name;
86024 };
86025
86026 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
86027 diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
86028 index f3be818..bf46196 100644
86029 --- a/include/net/llc_c_ac.h
86030 +++ b/include/net/llc_c_ac.h
86031 @@ -87,7 +87,7 @@
86032 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
86033 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
86034
86035 -typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86036 +typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
86037
86038 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
86039 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
86040 diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
86041 index 3948cf1..83b28c4 100644
86042 --- a/include/net/llc_c_ev.h
86043 +++ b/include/net/llc_c_ev.h
86044 @@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
86045 return (struct llc_conn_state_ev *)skb->cb;
86046 }
86047
86048 -typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86049 -typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86050 +typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
86051 +typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
86052
86053 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
86054 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
86055 diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
86056 index 0e79cfb..f46db31 100644
86057 --- a/include/net/llc_c_st.h
86058 +++ b/include/net/llc_c_st.h
86059 @@ -37,7 +37,7 @@ struct llc_conn_state_trans {
86060 u8 next_state;
86061 llc_conn_ev_qfyr_t *ev_qualifiers;
86062 llc_conn_action_t *ev_actions;
86063 -};
86064 +} __do_const;
86065
86066 struct llc_conn_state {
86067 u8 current_state;
86068 diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
86069 index a61b98c..aade1eb 100644
86070 --- a/include/net/llc_s_ac.h
86071 +++ b/include/net/llc_s_ac.h
86072 @@ -23,7 +23,7 @@
86073 #define SAP_ACT_TEST_IND 9
86074
86075 /* All action functions must look like this */
86076 -typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86077 +typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86078
86079 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
86080 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
86081 diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
86082 index 567c681..cd73ac02 100644
86083 --- a/include/net/llc_s_st.h
86084 +++ b/include/net/llc_s_st.h
86085 @@ -20,7 +20,7 @@ struct llc_sap_state_trans {
86086 llc_sap_ev_t ev;
86087 u8 next_state;
86088 llc_sap_action_t *ev_actions;
86089 -};
86090 +} __do_const;
86091
86092 struct llc_sap_state {
86093 u8 curr_state;
86094 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
86095 index a9de1da..df72057 100644
86096 --- a/include/net/mac80211.h
86097 +++ b/include/net/mac80211.h
86098 @@ -4645,7 +4645,7 @@ struct rate_control_ops {
86099 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
86100
86101 u32 (*get_expected_throughput)(void *priv_sta);
86102 -};
86103 +} __do_const;
86104
86105 static inline int rate_supported(struct ieee80211_sta *sta,
86106 enum ieee80211_band band,
86107 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
86108 index f60558d..e5ed9bd 100644
86109 --- a/include/net/neighbour.h
86110 +++ b/include/net/neighbour.h
86111 @@ -163,7 +163,7 @@ struct neigh_ops {
86112 void (*error_report)(struct neighbour *, struct sk_buff *);
86113 int (*output)(struct neighbour *, struct sk_buff *);
86114 int (*connected_output)(struct neighbour *, struct sk_buff *);
86115 -};
86116 +} __do_const;
86117
86118 struct pneigh_entry {
86119 struct pneigh_entry *next;
86120 @@ -217,7 +217,7 @@ struct neigh_table {
86121 struct neigh_statistics __percpu *stats;
86122 struct neigh_hash_table __rcu *nht;
86123 struct pneigh_entry **phash_buckets;
86124 -};
86125 +} __randomize_layout;
86126
86127 static inline int neigh_parms_family(struct neigh_parms *p)
86128 {
86129 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
86130 index e0d6466..e2f3003 100644
86131 --- a/include/net/net_namespace.h
86132 +++ b/include/net/net_namespace.h
86133 @@ -129,8 +129,8 @@ struct net {
86134 struct netns_ipvs *ipvs;
86135 #endif
86136 struct sock *diag_nlsk;
86137 - atomic_t fnhe_genid;
86138 -};
86139 + atomic_unchecked_t fnhe_genid;
86140 +} __randomize_layout;
86141
86142 #include <linux/seq_file_net.h>
86143
86144 @@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
86145 #define __net_init __init
86146 #define __net_exit __exit_refok
86147 #define __net_initdata __initdata
86148 +#ifdef CONSTIFY_PLUGIN
86149 #define __net_initconst __initconst
86150 +#else
86151 +#define __net_initconst __initdata
86152 +#endif
86153 #endif
86154
86155 struct pernet_operations {
86156 @@ -296,7 +300,7 @@ struct pernet_operations {
86157 void (*exit_batch)(struct list_head *net_exit_list);
86158 int *id;
86159 size_t size;
86160 -};
86161 +} __do_const;
86162
86163 /*
86164 * Use these carefully. If you implement a network device and it
86165 @@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
86166
86167 static inline int rt_genid_ipv4(struct net *net)
86168 {
86169 - return atomic_read(&net->ipv4.rt_genid);
86170 + return atomic_read_unchecked(&net->ipv4.rt_genid);
86171 }
86172
86173 static inline void rt_genid_bump_ipv4(struct net *net)
86174 {
86175 - atomic_inc(&net->ipv4.rt_genid);
86176 + atomic_inc_unchecked(&net->ipv4.rt_genid);
86177 }
86178
86179 extern void (*__fib6_flush_trees)(struct net *net);
86180 @@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
86181
86182 static inline int fnhe_genid(struct net *net)
86183 {
86184 - return atomic_read(&net->fnhe_genid);
86185 + return atomic_read_unchecked(&net->fnhe_genid);
86186 }
86187
86188 static inline void fnhe_genid_bump(struct net *net)
86189 {
86190 - atomic_inc(&net->fnhe_genid);
86191 + atomic_inc_unchecked(&net->fnhe_genid);
86192 }
86193
86194 #endif /* __NET_NET_NAMESPACE_H */
86195 diff --git a/include/net/netlink.h b/include/net/netlink.h
86196 index 7b903e1..ad9ca4b 100644
86197 --- a/include/net/netlink.h
86198 +++ b/include/net/netlink.h
86199 @@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86200 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86201 {
86202 if (mark)
86203 - skb_trim(skb, (unsigned char *) mark - skb->data);
86204 + skb_trim(skb, (const unsigned char *) mark - skb->data);
86205 }
86206
86207 /**
86208 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86209 index 29d6a94..235d3d84 100644
86210 --- a/include/net/netns/conntrack.h
86211 +++ b/include/net/netns/conntrack.h
86212 @@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86213 struct nf_proto_net {
86214 #ifdef CONFIG_SYSCTL
86215 struct ctl_table_header *ctl_table_header;
86216 - struct ctl_table *ctl_table;
86217 + ctl_table_no_const *ctl_table;
86218 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86219 struct ctl_table_header *ctl_compat_header;
86220 - struct ctl_table *ctl_compat_table;
86221 + ctl_table_no_const *ctl_compat_table;
86222 #endif
86223 #endif
86224 unsigned int users;
86225 @@ -60,7 +60,7 @@ struct nf_ip_net {
86226 struct nf_icmp_net icmpv6;
86227 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86228 struct ctl_table_header *ctl_table_header;
86229 - struct ctl_table *ctl_table;
86230 + ctl_table_no_const *ctl_table;
86231 #endif
86232 };
86233
86234 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86235 index 24945ce..f19e42f 100644
86236 --- a/include/net/netns/ipv4.h
86237 +++ b/include/net/netns/ipv4.h
86238 @@ -83,7 +83,7 @@ struct netns_ipv4 {
86239
86240 struct ping_group_range ping_group_range;
86241
86242 - atomic_t dev_addr_genid;
86243 + atomic_unchecked_t dev_addr_genid;
86244
86245 #ifdef CONFIG_SYSCTL
86246 unsigned long *sysctl_local_reserved_ports;
86247 @@ -97,6 +97,6 @@ struct netns_ipv4 {
86248 struct fib_rules_ops *mr_rules_ops;
86249 #endif
86250 #endif
86251 - atomic_t rt_genid;
86252 + atomic_unchecked_t rt_genid;
86253 };
86254 #endif
86255 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86256 index 69ae41f..4f94868 100644
86257 --- a/include/net/netns/ipv6.h
86258 +++ b/include/net/netns/ipv6.h
86259 @@ -75,8 +75,8 @@ struct netns_ipv6 {
86260 struct fib_rules_ops *mr6_rules_ops;
86261 #endif
86262 #endif
86263 - atomic_t dev_addr_genid;
86264 - atomic_t fib6_sernum;
86265 + atomic_unchecked_t dev_addr_genid;
86266 + atomic_unchecked_t fib6_sernum;
86267 };
86268
86269 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86270 diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86271 index 9da7982..099321b9 100644
86272 --- a/include/net/netns/xfrm.h
86273 +++ b/include/net/netns/xfrm.h
86274 @@ -78,7 +78,7 @@ struct netns_xfrm {
86275
86276 /* flow cache part */
86277 struct flow_cache flow_cache_global;
86278 - atomic_t flow_cache_genid;
86279 + atomic_unchecked_t flow_cache_genid;
86280 struct list_head flow_cache_gc_list;
86281 spinlock_t flow_cache_gc_lock;
86282 struct work_struct flow_cache_gc_work;
86283 diff --git a/include/net/ping.h b/include/net/ping.h
86284 index 026479b..d9b2829 100644
86285 --- a/include/net/ping.h
86286 +++ b/include/net/ping.h
86287 @@ -54,7 +54,7 @@ struct ping_iter_state {
86288
86289 extern struct proto ping_prot;
86290 #if IS_ENABLED(CONFIG_IPV6)
86291 -extern struct pingv6_ops pingv6_ops;
86292 +extern struct pingv6_ops *pingv6_ops;
86293 #endif
86294
86295 struct pingfakehdr {
86296 diff --git a/include/net/protocol.h b/include/net/protocol.h
86297 index d6fcc1f..ca277058 100644
86298 --- a/include/net/protocol.h
86299 +++ b/include/net/protocol.h
86300 @@ -49,7 +49,7 @@ struct net_protocol {
86301 * socket lookup?
86302 */
86303 icmp_strict_tag_validation:1;
86304 -};
86305 +} __do_const;
86306
86307 #if IS_ENABLED(CONFIG_IPV6)
86308 struct inet6_protocol {
86309 @@ -62,7 +62,7 @@ struct inet6_protocol {
86310 u8 type, u8 code, int offset,
86311 __be32 info);
86312 unsigned int flags; /* INET6_PROTO_xxx */
86313 -};
86314 +} __do_const;
86315
86316 #define INET6_PROTO_NOPOLICY 0x1
86317 #define INET6_PROTO_FINAL 0x2
86318 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86319 index e21b9f9..0191ef0 100644
86320 --- a/include/net/rtnetlink.h
86321 +++ b/include/net/rtnetlink.h
86322 @@ -93,7 +93,7 @@ struct rtnl_link_ops {
86323 int (*fill_slave_info)(struct sk_buff *skb,
86324 const struct net_device *dev,
86325 const struct net_device *slave_dev);
86326 -};
86327 +} __do_const;
86328
86329 int __rtnl_link_register(struct rtnl_link_ops *ops);
86330 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86331 diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86332 index 4a5b9a3..ca27d73 100644
86333 --- a/include/net/sctp/checksum.h
86334 +++ b/include/net/sctp/checksum.h
86335 @@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86336 unsigned int offset)
86337 {
86338 struct sctphdr *sh = sctp_hdr(skb);
86339 - __le32 ret, old = sh->checksum;
86340 - const struct skb_checksum_ops ops = {
86341 + __le32 ret, old = sh->checksum;
86342 + static const struct skb_checksum_ops ops = {
86343 .update = sctp_csum_update,
86344 .combine = sctp_csum_combine,
86345 };
86346 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86347 index 72a31db..aaa63d9 100644
86348 --- a/include/net/sctp/sm.h
86349 +++ b/include/net/sctp/sm.h
86350 @@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86351 typedef struct {
86352 sctp_state_fn_t *fn;
86353 const char *name;
86354 -} sctp_sm_table_entry_t;
86355 +} __do_const sctp_sm_table_entry_t;
86356
86357 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86358 * currently in use.
86359 @@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86360 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86361
86362 /* Extern declarations for major data structures. */
86363 -extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86364 +extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86365
86366
86367 /* Get the size of a DATA chunk payload. */
86368 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86369 index 4ff3f67..89ae38e 100644
86370 --- a/include/net/sctp/structs.h
86371 +++ b/include/net/sctp/structs.h
86372 @@ -509,7 +509,7 @@ struct sctp_pf {
86373 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86374 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86375 struct sctp_af *af;
86376 -};
86377 +} __do_const;
86378
86379
86380 /* Structure to track chunk fragments that have been acked, but peer
86381 diff --git a/include/net/sock.h b/include/net/sock.h
86382 index 7db3db1..a915cca 100644
86383 --- a/include/net/sock.h
86384 +++ b/include/net/sock.h
86385 @@ -355,7 +355,7 @@ struct sock {
86386 unsigned int sk_napi_id;
86387 unsigned int sk_ll_usec;
86388 #endif
86389 - atomic_t sk_drops;
86390 + atomic_unchecked_t sk_drops;
86391 int sk_rcvbuf;
86392
86393 struct sk_filter __rcu *sk_filter;
86394 @@ -1048,7 +1048,7 @@ struct proto {
86395 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86396 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86397 #endif
86398 -};
86399 +} __randomize_layout;
86400
86401 /*
86402 * Bits in struct cg_proto.flags
86403 @@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86404 return ret >> PAGE_SHIFT;
86405 }
86406
86407 -static inline long
86408 +static inline long __intentional_overflow(-1)
86409 sk_memory_allocated(const struct sock *sk)
86410 {
86411 struct proto *prot = sk->sk_prot;
86412 @@ -1380,7 +1380,7 @@ struct sock_iocb {
86413 struct scm_cookie *scm;
86414 struct msghdr *msg, async_msg;
86415 struct kiocb *kiocb;
86416 -};
86417 +} __randomize_layout;
86418
86419 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86420 {
86421 @@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86422 }
86423
86424 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86425 - char __user *from, char *to,
86426 + char __user *from, unsigned char *to,
86427 int copy, int offset)
86428 {
86429 if (skb->ip_summed == CHECKSUM_NONE) {
86430 @@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86431 }
86432 }
86433
86434 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86435 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86436
86437 /**
86438 * sk_page_frag - return an appropriate page_frag
86439 diff --git a/include/net/tcp.h b/include/net/tcp.h
86440 index 4062b4f..9ff45e7 100644
86441 --- a/include/net/tcp.h
86442 +++ b/include/net/tcp.h
86443 @@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86444 void tcp_xmit_retransmit_queue(struct sock *);
86445 void tcp_simple_retransmit(struct sock *);
86446 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86447 -int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86448 +int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86449
86450 void tcp_send_probe0(struct sock *);
86451 void tcp_send_partial(struct sock *);
86452 @@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86453 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86454 */
86455 struct tcp_skb_cb {
86456 - __u32 seq; /* Starting sequence number */
86457 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86458 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
86459 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86460 union {
86461 /* Note : tcp_tw_isn is used in input path only
86462 * (isn chosen by tcp_timewait_state_process())
86463 @@ -718,7 +718,7 @@ struct tcp_skb_cb {
86464
86465 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86466 /* 1 byte hole */
86467 - __u32 ack_seq; /* Sequence number ACK'd */
86468 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86469 union {
86470 struct inet_skb_parm h4;
86471 #if IS_ENABLED(CONFIG_IPV6)
86472 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86473 index dc4865e..152ee4c 100644
86474 --- a/include/net/xfrm.h
86475 +++ b/include/net/xfrm.h
86476 @@ -285,7 +285,6 @@ struct xfrm_dst;
86477 struct xfrm_policy_afinfo {
86478 unsigned short family;
86479 struct dst_ops *dst_ops;
86480 - void (*garbage_collect)(struct net *net);
86481 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86482 const xfrm_address_t *saddr,
86483 const xfrm_address_t *daddr);
86484 @@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86485 struct net_device *dev,
86486 const struct flowi *fl);
86487 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86488 -};
86489 +} __do_const;
86490
86491 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86492 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86493 @@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86494 int (*transport_finish)(struct sk_buff *skb,
86495 int async);
86496 void (*local_error)(struct sk_buff *skb, u32 mtu);
86497 -};
86498 +} __do_const;
86499
86500 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86501 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86502 @@ -437,7 +436,7 @@ struct xfrm_mode {
86503 struct module *owner;
86504 unsigned int encap;
86505 int flags;
86506 -};
86507 +} __do_const;
86508
86509 /* Flags for xfrm_mode. */
86510 enum {
86511 @@ -534,7 +533,7 @@ struct xfrm_policy {
86512 struct timer_list timer;
86513
86514 struct flow_cache_object flo;
86515 - atomic_t genid;
86516 + atomic_unchecked_t genid;
86517 u32 priority;
86518 u32 index;
86519 struct xfrm_mark mark;
86520 @@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86521 }
86522
86523 void xfrm_garbage_collect(struct net *net);
86524 +void xfrm_garbage_collect_deferred(struct net *net);
86525
86526 #else
86527
86528 @@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86529 static inline void xfrm_garbage_collect(struct net *net)
86530 {
86531 }
86532 +static inline void xfrm_garbage_collect_deferred(struct net *net)
86533 +{
86534 +}
86535 #endif
86536
86537 static __inline__
86538 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86539 index 1017e0b..227aa4d 100644
86540 --- a/include/rdma/iw_cm.h
86541 +++ b/include/rdma/iw_cm.h
86542 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
86543 int backlog);
86544
86545 int (*destroy_listen)(struct iw_cm_id *cm_id);
86546 -};
86547 +} __no_const;
86548
86549 /**
86550 * iw_create_cm_id - Create an IW CM identifier.
86551 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86552 index 52beadf..598734c 100644
86553 --- a/include/scsi/libfc.h
86554 +++ b/include/scsi/libfc.h
86555 @@ -771,6 +771,7 @@ struct libfc_function_template {
86556 */
86557 void (*disc_stop_final) (struct fc_lport *);
86558 };
86559 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86560
86561 /**
86562 * struct fc_disc - Discovery context
86563 @@ -875,7 +876,7 @@ struct fc_lport {
86564 struct fc_vport *vport;
86565
86566 /* Operational Information */
86567 - struct libfc_function_template tt;
86568 + libfc_function_template_no_const tt;
86569 u8 link_up;
86570 u8 qfull;
86571 enum fc_lport_state state;
86572 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86573 index 27ecee7..5f42632 100644
86574 --- a/include/scsi/scsi_device.h
86575 +++ b/include/scsi/scsi_device.h
86576 @@ -186,9 +186,9 @@ struct scsi_device {
86577 unsigned int max_device_blocked; /* what device_blocked counts down from */
86578 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86579
86580 - atomic_t iorequest_cnt;
86581 - atomic_t iodone_cnt;
86582 - atomic_t ioerr_cnt;
86583 + atomic_unchecked_t iorequest_cnt;
86584 + atomic_unchecked_t iodone_cnt;
86585 + atomic_unchecked_t ioerr_cnt;
86586
86587 struct device sdev_gendev,
86588 sdev_dev;
86589 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86590 index 007a0bc..7188db8 100644
86591 --- a/include/scsi/scsi_transport_fc.h
86592 +++ b/include/scsi/scsi_transport_fc.h
86593 @@ -756,7 +756,8 @@ struct fc_function_template {
86594 unsigned long show_host_system_hostname:1;
86595
86596 unsigned long disable_target_scan:1;
86597 -};
86598 +} __do_const;
86599 +typedef struct fc_function_template __no_const fc_function_template_no_const;
86600
86601
86602 /**
86603 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86604 index ae6c3b8..fd748ac 100644
86605 --- a/include/sound/compress_driver.h
86606 +++ b/include/sound/compress_driver.h
86607 @@ -128,7 +128,7 @@ struct snd_compr_ops {
86608 struct snd_compr_caps *caps);
86609 int (*get_codec_caps) (struct snd_compr_stream *stream,
86610 struct snd_compr_codec_caps *codec);
86611 -};
86612 +} __no_const;
86613
86614 /**
86615 * struct snd_compr: Compressed device
86616 diff --git a/include/sound/soc.h b/include/sound/soc.h
86617 index 7ba7130..d46594d 100644
86618 --- a/include/sound/soc.h
86619 +++ b/include/sound/soc.h
86620 @@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86621 enum snd_soc_dapm_type, int);
86622
86623 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86624 -};
86625 +} __do_const;
86626
86627 /* SoC platform interface */
86628 struct snd_soc_platform_driver {
86629 @@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86630 const struct snd_compr_ops *compr_ops;
86631
86632 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86633 -};
86634 +} __do_const;
86635
86636 struct snd_soc_dai_link_component {
86637 const char *name;
86638 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86639 index 23c518a..d6ef510 100644
86640 --- a/include/target/target_core_base.h
86641 +++ b/include/target/target_core_base.h
86642 @@ -764,7 +764,7 @@ struct se_device {
86643 atomic_long_t write_bytes;
86644 /* Active commands on this virtual SE device */
86645 atomic_t simple_cmds;
86646 - atomic_t dev_ordered_id;
86647 + atomic_unchecked_t dev_ordered_id;
86648 atomic_t dev_ordered_sync;
86649 atomic_t dev_qf_count;
86650 int export_count;
86651 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86652 new file mode 100644
86653 index 0000000..fb634b7
86654 --- /dev/null
86655 +++ b/include/trace/events/fs.h
86656 @@ -0,0 +1,53 @@
86657 +#undef TRACE_SYSTEM
86658 +#define TRACE_SYSTEM fs
86659 +
86660 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86661 +#define _TRACE_FS_H
86662 +
86663 +#include <linux/fs.h>
86664 +#include <linux/tracepoint.h>
86665 +
86666 +TRACE_EVENT(do_sys_open,
86667 +
86668 + TP_PROTO(const char *filename, int flags, int mode),
86669 +
86670 + TP_ARGS(filename, flags, mode),
86671 +
86672 + TP_STRUCT__entry(
86673 + __string( filename, filename )
86674 + __field( int, flags )
86675 + __field( int, mode )
86676 + ),
86677 +
86678 + TP_fast_assign(
86679 + __assign_str(filename, filename);
86680 + __entry->flags = flags;
86681 + __entry->mode = mode;
86682 + ),
86683 +
86684 + TP_printk("\"%s\" %x %o",
86685 + __get_str(filename), __entry->flags, __entry->mode)
86686 +);
86687 +
86688 +TRACE_EVENT(open_exec,
86689 +
86690 + TP_PROTO(const char *filename),
86691 +
86692 + TP_ARGS(filename),
86693 +
86694 + TP_STRUCT__entry(
86695 + __string( filename, filename )
86696 + ),
86697 +
86698 + TP_fast_assign(
86699 + __assign_str(filename, filename);
86700 + ),
86701 +
86702 + TP_printk("\"%s\"",
86703 + __get_str(filename))
86704 +);
86705 +
86706 +#endif /* _TRACE_FS_H */
86707 +
86708 +/* This part must be outside protection */
86709 +#include <trace/define_trace.h>
86710 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86711 index 3608beb..df39d8a 100644
86712 --- a/include/trace/events/irq.h
86713 +++ b/include/trace/events/irq.h
86714 @@ -36,7 +36,7 @@ struct softirq_action;
86715 */
86716 TRACE_EVENT(irq_handler_entry,
86717
86718 - TP_PROTO(int irq, struct irqaction *action),
86719 + TP_PROTO(int irq, const struct irqaction *action),
86720
86721 TP_ARGS(irq, action),
86722
86723 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86724 */
86725 TRACE_EVENT(irq_handler_exit,
86726
86727 - TP_PROTO(int irq, struct irqaction *action, int ret),
86728 + TP_PROTO(int irq, const struct irqaction *action, int ret),
86729
86730 TP_ARGS(irq, action, ret),
86731
86732 diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
86733 index 7caf44c..23c6f27 100644
86734 --- a/include/uapi/linux/a.out.h
86735 +++ b/include/uapi/linux/a.out.h
86736 @@ -39,6 +39,14 @@ enum machine_type {
86737 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
86738 };
86739
86740 +/* Constants for the N_FLAGS field */
86741 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86742 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
86743 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
86744 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
86745 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86746 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86747 +
86748 #if !defined (N_MAGIC)
86749 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
86750 #endif
86751 diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
86752 index 22b6ad3..aeba37e 100644
86753 --- a/include/uapi/linux/bcache.h
86754 +++ b/include/uapi/linux/bcache.h
86755 @@ -5,6 +5,7 @@
86756 * Bcache on disk data structures
86757 */
86758
86759 +#include <linux/compiler.h>
86760 #include <asm/types.h>
86761
86762 #define BITMASK(name, type, field, offset, size) \
86763 @@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
86764 /* Btree keys - all units are in sectors */
86765
86766 struct bkey {
86767 - __u64 high;
86768 - __u64 low;
86769 + __u64 high __intentional_overflow(-1);
86770 + __u64 low __intentional_overflow(-1);
86771 __u64 ptr[];
86772 };
86773
86774 diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
86775 index d876736..ccce5c0 100644
86776 --- a/include/uapi/linux/byteorder/little_endian.h
86777 +++ b/include/uapi/linux/byteorder/little_endian.h
86778 @@ -42,51 +42,51 @@
86779
86780 static inline __le64 __cpu_to_le64p(const __u64 *p)
86781 {
86782 - return (__force __le64)*p;
86783 + return (__force const __le64)*p;
86784 }
86785 -static inline __u64 __le64_to_cpup(const __le64 *p)
86786 +static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
86787 {
86788 - return (__force __u64)*p;
86789 + return (__force const __u64)*p;
86790 }
86791 static inline __le32 __cpu_to_le32p(const __u32 *p)
86792 {
86793 - return (__force __le32)*p;
86794 + return (__force const __le32)*p;
86795 }
86796 static inline __u32 __le32_to_cpup(const __le32 *p)
86797 {
86798 - return (__force __u32)*p;
86799 + return (__force const __u32)*p;
86800 }
86801 static inline __le16 __cpu_to_le16p(const __u16 *p)
86802 {
86803 - return (__force __le16)*p;
86804 + return (__force const __le16)*p;
86805 }
86806 static inline __u16 __le16_to_cpup(const __le16 *p)
86807 {
86808 - return (__force __u16)*p;
86809 + return (__force const __u16)*p;
86810 }
86811 static inline __be64 __cpu_to_be64p(const __u64 *p)
86812 {
86813 - return (__force __be64)__swab64p(p);
86814 + return (__force const __be64)__swab64p(p);
86815 }
86816 static inline __u64 __be64_to_cpup(const __be64 *p)
86817 {
86818 - return __swab64p((__u64 *)p);
86819 + return __swab64p((const __u64 *)p);
86820 }
86821 static inline __be32 __cpu_to_be32p(const __u32 *p)
86822 {
86823 - return (__force __be32)__swab32p(p);
86824 + return (__force const __be32)__swab32p(p);
86825 }
86826 -static inline __u32 __be32_to_cpup(const __be32 *p)
86827 +static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
86828 {
86829 - return __swab32p((__u32 *)p);
86830 + return __swab32p((const __u32 *)p);
86831 }
86832 static inline __be16 __cpu_to_be16p(const __u16 *p)
86833 {
86834 - return (__force __be16)__swab16p(p);
86835 + return (__force const __be16)__swab16p(p);
86836 }
86837 static inline __u16 __be16_to_cpup(const __be16 *p)
86838 {
86839 - return __swab16p((__u16 *)p);
86840 + return __swab16p((const __u16 *)p);
86841 }
86842 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
86843 #define __le64_to_cpus(x) do { (void)(x); } while (0)
86844 diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
86845 index ea9bf25..5140c61 100644
86846 --- a/include/uapi/linux/elf.h
86847 +++ b/include/uapi/linux/elf.h
86848 @@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
86849 #define PT_GNU_EH_FRAME 0x6474e550
86850
86851 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
86852 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
86853 +
86854 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
86855 +
86856 +/* Constants for the e_flags field */
86857 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86858 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
86859 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
86860 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
86861 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86862 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86863
86864 /*
86865 * Extended Numbering
86866 @@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
86867 #define DT_DEBUG 21
86868 #define DT_TEXTREL 22
86869 #define DT_JMPREL 23
86870 +#define DT_FLAGS 30
86871 + #define DF_TEXTREL 0x00000004
86872 #define DT_ENCODING 32
86873 #define OLD_DT_LOOS 0x60000000
86874 #define DT_LOOS 0x6000000d
86875 @@ -240,6 +253,19 @@ typedef struct elf64_hdr {
86876 #define PF_W 0x2
86877 #define PF_X 0x1
86878
86879 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
86880 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
86881 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
86882 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
86883 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
86884 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
86885 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
86886 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
86887 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
86888 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
86889 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
86890 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
86891 +
86892 typedef struct elf32_phdr{
86893 Elf32_Word p_type;
86894 Elf32_Off p_offset;
86895 @@ -332,6 +358,8 @@ typedef struct elf64_shdr {
86896 #define EI_OSABI 7
86897 #define EI_PAD 8
86898
86899 +#define EI_PAX 14
86900 +
86901 #define ELFMAG0 0x7f /* EI_MAG */
86902 #define ELFMAG1 'E'
86903 #define ELFMAG2 'L'
86904 diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
86905 index aa169c4..6a2771d 100644
86906 --- a/include/uapi/linux/personality.h
86907 +++ b/include/uapi/linux/personality.h
86908 @@ -30,6 +30,7 @@ enum {
86909 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
86910 ADDR_NO_RANDOMIZE | \
86911 ADDR_COMPAT_LAYOUT | \
86912 + ADDR_LIMIT_3GB | \
86913 MMAP_PAGE_ZERO)
86914
86915 /*
86916 diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
86917 index 7530e74..e714828 100644
86918 --- a/include/uapi/linux/screen_info.h
86919 +++ b/include/uapi/linux/screen_info.h
86920 @@ -43,7 +43,8 @@ struct screen_info {
86921 __u16 pages; /* 0x32 */
86922 __u16 vesa_attributes; /* 0x34 */
86923 __u32 capabilities; /* 0x36 */
86924 - __u8 _reserved[6]; /* 0x3a */
86925 + __u16 vesapm_size; /* 0x3a */
86926 + __u8 _reserved[4]; /* 0x3c */
86927 } __attribute__((packed));
86928
86929 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
86930 diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
86931 index 0e011eb..82681b1 100644
86932 --- a/include/uapi/linux/swab.h
86933 +++ b/include/uapi/linux/swab.h
86934 @@ -43,7 +43,7 @@
86935 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
86936 */
86937
86938 -static inline __attribute_const__ __u16 __fswab16(__u16 val)
86939 +static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
86940 {
86941 #ifdef __HAVE_BUILTIN_BSWAP16__
86942 return __builtin_bswap16(val);
86943 @@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
86944 #endif
86945 }
86946
86947 -static inline __attribute_const__ __u32 __fswab32(__u32 val)
86948 +static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
86949 {
86950 #ifdef __HAVE_BUILTIN_BSWAP32__
86951 return __builtin_bswap32(val);
86952 @@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
86953 #endif
86954 }
86955
86956 -static inline __attribute_const__ __u64 __fswab64(__u64 val)
86957 +static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
86958 {
86959 #ifdef __HAVE_BUILTIN_BSWAP64__
86960 return __builtin_bswap64(val);
86961 diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
86962 index 43aaba1..1c30b48 100644
86963 --- a/include/uapi/linux/sysctl.h
86964 +++ b/include/uapi/linux/sysctl.h
86965 @@ -155,8 +155,6 @@ enum
86966 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
86967 };
86968
86969 -
86970 -
86971 /* CTL_VM names: */
86972 enum
86973 {
86974 diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
86975 index 1590c49..5eab462 100644
86976 --- a/include/uapi/linux/xattr.h
86977 +++ b/include/uapi/linux/xattr.h
86978 @@ -73,5 +73,9 @@
86979 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
86980 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
86981
86982 +/* User namespace */
86983 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
86984 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
86985 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
86986
86987 #endif /* _UAPI_LINUX_XATTR_H */
86988 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
86989 index f9466fa..f4e2b81 100644
86990 --- a/include/video/udlfb.h
86991 +++ b/include/video/udlfb.h
86992 @@ -53,10 +53,10 @@ struct dlfb_data {
86993 u32 pseudo_palette[256];
86994 int blank_mode; /*one of FB_BLANK_ */
86995 /* blit-only rendering path metrics, exposed through sysfs */
86996 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86997 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
86998 - atomic_t bytes_sent; /* to usb, after compression including overhead */
86999 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
87000 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
87001 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
87002 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
87003 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
87004 };
87005
87006 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
87007 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
87008 index 30f5362..8ed8ac9 100644
87009 --- a/include/video/uvesafb.h
87010 +++ b/include/video/uvesafb.h
87011 @@ -122,6 +122,7 @@ struct uvesafb_par {
87012 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
87013 u8 pmi_setpal; /* PMI for palette changes */
87014 u16 *pmi_base; /* protected mode interface location */
87015 + u8 *pmi_code; /* protected mode code location */
87016 void *pmi_start;
87017 void *pmi_pal;
87018 u8 *vbe_state_orig; /*
87019 diff --git a/init/Kconfig b/init/Kconfig
87020 index 2081a4d..98d1149 100644
87021 --- a/init/Kconfig
87022 +++ b/init/Kconfig
87023 @@ -1150,6 +1150,7 @@ endif # CGROUPS
87024
87025 config CHECKPOINT_RESTORE
87026 bool "Checkpoint/restore support" if EXPERT
87027 + depends on !GRKERNSEC
87028 default n
87029 help
87030 Enables additional kernel features in a sake of checkpoint/restore.
87031 @@ -1659,7 +1660,7 @@ config SLUB_DEBUG
87032
87033 config COMPAT_BRK
87034 bool "Disable heap randomization"
87035 - default y
87036 + default n
87037 help
87038 Randomizing heap placement makes heap exploits harder, but it
87039 also breaks ancient binaries (including anything libc5 based).
87040 @@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
87041 config STOP_MACHINE
87042 bool
87043 default y
87044 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
87045 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
87046 help
87047 Need stop_machine() primitive.
87048
87049 diff --git a/init/Makefile b/init/Makefile
87050 index 7bc47ee..6da2dc7 100644
87051 --- a/init/Makefile
87052 +++ b/init/Makefile
87053 @@ -2,6 +2,9 @@
87054 # Makefile for the linux kernel.
87055 #
87056
87057 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
87058 +asflags-y := $(GCC_PLUGINS_AFLAGS)
87059 +
87060 obj-y := main.o version.o mounts.o
87061 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
87062 obj-y += noinitramfs.o
87063 diff --git a/init/do_mounts.c b/init/do_mounts.c
87064 index 9b3565c..3f90cf9 100644
87065 --- a/init/do_mounts.c
87066 +++ b/init/do_mounts.c
87067 @@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
87068 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
87069 {
87070 struct super_block *s;
87071 - int err = sys_mount(name, "/root", fs, flags, data);
87072 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
87073 if (err)
87074 return err;
87075
87076 - sys_chdir("/root");
87077 + sys_chdir((const char __force_user *)"/root");
87078 s = current->fs->pwd.dentry->d_sb;
87079 ROOT_DEV = s->s_dev;
87080 printk(KERN_INFO
87081 @@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
87082 va_start(args, fmt);
87083 vsprintf(buf, fmt, args);
87084 va_end(args);
87085 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
87086 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
87087 if (fd >= 0) {
87088 sys_ioctl(fd, FDEJECT, 0);
87089 sys_close(fd);
87090 }
87091 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87092 - fd = sys_open("/dev/console", O_RDWR, 0);
87093 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87094 if (fd >= 0) {
87095 sys_ioctl(fd, TCGETS, (long)&termios);
87096 termios.c_lflag &= ~ICANON;
87097 sys_ioctl(fd, TCSETSF, (long)&termios);
87098 - sys_read(fd, &c, 1);
87099 + sys_read(fd, (char __user *)&c, 1);
87100 termios.c_lflag |= ICANON;
87101 sys_ioctl(fd, TCSETSF, (long)&termios);
87102 sys_close(fd);
87103 @@ -590,8 +590,8 @@ void __init prepare_namespace(void)
87104 mount_root();
87105 out:
87106 devtmpfs_mount("dev");
87107 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
87108 - sys_chroot(".");
87109 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87110 + sys_chroot((const char __force_user *)".");
87111 }
87112
87113 static bool is_tmpfs;
87114 diff --git a/init/do_mounts.h b/init/do_mounts.h
87115 index f5b978a..69dbfe8 100644
87116 --- a/init/do_mounts.h
87117 +++ b/init/do_mounts.h
87118 @@ -15,15 +15,15 @@ extern int root_mountflags;
87119
87120 static inline int create_dev(char *name, dev_t dev)
87121 {
87122 - sys_unlink(name);
87123 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
87124 + sys_unlink((char __force_user *)name);
87125 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
87126 }
87127
87128 #if BITS_PER_LONG == 32
87129 static inline u32 bstat(char *name)
87130 {
87131 struct stat64 stat;
87132 - if (sys_stat64(name, &stat) != 0)
87133 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
87134 return 0;
87135 if (!S_ISBLK(stat.st_mode))
87136 return 0;
87137 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
87138 static inline u32 bstat(char *name)
87139 {
87140 struct stat stat;
87141 - if (sys_newstat(name, &stat) != 0)
87142 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
87143 return 0;
87144 if (!S_ISBLK(stat.st_mode))
87145 return 0;
87146 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
87147 index 3e0878e..8a9d7a0 100644
87148 --- a/init/do_mounts_initrd.c
87149 +++ b/init/do_mounts_initrd.c
87150 @@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
87151 {
87152 sys_unshare(CLONE_FS | CLONE_FILES);
87153 /* stdin/stdout/stderr for /linuxrc */
87154 - sys_open("/dev/console", O_RDWR, 0);
87155 + sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
87156 sys_dup(0);
87157 sys_dup(0);
87158 /* move initrd over / and chdir/chroot in initrd root */
87159 - sys_chdir("/root");
87160 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
87161 - sys_chroot(".");
87162 + sys_chdir((const char __force_user *)"/root");
87163 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87164 + sys_chroot((const char __force_user *)".");
87165 sys_setsid();
87166 return 0;
87167 }
87168 @@ -59,8 +59,8 @@ static void __init handle_initrd(void)
87169 create_dev("/dev/root.old", Root_RAM0);
87170 /* mount initrd on rootfs' /root */
87171 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
87172 - sys_mkdir("/old", 0700);
87173 - sys_chdir("/old");
87174 + sys_mkdir((const char __force_user *)"/old", 0700);
87175 + sys_chdir((const char __force_user *)"/old");
87176
87177 /* try loading default modules from initrd */
87178 load_default_modules();
87179 @@ -80,31 +80,31 @@ static void __init handle_initrd(void)
87180 current->flags &= ~PF_FREEZER_SKIP;
87181
87182 /* move initrd to rootfs' /old */
87183 - sys_mount("..", ".", NULL, MS_MOVE, NULL);
87184 + sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
87185 /* switch root and cwd back to / of rootfs */
87186 - sys_chroot("..");
87187 + sys_chroot((const char __force_user *)"..");
87188
87189 if (new_decode_dev(real_root_dev) == Root_RAM0) {
87190 - sys_chdir("/old");
87191 + sys_chdir((const char __force_user *)"/old");
87192 return;
87193 }
87194
87195 - sys_chdir("/");
87196 + sys_chdir((const char __force_user *)"/");
87197 ROOT_DEV = new_decode_dev(real_root_dev);
87198 mount_root();
87199
87200 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87201 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87202 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87203 if (!error)
87204 printk("okay\n");
87205 else {
87206 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
87207 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87208 if (error == -ENOENT)
87209 printk("/initrd does not exist. Ignored.\n");
87210 else
87211 printk("failed\n");
87212 printk(KERN_NOTICE "Unmounting old root\n");
87213 - sys_umount("/old", MNT_DETACH);
87214 + sys_umount((char __force_user *)"/old", MNT_DETACH);
87215 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87216 if (fd < 0) {
87217 error = fd;
87218 @@ -127,11 +127,11 @@ int __init initrd_load(void)
87219 * mounted in the normal path.
87220 */
87221 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87222 - sys_unlink("/initrd.image");
87223 + sys_unlink((const char __force_user *)"/initrd.image");
87224 handle_initrd();
87225 return 1;
87226 }
87227 }
87228 - sys_unlink("/initrd.image");
87229 + sys_unlink((const char __force_user *)"/initrd.image");
87230 return 0;
87231 }
87232 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87233 index 8cb6db5..d729f50 100644
87234 --- a/init/do_mounts_md.c
87235 +++ b/init/do_mounts_md.c
87236 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87237 partitioned ? "_d" : "", minor,
87238 md_setup_args[ent].device_names);
87239
87240 - fd = sys_open(name, 0, 0);
87241 + fd = sys_open((char __force_user *)name, 0, 0);
87242 if (fd < 0) {
87243 printk(KERN_ERR "md: open failed - cannot start "
87244 "array %s\n", name);
87245 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87246 * array without it
87247 */
87248 sys_close(fd);
87249 - fd = sys_open(name, 0, 0);
87250 + fd = sys_open((char __force_user *)name, 0, 0);
87251 sys_ioctl(fd, BLKRRPART, 0);
87252 }
87253 sys_close(fd);
87254 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87255
87256 wait_for_device_probe();
87257
87258 - fd = sys_open("/dev/md0", 0, 0);
87259 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87260 if (fd >= 0) {
87261 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87262 sys_close(fd);
87263 diff --git a/init/init_task.c b/init/init_task.c
87264 index ba0a7f36..2bcf1d5 100644
87265 --- a/init/init_task.c
87266 +++ b/init/init_task.c
87267 @@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87268 * Initial thread structure. Alignment of this is handled by a special
87269 * linker map entry.
87270 */
87271 +#ifdef CONFIG_X86
87272 +union thread_union init_thread_union __init_task_data;
87273 +#else
87274 union thread_union init_thread_union __init_task_data =
87275 { INIT_THREAD_INFO(init_task) };
87276 +#endif
87277 diff --git a/init/initramfs.c b/init/initramfs.c
87278 index ad1bd77..dca2c1b 100644
87279 --- a/init/initramfs.c
87280 +++ b/init/initramfs.c
87281 @@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87282
87283 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87284 while (count) {
87285 - ssize_t rv = sys_write(fd, p, count);
87286 + ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87287
87288 if (rv < 0) {
87289 if (rv == -EINTR || rv == -EAGAIN)
87290 @@ -107,7 +107,7 @@ static void __init free_hash(void)
87291 }
87292 }
87293
87294 -static long __init do_utime(char *filename, time_t mtime)
87295 +static long __init do_utime(char __force_user *filename, time_t mtime)
87296 {
87297 struct timespec t[2];
87298
87299 @@ -142,7 +142,7 @@ static void __init dir_utime(void)
87300 struct dir_entry *de, *tmp;
87301 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87302 list_del(&de->list);
87303 - do_utime(de->name, de->mtime);
87304 + do_utime((char __force_user *)de->name, de->mtime);
87305 kfree(de->name);
87306 kfree(de);
87307 }
87308 @@ -304,7 +304,7 @@ static int __init maybe_link(void)
87309 if (nlink >= 2) {
87310 char *old = find_link(major, minor, ino, mode, collected);
87311 if (old)
87312 - return (sys_link(old, collected) < 0) ? -1 : 1;
87313 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87314 }
87315 return 0;
87316 }
87317 @@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87318 {
87319 struct stat st;
87320
87321 - if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87322 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87323 if (S_ISDIR(st.st_mode))
87324 - sys_rmdir(path);
87325 + sys_rmdir((char __force_user *)path);
87326 else
87327 - sys_unlink(path);
87328 + sys_unlink((char __force_user *)path);
87329 }
87330 }
87331
87332 @@ -338,7 +338,7 @@ static int __init do_name(void)
87333 int openflags = O_WRONLY|O_CREAT;
87334 if (ml != 1)
87335 openflags |= O_TRUNC;
87336 - wfd = sys_open(collected, openflags, mode);
87337 + wfd = sys_open((char __force_user *)collected, openflags, mode);
87338
87339 if (wfd >= 0) {
87340 sys_fchown(wfd, uid, gid);
87341 @@ -350,17 +350,17 @@ static int __init do_name(void)
87342 }
87343 }
87344 } else if (S_ISDIR(mode)) {
87345 - sys_mkdir(collected, mode);
87346 - sys_chown(collected, uid, gid);
87347 - sys_chmod(collected, mode);
87348 + sys_mkdir((char __force_user *)collected, mode);
87349 + sys_chown((char __force_user *)collected, uid, gid);
87350 + sys_chmod((char __force_user *)collected, mode);
87351 dir_add(collected, mtime);
87352 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87353 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87354 if (maybe_link() == 0) {
87355 - sys_mknod(collected, mode, rdev);
87356 - sys_chown(collected, uid, gid);
87357 - sys_chmod(collected, mode);
87358 - do_utime(collected, mtime);
87359 + sys_mknod((char __force_user *)collected, mode, rdev);
87360 + sys_chown((char __force_user *)collected, uid, gid);
87361 + sys_chmod((char __force_user *)collected, mode);
87362 + do_utime((char __force_user *)collected, mtime);
87363 }
87364 }
87365 return 0;
87366 @@ -372,7 +372,7 @@ static int __init do_copy(void)
87367 if (xwrite(wfd, victim, body_len) != body_len)
87368 error("write error");
87369 sys_close(wfd);
87370 - do_utime(vcollected, mtime);
87371 + do_utime((char __force_user *)vcollected, mtime);
87372 kfree(vcollected);
87373 eat(body_len);
87374 state = SkipIt;
87375 @@ -390,9 +390,9 @@ static int __init do_symlink(void)
87376 {
87377 collected[N_ALIGN(name_len) + body_len] = '\0';
87378 clean_path(collected, 0);
87379 - sys_symlink(collected + N_ALIGN(name_len), collected);
87380 - sys_lchown(collected, uid, gid);
87381 - do_utime(collected, mtime);
87382 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87383 + sys_lchown((char __force_user *)collected, uid, gid);
87384 + do_utime((char __force_user *)collected, mtime);
87385 state = SkipIt;
87386 next_state = Reset;
87387 return 0;
87388 diff --git a/init/main.c b/init/main.c
87389 index 321d0ce..91b53e5 100644
87390 --- a/init/main.c
87391 +++ b/init/main.c
87392 @@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87393 static inline void mark_rodata_ro(void) { }
87394 #endif
87395
87396 +extern void grsecurity_init(void);
87397 +
87398 /*
87399 * Debug helper: via this flag we know that we are in 'early bootup code'
87400 * where only the boot processor is running with IRQ disabled. This means
87401 @@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87402
87403 __setup("reset_devices", set_reset_devices);
87404
87405 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87406 +kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87407 +static int __init setup_grsec_proc_gid(char *str)
87408 +{
87409 + grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87410 + return 1;
87411 +}
87412 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87413 +#endif
87414 +
87415 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87416 +unsigned long pax_user_shadow_base __read_only;
87417 +EXPORT_SYMBOL(pax_user_shadow_base);
87418 +extern char pax_enter_kernel_user[];
87419 +extern char pax_exit_kernel_user[];
87420 +#endif
87421 +
87422 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87423 +static int __init setup_pax_nouderef(char *str)
87424 +{
87425 +#ifdef CONFIG_X86_32
87426 + unsigned int cpu;
87427 + struct desc_struct *gdt;
87428 +
87429 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87430 + gdt = get_cpu_gdt_table(cpu);
87431 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87432 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87433 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87434 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87435 + }
87436 + loadsegment(ds, __KERNEL_DS);
87437 + loadsegment(es, __KERNEL_DS);
87438 + loadsegment(ss, __KERNEL_DS);
87439 +#else
87440 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87441 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87442 + clone_pgd_mask = ~(pgdval_t)0UL;
87443 + pax_user_shadow_base = 0UL;
87444 + setup_clear_cpu_cap(X86_FEATURE_PCID);
87445 + setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87446 +#endif
87447 +
87448 + return 0;
87449 +}
87450 +early_param("pax_nouderef", setup_pax_nouderef);
87451 +
87452 +#ifdef CONFIG_X86_64
87453 +static int __init setup_pax_weakuderef(char *str)
87454 +{
87455 + if (clone_pgd_mask != ~(pgdval_t)0UL)
87456 + pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87457 + return 1;
87458 +}
87459 +__setup("pax_weakuderef", setup_pax_weakuderef);
87460 +#endif
87461 +#endif
87462 +
87463 +#ifdef CONFIG_PAX_SOFTMODE
87464 +int pax_softmode;
87465 +
87466 +static int __init setup_pax_softmode(char *str)
87467 +{
87468 + get_option(&str, &pax_softmode);
87469 + return 1;
87470 +}
87471 +__setup("pax_softmode=", setup_pax_softmode);
87472 +#endif
87473 +
87474 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87475 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87476 static const char *panic_later, *panic_param;
87477 @@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87478 struct blacklist_entry *entry;
87479 char *fn_name;
87480
87481 - fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87482 + fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87483 if (!fn_name)
87484 return false;
87485
87486 @@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87487 {
87488 int count = preempt_count();
87489 int ret;
87490 - char msgbuf[64];
87491 + const char *msg1 = "", *msg2 = "";
87492
87493 if (initcall_blacklisted(fn))
87494 return -EPERM;
87495 @@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87496 else
87497 ret = fn();
87498
87499 - msgbuf[0] = 0;
87500 -
87501 if (preempt_count() != count) {
87502 - sprintf(msgbuf, "preemption imbalance ");
87503 + msg1 = " preemption imbalance";
87504 preempt_count_set(count);
87505 }
87506 if (irqs_disabled()) {
87507 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87508 + msg2 = " disabled interrupts";
87509 local_irq_enable();
87510 }
87511 - WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87512 + WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87513
87514 + add_latent_entropy();
87515 return ret;
87516 }
87517
87518 @@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87519 {
87520 argv_init[0] = init_filename;
87521 return do_execve(getname_kernel(init_filename),
87522 - (const char __user *const __user *)argv_init,
87523 - (const char __user *const __user *)envp_init);
87524 + (const char __user *const __force_user *)argv_init,
87525 + (const char __user *const __force_user *)envp_init);
87526 }
87527
87528 static int try_to_run_init_process(const char *init_filename)
87529 @@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87530 return ret;
87531 }
87532
87533 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87534 +extern int gr_init_ran;
87535 +#endif
87536 +
87537 static noinline void __init kernel_init_freeable(void);
87538
87539 static int __ref kernel_init(void *unused)
87540 @@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87541 ramdisk_execute_command, ret);
87542 }
87543
87544 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87545 + /* if no initrd was used, be extra sure we enforce chroot restrictions */
87546 + gr_init_ran = 1;
87547 +#endif
87548 +
87549 /*
87550 * We try each of these until one succeeds.
87551 *
87552 @@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87553 do_basic_setup();
87554
87555 /* Open the /dev/console on the rootfs, this should never fail */
87556 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87557 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87558 pr_err("Warning: unable to open an initial console.\n");
87559
87560 (void) sys_dup(0);
87561 @@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87562 if (!ramdisk_execute_command)
87563 ramdisk_execute_command = "/init";
87564
87565 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87566 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87567 ramdisk_execute_command = NULL;
87568 prepare_namespace();
87569 }
87570
87571 + grsecurity_init();
87572 +
87573 /*
87574 * Ok, we have completed the initial bootup, and
87575 * we're essentially up and running. Get rid of the
87576 diff --git a/ipc/compat.c b/ipc/compat.c
87577 index 9b3c85f..1c4d897 100644
87578 --- a/ipc/compat.c
87579 +++ b/ipc/compat.c
87580 @@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87581 COMPAT_SHMLBA);
87582 if (err < 0)
87583 return err;
87584 - return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87585 + return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87586 }
87587 case SHMDT:
87588 return sys_shmdt(compat_ptr(ptr));
87589 diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87590 index e8075b2..76f2c6a 100644
87591 --- a/ipc/ipc_sysctl.c
87592 +++ b/ipc/ipc_sysctl.c
87593 @@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87594 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87595 void __user *buffer, size_t *lenp, loff_t *ppos)
87596 {
87597 - struct ctl_table ipc_table;
87598 + ctl_table_no_const ipc_table;
87599
87600 memcpy(&ipc_table, table, sizeof(ipc_table));
87601 ipc_table.data = get_ipc(table);
87602 @@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87603 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87604 void __user *buffer, size_t *lenp, loff_t *ppos)
87605 {
87606 - struct ctl_table ipc_table;
87607 + ctl_table_no_const ipc_table;
87608
87609 memcpy(&ipc_table, table, sizeof(ipc_table));
87610 ipc_table.data = get_ipc(table);
87611 @@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87612 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87613 void __user *buffer, size_t *lenp, loff_t *ppos)
87614 {
87615 - struct ctl_table ipc_table;
87616 + ctl_table_no_const ipc_table;
87617 size_t lenp_bef = *lenp;
87618 int rc;
87619
87620 @@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87621 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87622 void __user *buffer, size_t *lenp, loff_t *ppos)
87623 {
87624 - struct ctl_table ipc_table;
87625 + ctl_table_no_const ipc_table;
87626 memcpy(&ipc_table, table, sizeof(ipc_table));
87627 ipc_table.data = get_ipc(table);
87628
87629 @@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87630 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87631 void __user *buffer, size_t *lenp, loff_t *ppos)
87632 {
87633 - struct ctl_table ipc_table;
87634 + ctl_table_no_const ipc_table;
87635 int oldval;
87636 int rc;
87637
87638 diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87639 index 68d4e95..1477ded 100644
87640 --- a/ipc/mq_sysctl.c
87641 +++ b/ipc/mq_sysctl.c
87642 @@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87643 static int proc_mq_dointvec(struct ctl_table *table, int write,
87644 void __user *buffer, size_t *lenp, loff_t *ppos)
87645 {
87646 - struct ctl_table mq_table;
87647 + ctl_table_no_const mq_table;
87648 memcpy(&mq_table, table, sizeof(mq_table));
87649 mq_table.data = get_mq(table);
87650
87651 @@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87652 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87653 void __user *buffer, size_t *lenp, loff_t *ppos)
87654 {
87655 - struct ctl_table mq_table;
87656 + ctl_table_no_const mq_table;
87657 memcpy(&mq_table, table, sizeof(mq_table));
87658 mq_table.data = get_mq(table);
87659
87660 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87661 index 4fcf39a..d3cc2ec 100644
87662 --- a/ipc/mqueue.c
87663 +++ b/ipc/mqueue.c
87664 @@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87665 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87666 info->attr.mq_msgsize);
87667
87668 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87669 spin_lock(&mq_lock);
87670 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87671 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87672 diff --git a/ipc/shm.c b/ipc/shm.c
87673 index 0145479..3d27947 100644
87674 --- a/ipc/shm.c
87675 +++ b/ipc/shm.c
87676 @@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87677 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87678 #endif
87679
87680 +#ifdef CONFIG_GRKERNSEC
87681 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87682 + const u64 shm_createtime, const kuid_t cuid,
87683 + const int shmid);
87684 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87685 + const u64 shm_createtime);
87686 +#endif
87687 +
87688 void shm_init_ns(struct ipc_namespace *ns)
87689 {
87690 ns->shm_ctlmax = SHMMAX;
87691 @@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87692 shp->shm_lprid = 0;
87693 shp->shm_atim = shp->shm_dtim = 0;
87694 shp->shm_ctim = get_seconds();
87695 +#ifdef CONFIG_GRKERNSEC
87696 + shp->shm_createtime = ktime_get_ns();
87697 +#endif
87698 shp->shm_segsz = size;
87699 shp->shm_nattch = 0;
87700 shp->shm_file = file;
87701 @@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87702 f_mode = FMODE_READ | FMODE_WRITE;
87703 }
87704 if (shmflg & SHM_EXEC) {
87705 +
87706 +#ifdef CONFIG_PAX_MPROTECT
87707 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
87708 + goto out;
87709 +#endif
87710 +
87711 prot |= PROT_EXEC;
87712 acc_mode |= S_IXUGO;
87713 }
87714 @@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87715 if (err)
87716 goto out_unlock;
87717
87718 +#ifdef CONFIG_GRKERNSEC
87719 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87720 + shp->shm_perm.cuid, shmid) ||
87721 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87722 + err = -EACCES;
87723 + goto out_unlock;
87724 + }
87725 +#endif
87726 +
87727 ipc_lock_object(&shp->shm_perm);
87728
87729 /* check if shm_destroy() is tearing down shp */
87730 @@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87731 path = shp->shm_file->f_path;
87732 path_get(&path);
87733 shp->shm_nattch++;
87734 +#ifdef CONFIG_GRKERNSEC
87735 + shp->shm_lapid = current->pid;
87736 +#endif
87737 size = i_size_read(path.dentry->d_inode);
87738 ipc_unlock_object(&shp->shm_perm);
87739 rcu_read_unlock();
87740 diff --git a/ipc/util.c b/ipc/util.c
87741 index 88adc32..3867c68 100644
87742 --- a/ipc/util.c
87743 +++ b/ipc/util.c
87744 @@ -71,6 +71,8 @@ struct ipc_proc_iface {
87745 int (*show)(struct seq_file *, void *);
87746 };
87747
87748 +extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
87749 +
87750 static void ipc_memory_notifier(struct work_struct *work)
87751 {
87752 ipcns_notify(IPCNS_MEMCHANGED);
87753 @@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
87754 granted_mode >>= 6;
87755 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
87756 granted_mode >>= 3;
87757 +
87758 + if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
87759 + return -1;
87760 +
87761 /* is there some bit set in requested_mode but not in granted_mode? */
87762 if ((requested_mode & ~granted_mode & 0007) &&
87763 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
87764 diff --git a/kernel/audit.c b/kernel/audit.c
87765 index c6df990..fde80b4 100644
87766 --- a/kernel/audit.c
87767 +++ b/kernel/audit.c
87768 @@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
87769 3) suppressed due to audit_rate_limit
87770 4) suppressed due to audit_backlog_limit
87771 */
87772 -static atomic_t audit_lost = ATOMIC_INIT(0);
87773 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
87774
87775 /* The netlink socket. */
87776 static struct sock *audit_sock;
87777 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
87778 unsigned long now;
87779 int print;
87780
87781 - atomic_inc(&audit_lost);
87782 + atomic_inc_unchecked(&audit_lost);
87783
87784 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
87785
87786 @@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
87787 if (print) {
87788 if (printk_ratelimit())
87789 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
87790 - atomic_read(&audit_lost),
87791 + atomic_read_unchecked(&audit_lost),
87792 audit_rate_limit,
87793 audit_backlog_limit);
87794 audit_panic(message);
87795 @@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
87796 s.pid = audit_pid;
87797 s.rate_limit = audit_rate_limit;
87798 s.backlog_limit = audit_backlog_limit;
87799 - s.lost = atomic_read(&audit_lost);
87800 + s.lost = atomic_read_unchecked(&audit_lost);
87801 s.backlog = skb_queue_len(&audit_skb_queue);
87802 s.version = AUDIT_VERSION_LATEST;
87803 s.backlog_wait_time = audit_backlog_wait_time;
87804 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
87805 index e420a0c..38137fa 100644
87806 --- a/kernel/auditsc.c
87807 +++ b/kernel/auditsc.c
87808 @@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
87809 }
87810
87811 /* global counter which is incremented every time something logs in */
87812 -static atomic_t session_id = ATOMIC_INIT(0);
87813 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
87814
87815 static int audit_set_loginuid_perm(kuid_t loginuid)
87816 {
87817 @@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
87818
87819 /* are we setting or clearing? */
87820 if (uid_valid(loginuid))
87821 - sessionid = (unsigned int)atomic_inc_return(&session_id);
87822 + sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
87823
87824 task->sessionid = sessionid;
87825 task->loginuid = loginuid;
87826 diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
87827 index d6594e4..597264b 100644
87828 --- a/kernel/bpf/core.c
87829 +++ b/kernel/bpf/core.c
87830 @@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87831 * random section of illegal instructions.
87832 */
87833 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
87834 - hdr = module_alloc(size);
87835 + hdr = module_alloc_exec(size);
87836 if (hdr == NULL)
87837 return NULL;
87838
87839 /* Fill space with illegal/arch-dep instructions. */
87840 bpf_fill_ill_insns(hdr, size);
87841
87842 + pax_open_kernel();
87843 hdr->pages = size / PAGE_SIZE;
87844 + pax_close_kernel();
87845 +
87846 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
87847 PAGE_SIZE - sizeof(*hdr));
87848 start = (prandom_u32() % hole) & ~(alignment - 1);
87849 @@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87850
87851 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
87852 {
87853 - module_free(NULL, hdr);
87854 + module_free_exec(NULL, hdr);
87855 }
87856 #endif /* CONFIG_BPF_JIT */
87857
87858 diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
87859 index ba61c8c..c60c486 100644
87860 --- a/kernel/bpf/syscall.c
87861 +++ b/kernel/bpf/syscall.c
87862 @@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
87863 int err;
87864
87865 /* the syscall is limited to root temporarily. This restriction will be
87866 - * lifted when security audit is clean. Note that eBPF+tracing must have
87867 - * this restriction, since it may pass kernel data to user space
87868 + * lifted by upstream when a half-assed security audit is clean. Note
87869 + * that eBPF+tracing must have this restriction, since it may pass
87870 + * kernel data to user space
87871 */
87872 if (!capable(CAP_SYS_ADMIN))
87873 return -EPERM;
87874 +#ifdef CONFIG_GRKERNSEC
87875 + return -EPERM;
87876 +#endif
87877
87878 if (!access_ok(VERIFY_READ, uattr, 1))
87879 return -EFAULT;
87880 diff --git a/kernel/capability.c b/kernel/capability.c
87881 index 989f5bf..d317ca0 100644
87882 --- a/kernel/capability.c
87883 +++ b/kernel/capability.c
87884 @@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
87885 * before modification is attempted and the application
87886 * fails.
87887 */
87888 + if (tocopy > ARRAY_SIZE(kdata))
87889 + return -EFAULT;
87890 +
87891 if (copy_to_user(dataptr, kdata, tocopy
87892 * sizeof(struct __user_cap_data_struct))) {
87893 return -EFAULT;
87894 @@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
87895 int ret;
87896
87897 rcu_read_lock();
87898 - ret = security_capable(__task_cred(t), ns, cap);
87899 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
87900 + gr_task_is_capable(t, __task_cred(t), cap);
87901 rcu_read_unlock();
87902
87903 - return (ret == 0);
87904 + return ret;
87905 }
87906
87907 /**
87908 @@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
87909 int ret;
87910
87911 rcu_read_lock();
87912 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
87913 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
87914 rcu_read_unlock();
87915
87916 - return (ret == 0);
87917 + return ret;
87918 }
87919
87920 /**
87921 @@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
87922 BUG();
87923 }
87924
87925 - if (security_capable(current_cred(), ns, cap) == 0) {
87926 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
87927 current->flags |= PF_SUPERPRIV;
87928 return true;
87929 }
87930 @@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
87931 }
87932 EXPORT_SYMBOL(ns_capable);
87933
87934 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
87935 +{
87936 + if (unlikely(!cap_valid(cap))) {
87937 + printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
87938 + BUG();
87939 + }
87940 +
87941 + if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
87942 + current->flags |= PF_SUPERPRIV;
87943 + return true;
87944 + }
87945 + return false;
87946 +}
87947 +EXPORT_SYMBOL(ns_capable_nolog);
87948 +
87949 /**
87950 * file_ns_capable - Determine if the file's opener had a capability in effect
87951 * @file: The file we want to check
87952 @@ -427,6 +446,12 @@ bool capable(int cap)
87953 }
87954 EXPORT_SYMBOL(capable);
87955
87956 +bool capable_nolog(int cap)
87957 +{
87958 + return ns_capable_nolog(&init_user_ns, cap);
87959 +}
87960 +EXPORT_SYMBOL(capable_nolog);
87961 +
87962 /**
87963 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
87964 * @inode: The inode in question
87965 @@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
87966 kgid_has_mapping(ns, inode->i_gid);
87967 }
87968 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
87969 +
87970 +bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
87971 +{
87972 + struct user_namespace *ns = current_user_ns();
87973 +
87974 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
87975 + kgid_has_mapping(ns, inode->i_gid);
87976 +}
87977 +EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
87978 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
87979 index 136ecea..45157a6 100644
87980 --- a/kernel/cgroup.c
87981 +++ b/kernel/cgroup.c
87982 @@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
87983 if (!pathbuf || !agentbuf)
87984 goto out;
87985
87986 + if (agentbuf[0] == '\0')
87987 + goto out;
87988 +
87989 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
87990 if (!path)
87991 goto out;
87992 @@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
87993 struct task_struct *task;
87994 int count = 0;
87995
87996 - seq_printf(seq, "css_set %p\n", cset);
87997 + seq_printf(seq, "css_set %pK\n", cset);
87998
87999 list_for_each_entry(task, &cset->tasks, cg_list) {
88000 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
88001 diff --git a/kernel/compat.c b/kernel/compat.c
88002 index ebb3c36..1df606e 100644
88003 --- a/kernel/compat.c
88004 +++ b/kernel/compat.c
88005 @@ -13,6 +13,7 @@
88006
88007 #include <linux/linkage.h>
88008 #include <linux/compat.h>
88009 +#include <linux/module.h>
88010 #include <linux/errno.h>
88011 #include <linux/time.h>
88012 #include <linux/signal.h>
88013 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
88014 mm_segment_t oldfs;
88015 long ret;
88016
88017 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
88018 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
88019 oldfs = get_fs();
88020 set_fs(KERNEL_DS);
88021 ret = hrtimer_nanosleep_restart(restart);
88022 @@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
88023 oldfs = get_fs();
88024 set_fs(KERNEL_DS);
88025 ret = hrtimer_nanosleep(&tu,
88026 - rmtp ? (struct timespec __user *)&rmt : NULL,
88027 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
88028 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
88029 set_fs(oldfs);
88030
88031 @@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
88032 mm_segment_t old_fs = get_fs();
88033
88034 set_fs(KERNEL_DS);
88035 - ret = sys_sigpending((old_sigset_t __user *) &s);
88036 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
88037 set_fs(old_fs);
88038 if (ret == 0)
88039 ret = put_user(s, set);
88040 @@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
88041 mm_segment_t old_fs = get_fs();
88042
88043 set_fs(KERNEL_DS);
88044 - ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
88045 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
88046 set_fs(old_fs);
88047
88048 if (!ret) {
88049 @@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
88050 set_fs (KERNEL_DS);
88051 ret = sys_wait4(pid,
88052 (stat_addr ?
88053 - (unsigned int __user *) &status : NULL),
88054 - options, (struct rusage __user *) &r);
88055 + (unsigned int __force_user *) &status : NULL),
88056 + options, (struct rusage __force_user *) &r);
88057 set_fs (old_fs);
88058
88059 if (ret > 0) {
88060 @@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
88061 memset(&info, 0, sizeof(info));
88062
88063 set_fs(KERNEL_DS);
88064 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
88065 - uru ? (struct rusage __user *)&ru : NULL);
88066 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
88067 + uru ? (struct rusage __force_user *)&ru : NULL);
88068 set_fs(old_fs);
88069
88070 if ((ret < 0) || (info.si_signo == 0))
88071 @@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
88072 oldfs = get_fs();
88073 set_fs(KERNEL_DS);
88074 err = sys_timer_settime(timer_id, flags,
88075 - (struct itimerspec __user *) &newts,
88076 - (struct itimerspec __user *) &oldts);
88077 + (struct itimerspec __force_user *) &newts,
88078 + (struct itimerspec __force_user *) &oldts);
88079 set_fs(oldfs);
88080 if (!err && old && put_compat_itimerspec(old, &oldts))
88081 return -EFAULT;
88082 @@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
88083 oldfs = get_fs();
88084 set_fs(KERNEL_DS);
88085 err = sys_timer_gettime(timer_id,
88086 - (struct itimerspec __user *) &ts);
88087 + (struct itimerspec __force_user *) &ts);
88088 set_fs(oldfs);
88089 if (!err && put_compat_itimerspec(setting, &ts))
88090 return -EFAULT;
88091 @@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88092 oldfs = get_fs();
88093 set_fs(KERNEL_DS);
88094 err = sys_clock_settime(which_clock,
88095 - (struct timespec __user *) &ts);
88096 + (struct timespec __force_user *) &ts);
88097 set_fs(oldfs);
88098 return err;
88099 }
88100 @@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
88101 oldfs = get_fs();
88102 set_fs(KERNEL_DS);
88103 err = sys_clock_gettime(which_clock,
88104 - (struct timespec __user *) &ts);
88105 + (struct timespec __force_user *) &ts);
88106 set_fs(oldfs);
88107 if (!err && compat_put_timespec(&ts, tp))
88108 return -EFAULT;
88109 @@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
88110
88111 oldfs = get_fs();
88112 set_fs(KERNEL_DS);
88113 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
88114 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
88115 set_fs(oldfs);
88116
88117 err = compat_put_timex(utp, &txc);
88118 @@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
88119 oldfs = get_fs();
88120 set_fs(KERNEL_DS);
88121 err = sys_clock_getres(which_clock,
88122 - (struct timespec __user *) &ts);
88123 + (struct timespec __force_user *) &ts);
88124 set_fs(oldfs);
88125 if (!err && tp && compat_put_timespec(&ts, tp))
88126 return -EFAULT;
88127 @@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
88128 struct timespec tu;
88129 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
88130
88131 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
88132 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
88133 oldfs = get_fs();
88134 set_fs(KERNEL_DS);
88135 err = clock_nanosleep_restart(restart);
88136 @@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
88137 oldfs = get_fs();
88138 set_fs(KERNEL_DS);
88139 err = sys_clock_nanosleep(which_clock, flags,
88140 - (struct timespec __user *) &in,
88141 - (struct timespec __user *) &out);
88142 + (struct timespec __force_user *) &in,
88143 + (struct timespec __force_user *) &out);
88144 set_fs(oldfs);
88145
88146 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
88147 @@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
88148 mm_segment_t old_fs = get_fs();
88149
88150 set_fs(KERNEL_DS);
88151 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
88152 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
88153 set_fs(old_fs);
88154 if (compat_put_timespec(&t, interval))
88155 return -EFAULT;
88156 diff --git a/kernel/configs.c b/kernel/configs.c
88157 index c18b1f1..b9a0132 100644
88158 --- a/kernel/configs.c
88159 +++ b/kernel/configs.c
88160 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
88161 struct proc_dir_entry *entry;
88162
88163 /* create the current config file */
88164 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
88165 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
88166 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
88167 + &ikconfig_file_ops);
88168 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88169 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
88170 + &ikconfig_file_ops);
88171 +#endif
88172 +#else
88173 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
88174 &ikconfig_file_ops);
88175 +#endif
88176 +
88177 if (!entry)
88178 return -ENOMEM;
88179
88180 diff --git a/kernel/cred.c b/kernel/cred.c
88181 index e0573a4..26c0fd3 100644
88182 --- a/kernel/cred.c
88183 +++ b/kernel/cred.c
88184 @@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
88185 validate_creds(cred);
88186 alter_cred_subscribers(cred, -1);
88187 put_cred(cred);
88188 +
88189 +#ifdef CONFIG_GRKERNSEC_SETXID
88190 + cred = (struct cred *) tsk->delayed_cred;
88191 + if (cred != NULL) {
88192 + tsk->delayed_cred = NULL;
88193 + validate_creds(cred);
88194 + alter_cred_subscribers(cred, -1);
88195 + put_cred(cred);
88196 + }
88197 +#endif
88198 }
88199
88200 /**
88201 @@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88202 * Always returns 0 thus allowing this function to be tail-called at the end
88203 * of, say, sys_setgid().
88204 */
88205 -int commit_creds(struct cred *new)
88206 +static int __commit_creds(struct cred *new)
88207 {
88208 struct task_struct *task = current;
88209 const struct cred *old = task->real_cred;
88210 @@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88211
88212 get_cred(new); /* we will require a ref for the subj creds too */
88213
88214 + gr_set_role_label(task, new->uid, new->gid);
88215 +
88216 /* dumpability changes */
88217 if (!uid_eq(old->euid, new->euid) ||
88218 !gid_eq(old->egid, new->egid) ||
88219 @@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88220 put_cred(old);
88221 return 0;
88222 }
88223 +#ifdef CONFIG_GRKERNSEC_SETXID
88224 +extern int set_user(struct cred *new);
88225 +
88226 +void gr_delayed_cred_worker(void)
88227 +{
88228 + const struct cred *new = current->delayed_cred;
88229 + struct cred *ncred;
88230 +
88231 + current->delayed_cred = NULL;
88232 +
88233 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88234 + // from doing get_cred on it when queueing this
88235 + put_cred(new);
88236 + return;
88237 + } else if (new == NULL)
88238 + return;
88239 +
88240 + ncred = prepare_creds();
88241 + if (!ncred)
88242 + goto die;
88243 + // uids
88244 + ncred->uid = new->uid;
88245 + ncred->euid = new->euid;
88246 + ncred->suid = new->suid;
88247 + ncred->fsuid = new->fsuid;
88248 + // gids
88249 + ncred->gid = new->gid;
88250 + ncred->egid = new->egid;
88251 + ncred->sgid = new->sgid;
88252 + ncred->fsgid = new->fsgid;
88253 + // groups
88254 + set_groups(ncred, new->group_info);
88255 + // caps
88256 + ncred->securebits = new->securebits;
88257 + ncred->cap_inheritable = new->cap_inheritable;
88258 + ncred->cap_permitted = new->cap_permitted;
88259 + ncred->cap_effective = new->cap_effective;
88260 + ncred->cap_bset = new->cap_bset;
88261 +
88262 + if (set_user(ncred)) {
88263 + abort_creds(ncred);
88264 + goto die;
88265 + }
88266 +
88267 + // from doing get_cred on it when queueing this
88268 + put_cred(new);
88269 +
88270 + __commit_creds(ncred);
88271 + return;
88272 +die:
88273 + // from doing get_cred on it when queueing this
88274 + put_cred(new);
88275 + do_group_exit(SIGKILL);
88276 +}
88277 +#endif
88278 +
88279 +int commit_creds(struct cred *new)
88280 +{
88281 +#ifdef CONFIG_GRKERNSEC_SETXID
88282 + int ret;
88283 + int schedule_it = 0;
88284 + struct task_struct *t;
88285 + unsigned oldsecurebits = current_cred()->securebits;
88286 +
88287 + /* we won't get called with tasklist_lock held for writing
88288 + and interrupts disabled as the cred struct in that case is
88289 + init_cred
88290 + */
88291 + if (grsec_enable_setxid && !current_is_single_threaded() &&
88292 + uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88293 + !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88294 + schedule_it = 1;
88295 + }
88296 + ret = __commit_creds(new);
88297 + if (schedule_it) {
88298 + rcu_read_lock();
88299 + read_lock(&tasklist_lock);
88300 + for (t = next_thread(current); t != current;
88301 + t = next_thread(t)) {
88302 + /* we'll check if the thread has uid 0 in
88303 + * the delayed worker routine
88304 + */
88305 + if (task_securebits(t) == oldsecurebits &&
88306 + t->delayed_cred == NULL) {
88307 + t->delayed_cred = get_cred(new);
88308 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88309 + set_tsk_need_resched(t);
88310 + }
88311 + }
88312 + read_unlock(&tasklist_lock);
88313 + rcu_read_unlock();
88314 + }
88315 +
88316 + return ret;
88317 +#else
88318 + return __commit_creds(new);
88319 +#endif
88320 +}
88321 +
88322 EXPORT_SYMBOL(commit_creds);
88323
88324 /**
88325 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88326 index 1adf62b..7736e06 100644
88327 --- a/kernel/debug/debug_core.c
88328 +++ b/kernel/debug/debug_core.c
88329 @@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88330 */
88331 static atomic_t masters_in_kgdb;
88332 static atomic_t slaves_in_kgdb;
88333 -static atomic_t kgdb_break_tasklet_var;
88334 +static atomic_unchecked_t kgdb_break_tasklet_var;
88335 atomic_t kgdb_setting_breakpoint;
88336
88337 struct task_struct *kgdb_usethread;
88338 @@ -134,7 +134,7 @@ int kgdb_single_step;
88339 static pid_t kgdb_sstep_pid;
88340
88341 /* to keep track of the CPU which is doing the single stepping*/
88342 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88343 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88344
88345 /*
88346 * If you are debugging a problem where roundup (the collection of
88347 @@ -549,7 +549,7 @@ return_normal:
88348 * kernel will only try for the value of sstep_tries before
88349 * giving up and continuing on.
88350 */
88351 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88352 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88353 (kgdb_info[cpu].task &&
88354 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88355 atomic_set(&kgdb_active, -1);
88356 @@ -647,8 +647,8 @@ cpu_master_loop:
88357 }
88358
88359 kgdb_restore:
88360 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88361 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88362 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88363 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88364 if (kgdb_info[sstep_cpu].task)
88365 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88366 else
88367 @@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88368 static void kgdb_tasklet_bpt(unsigned long ing)
88369 {
88370 kgdb_breakpoint();
88371 - atomic_set(&kgdb_break_tasklet_var, 0);
88372 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88373 }
88374
88375 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88376
88377 void kgdb_schedule_breakpoint(void)
88378 {
88379 - if (atomic_read(&kgdb_break_tasklet_var) ||
88380 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88381 atomic_read(&kgdb_active) != -1 ||
88382 atomic_read(&kgdb_setting_breakpoint))
88383 return;
88384 - atomic_inc(&kgdb_break_tasklet_var);
88385 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
88386 tasklet_schedule(&kgdb_tasklet_breakpoint);
88387 }
88388 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88389 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88390 index 379650b..30c5180 100644
88391 --- a/kernel/debug/kdb/kdb_main.c
88392 +++ b/kernel/debug/kdb/kdb_main.c
88393 @@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88394 continue;
88395
88396 kdb_printf("%-20s%8u 0x%p ", mod->name,
88397 - mod->core_size, (void *)mod);
88398 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
88399 #ifdef CONFIG_MODULE_UNLOAD
88400 kdb_printf("%4ld ", module_refcount(mod));
88401 #endif
88402 @@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88403 kdb_printf(" (Loading)");
88404 else
88405 kdb_printf(" (Live)");
88406 - kdb_printf(" 0x%p", mod->module_core);
88407 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88408
88409 #ifdef CONFIG_MODULE_UNLOAD
88410 {
88411 diff --git a/kernel/events/core.c b/kernel/events/core.c
88412 index 2ab0238..bf89262f5 100644
88413 --- a/kernel/events/core.c
88414 +++ b/kernel/events/core.c
88415 @@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88416 * 0 - disallow raw tracepoint access for unpriv
88417 * 1 - disallow cpu events for unpriv
88418 * 2 - disallow kernel profiling for unpriv
88419 + * 3 - disallow all unpriv perf event use
88420 */
88421 -int sysctl_perf_event_paranoid __read_mostly = 1;
88422 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88423 +int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88424 +#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88425 +int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88426 +#else
88427 +int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88428 +#endif
88429
88430 /* Minimum for 512 kiB + 1 user control page */
88431 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88432 @@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88433
88434 tmp *= sysctl_perf_cpu_time_max_percent;
88435 do_div(tmp, 100);
88436 - ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88437 + ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88438 }
88439
88440 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88441 @@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88442 }
88443 }
88444
88445 -static atomic64_t perf_event_id;
88446 +static atomic64_unchecked_t perf_event_id;
88447
88448 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88449 enum event_type_t event_type);
88450 @@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88451
88452 static inline u64 perf_event_count(struct perf_event *event)
88453 {
88454 - return local64_read(&event->count) + atomic64_read(&event->child_count);
88455 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88456 }
88457
88458 static u64 perf_event_read(struct perf_event *event)
88459 @@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88460 mutex_lock(&event->child_mutex);
88461 total += perf_event_read(event);
88462 *enabled += event->total_time_enabled +
88463 - atomic64_read(&event->child_total_time_enabled);
88464 + atomic64_read_unchecked(&event->child_total_time_enabled);
88465 *running += event->total_time_running +
88466 - atomic64_read(&event->child_total_time_running);
88467 + atomic64_read_unchecked(&event->child_total_time_running);
88468
88469 list_for_each_entry(child, &event->child_list, child_list) {
88470 total += perf_event_read(child);
88471 @@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88472 userpg->offset -= local64_read(&event->hw.prev_count);
88473
88474 userpg->time_enabled = enabled +
88475 - atomic64_read(&event->child_total_time_enabled);
88476 + atomic64_read_unchecked(&event->child_total_time_enabled);
88477
88478 userpg->time_running = running +
88479 - atomic64_read(&event->child_total_time_running);
88480 + atomic64_read_unchecked(&event->child_total_time_running);
88481
88482 arch_perf_update_userpage(userpg, now);
88483
88484 @@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88485
88486 /* Data. */
88487 sp = perf_user_stack_pointer(regs);
88488 - rem = __output_copy_user(handle, (void *) sp, dump_size);
88489 + rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88490 dyn_size = dump_size - rem;
88491
88492 perf_output_skip(handle, rem);
88493 @@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88494 values[n++] = perf_event_count(event);
88495 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88496 values[n++] = enabled +
88497 - atomic64_read(&event->child_total_time_enabled);
88498 + atomic64_read_unchecked(&event->child_total_time_enabled);
88499 }
88500 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88501 values[n++] = running +
88502 - atomic64_read(&event->child_total_time_running);
88503 + atomic64_read_unchecked(&event->child_total_time_running);
88504 }
88505 if (read_format & PERF_FORMAT_ID)
88506 values[n++] = primary_event_id(event);
88507 @@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88508 event->parent = parent_event;
88509
88510 event->ns = get_pid_ns(task_active_pid_ns(current));
88511 - event->id = atomic64_inc_return(&perf_event_id);
88512 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
88513
88514 event->state = PERF_EVENT_STATE_INACTIVE;
88515
88516 @@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88517 if (flags & ~PERF_FLAG_ALL)
88518 return -EINVAL;
88519
88520 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88521 + if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88522 + return -EACCES;
88523 +#endif
88524 +
88525 err = perf_copy_attr(attr_uptr, &attr);
88526 if (err)
88527 return err;
88528 @@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88529 /*
88530 * Add back the child's count to the parent's count:
88531 */
88532 - atomic64_add(child_val, &parent_event->child_count);
88533 - atomic64_add(child_event->total_time_enabled,
88534 + atomic64_add_unchecked(child_val, &parent_event->child_count);
88535 + atomic64_add_unchecked(child_event->total_time_enabled,
88536 &parent_event->child_total_time_enabled);
88537 - atomic64_add(child_event->total_time_running,
88538 + atomic64_add_unchecked(child_event->total_time_running,
88539 &parent_event->child_total_time_running);
88540
88541 /*
88542 diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88543 index 569b2187..19940d9 100644
88544 --- a/kernel/events/internal.h
88545 +++ b/kernel/events/internal.h
88546 @@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88547 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88548 }
88549
88550 -#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88551 +#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88552 static inline unsigned long \
88553 func_name(struct perf_output_handle *handle, \
88554 - const void *buf, unsigned long len) \
88555 + const void user *buf, unsigned long len) \
88556 { \
88557 unsigned long size, written; \
88558 \
88559 @@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88560 return 0;
88561 }
88562
88563 -DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88564 +DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88565
88566 static inline unsigned long
88567 memcpy_skip(void *dst, const void *src, unsigned long n)
88568 @@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88569 return 0;
88570 }
88571
88572 -DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88573 +DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88574
88575 #ifndef arch_perf_out_copy_user
88576 #define arch_perf_out_copy_user arch_perf_out_copy_user
88577 @@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88578 }
88579 #endif
88580
88581 -DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88582 +DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88583
88584 /* Callchain handling */
88585 extern struct perf_callchain_entry *
88586 diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88587 index ed8f2cd..fe8030c 100644
88588 --- a/kernel/events/uprobes.c
88589 +++ b/kernel/events/uprobes.c
88590 @@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88591 {
88592 struct page *page;
88593 uprobe_opcode_t opcode;
88594 - int result;
88595 + long result;
88596
88597 pagefault_disable();
88598 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88599 diff --git a/kernel/exit.c b/kernel/exit.c
88600 index 2116aac..d95df2a 100644
88601 --- a/kernel/exit.c
88602 +++ b/kernel/exit.c
88603 @@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88604 struct task_struct *leader;
88605 int zap_leader;
88606 repeat:
88607 +#ifdef CONFIG_NET
88608 + gr_del_task_from_ip_table(p);
88609 +#endif
88610 +
88611 /* don't need to get the RCU readlock here - the process is dead and
88612 * can't be modifying its own credentials. But shut RCU-lockdep up */
88613 rcu_read_lock();
88614 @@ -670,6 +674,8 @@ void do_exit(long code)
88615 int group_dead;
88616 TASKS_RCU(int tasks_rcu_i);
88617
88618 + set_fs(USER_DS);
88619 +
88620 profile_task_exit(tsk);
88621
88622 WARN_ON(blk_needs_flush_plug(tsk));
88623 @@ -686,7 +692,6 @@ void do_exit(long code)
88624 * mm_release()->clear_child_tid() from writing to a user-controlled
88625 * kernel address.
88626 */
88627 - set_fs(USER_DS);
88628
88629 ptrace_event(PTRACE_EVENT_EXIT, code);
88630
88631 @@ -744,6 +749,9 @@ void do_exit(long code)
88632 tsk->exit_code = code;
88633 taskstats_exit(tsk, group_dead);
88634
88635 + gr_acl_handle_psacct(tsk, code);
88636 + gr_acl_handle_exit();
88637 +
88638 exit_mm(tsk);
88639
88640 if (group_dead)
88641 @@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88642 * Take down every thread in the group. This is called by fatal signals
88643 * as well as by sys_exit_group (below).
88644 */
88645 -void
88646 +__noreturn void
88647 do_group_exit(int exit_code)
88648 {
88649 struct signal_struct *sig = current->signal;
88650 diff --git a/kernel/fork.c b/kernel/fork.c
88651 index 9b7d746..5b898ab 100644
88652 --- a/kernel/fork.c
88653 +++ b/kernel/fork.c
88654 @@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88655 # endif
88656 #endif
88657
88658 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88659 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88660 + int node, void **lowmem_stack)
88661 +{
88662 + struct page *pages[THREAD_SIZE / PAGE_SIZE];
88663 + void *ret = NULL;
88664 + unsigned int i;
88665 +
88666 + *lowmem_stack = alloc_thread_info_node(tsk, node);
88667 + if (*lowmem_stack == NULL)
88668 + goto out;
88669 +
88670 + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88671 + pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88672 +
88673 + /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88674 + ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88675 + if (ret == NULL) {
88676 + free_thread_info(*lowmem_stack);
88677 + *lowmem_stack = NULL;
88678 + }
88679 +
88680 +out:
88681 + return ret;
88682 +}
88683 +
88684 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88685 +{
88686 + unmap_process_stacks(tsk);
88687 +}
88688 +#else
88689 +static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88690 + int node, void **lowmem_stack)
88691 +{
88692 + return alloc_thread_info_node(tsk, node);
88693 +}
88694 +static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88695 +{
88696 + free_thread_info(ti);
88697 +}
88698 +#endif
88699 +
88700 /* SLAB cache for signal_struct structures (tsk->signal) */
88701 static struct kmem_cache *signal_cachep;
88702
88703 @@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88704 /* SLAB cache for mm_struct structures (tsk->mm) */
88705 static struct kmem_cache *mm_cachep;
88706
88707 -static void account_kernel_stack(struct thread_info *ti, int account)
88708 +static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88709 {
88710 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88711 + struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88712 +#else
88713 struct zone *zone = page_zone(virt_to_page(ti));
88714 +#endif
88715
88716 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88717 }
88718
88719 void free_task(struct task_struct *tsk)
88720 {
88721 - account_kernel_stack(tsk->stack, -1);
88722 + account_kernel_stack(tsk, tsk->stack, -1);
88723 arch_release_thread_info(tsk->stack);
88724 - free_thread_info(tsk->stack);
88725 + gr_free_thread_info(tsk, tsk->stack);
88726 rt_mutex_debug_task_free(tsk);
88727 ftrace_graph_exit_task(tsk);
88728 put_seccomp_filter(tsk);
88729 @@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88730 {
88731 struct task_struct *tsk;
88732 struct thread_info *ti;
88733 + void *lowmem_stack;
88734 int node = tsk_fork_get_node(orig);
88735 int err;
88736
88737 @@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88738 if (!tsk)
88739 return NULL;
88740
88741 - ti = alloc_thread_info_node(tsk, node);
88742 + ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
88743 if (!ti)
88744 goto free_tsk;
88745
88746 @@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88747 goto free_ti;
88748
88749 tsk->stack = ti;
88750 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88751 + tsk->lowmem_stack = lowmem_stack;
88752 +#endif
88753 #ifdef CONFIG_SECCOMP
88754 /*
88755 * We must handle setting up seccomp filters once we're under
88756 @@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88757 set_task_stack_end_magic(tsk);
88758
88759 #ifdef CONFIG_CC_STACKPROTECTOR
88760 - tsk->stack_canary = get_random_int();
88761 + tsk->stack_canary = pax_get_random_long();
88762 #endif
88763
88764 /*
88765 @@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88766 tsk->splice_pipe = NULL;
88767 tsk->task_frag.page = NULL;
88768
88769 - account_kernel_stack(ti, 1);
88770 + account_kernel_stack(tsk, ti, 1);
88771
88772 return tsk;
88773
88774 free_ti:
88775 - free_thread_info(ti);
88776 + gr_free_thread_info(tsk, ti);
88777 free_tsk:
88778 free_task_struct(tsk);
88779 return NULL;
88780 }
88781
88782 #ifdef CONFIG_MMU
88783 -static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88784 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
88785 +{
88786 + struct vm_area_struct *tmp;
88787 + unsigned long charge;
88788 + struct file *file;
88789 + int retval;
88790 +
88791 + charge = 0;
88792 + if (mpnt->vm_flags & VM_ACCOUNT) {
88793 + unsigned long len = vma_pages(mpnt);
88794 +
88795 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88796 + goto fail_nomem;
88797 + charge = len;
88798 + }
88799 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88800 + if (!tmp)
88801 + goto fail_nomem;
88802 + *tmp = *mpnt;
88803 + tmp->vm_mm = mm;
88804 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
88805 + retval = vma_dup_policy(mpnt, tmp);
88806 + if (retval)
88807 + goto fail_nomem_policy;
88808 + if (anon_vma_fork(tmp, mpnt))
88809 + goto fail_nomem_anon_vma_fork;
88810 + tmp->vm_flags &= ~VM_LOCKED;
88811 + tmp->vm_next = tmp->vm_prev = NULL;
88812 + tmp->vm_mirror = NULL;
88813 + file = tmp->vm_file;
88814 + if (file) {
88815 + struct inode *inode = file_inode(file);
88816 + struct address_space *mapping = file->f_mapping;
88817 +
88818 + get_file(file);
88819 + if (tmp->vm_flags & VM_DENYWRITE)
88820 + atomic_dec(&inode->i_writecount);
88821 + mutex_lock(&mapping->i_mmap_mutex);
88822 + if (tmp->vm_flags & VM_SHARED)
88823 + atomic_inc(&mapping->i_mmap_writable);
88824 + flush_dcache_mmap_lock(mapping);
88825 + /* insert tmp into the share list, just after mpnt */
88826 + if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88827 + vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
88828 + else
88829 + vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
88830 + flush_dcache_mmap_unlock(mapping);
88831 + mutex_unlock(&mapping->i_mmap_mutex);
88832 + }
88833 +
88834 + /*
88835 + * Clear hugetlb-related page reserves for children. This only
88836 + * affects MAP_PRIVATE mappings. Faults generated by the child
88837 + * are not guaranteed to succeed, even if read-only
88838 + */
88839 + if (is_vm_hugetlb_page(tmp))
88840 + reset_vma_resv_huge_pages(tmp);
88841 +
88842 + return tmp;
88843 +
88844 +fail_nomem_anon_vma_fork:
88845 + mpol_put(vma_policy(tmp));
88846 +fail_nomem_policy:
88847 + kmem_cache_free(vm_area_cachep, tmp);
88848 +fail_nomem:
88849 + vm_unacct_memory(charge);
88850 + return NULL;
88851 +}
88852 +
88853 +static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88854 {
88855 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
88856 struct rb_node **rb_link, *rb_parent;
88857 int retval;
88858 - unsigned long charge;
88859
88860 uprobe_start_dup_mmap();
88861 down_write(&oldmm->mmap_sem);
88862 @@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88863
88864 prev = NULL;
88865 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
88866 - struct file *file;
88867 -
88868 if (mpnt->vm_flags & VM_DONTCOPY) {
88869 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
88870 -vma_pages(mpnt));
88871 continue;
88872 }
88873 - charge = 0;
88874 - if (mpnt->vm_flags & VM_ACCOUNT) {
88875 - unsigned long len = vma_pages(mpnt);
88876 -
88877 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88878 - goto fail_nomem;
88879 - charge = len;
88880 - }
88881 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88882 - if (!tmp)
88883 - goto fail_nomem;
88884 - *tmp = *mpnt;
88885 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
88886 - retval = vma_dup_policy(mpnt, tmp);
88887 - if (retval)
88888 - goto fail_nomem_policy;
88889 - tmp->vm_mm = mm;
88890 - if (anon_vma_fork(tmp, mpnt))
88891 - goto fail_nomem_anon_vma_fork;
88892 - tmp->vm_flags &= ~VM_LOCKED;
88893 - tmp->vm_next = tmp->vm_prev = NULL;
88894 - file = tmp->vm_file;
88895 - if (file) {
88896 - struct inode *inode = file_inode(file);
88897 - struct address_space *mapping = file->f_mapping;
88898 -
88899 - get_file(file);
88900 - if (tmp->vm_flags & VM_DENYWRITE)
88901 - atomic_dec(&inode->i_writecount);
88902 - mutex_lock(&mapping->i_mmap_mutex);
88903 - if (tmp->vm_flags & VM_SHARED)
88904 - atomic_inc(&mapping->i_mmap_writable);
88905 - flush_dcache_mmap_lock(mapping);
88906 - /* insert tmp into the share list, just after mpnt */
88907 - if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88908 - vma_nonlinear_insert(tmp,
88909 - &mapping->i_mmap_nonlinear);
88910 - else
88911 - vma_interval_tree_insert_after(tmp, mpnt,
88912 - &mapping->i_mmap);
88913 - flush_dcache_mmap_unlock(mapping);
88914 - mutex_unlock(&mapping->i_mmap_mutex);
88915 + tmp = dup_vma(mm, oldmm, mpnt);
88916 + if (!tmp) {
88917 + retval = -ENOMEM;
88918 + goto out;
88919 }
88920
88921 /*
88922 @@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88923 if (retval)
88924 goto out;
88925 }
88926 +
88927 +#ifdef CONFIG_PAX_SEGMEXEC
88928 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
88929 + struct vm_area_struct *mpnt_m;
88930 +
88931 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
88932 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
88933 +
88934 + if (!mpnt->vm_mirror)
88935 + continue;
88936 +
88937 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
88938 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
88939 + mpnt->vm_mirror = mpnt_m;
88940 + } else {
88941 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
88942 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
88943 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
88944 + mpnt->vm_mirror->vm_mirror = mpnt;
88945 + }
88946 + }
88947 + BUG_ON(mpnt_m);
88948 + }
88949 +#endif
88950 +
88951 /* a new mm has just been created */
88952 arch_dup_mmap(oldmm, mm);
88953 retval = 0;
88954 @@ -486,14 +589,6 @@ out:
88955 up_write(&oldmm->mmap_sem);
88956 uprobe_end_dup_mmap();
88957 return retval;
88958 -fail_nomem_anon_vma_fork:
88959 - mpol_put(vma_policy(tmp));
88960 -fail_nomem_policy:
88961 - kmem_cache_free(vm_area_cachep, tmp);
88962 -fail_nomem:
88963 - retval = -ENOMEM;
88964 - vm_unacct_memory(charge);
88965 - goto out;
88966 }
88967
88968 static inline int mm_alloc_pgd(struct mm_struct *mm)
88969 @@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
88970 return ERR_PTR(err);
88971
88972 mm = get_task_mm(task);
88973 - if (mm && mm != current->mm &&
88974 - !ptrace_may_access(task, mode)) {
88975 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
88976 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
88977 mmput(mm);
88978 mm = ERR_PTR(-EACCES);
88979 }
88980 @@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
88981 spin_unlock(&fs->lock);
88982 return -EAGAIN;
88983 }
88984 - fs->users++;
88985 + atomic_inc(&fs->users);
88986 spin_unlock(&fs->lock);
88987 return 0;
88988 }
88989 tsk->fs = copy_fs_struct(fs);
88990 if (!tsk->fs)
88991 return -ENOMEM;
88992 + /* Carry through gr_chroot_dentry and is_chrooted instead
88993 + of recomputing it here. Already copied when the task struct
88994 + is duplicated. This allows pivot_root to not be treated as
88995 + a chroot
88996 + */
88997 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
88998 +
88999 return 0;
89000 }
89001
89002 @@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
89003 * parts of the process environment (as per the clone
89004 * flags). The actual kick-off is left to the caller.
89005 */
89006 -static struct task_struct *copy_process(unsigned long clone_flags,
89007 +static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
89008 unsigned long stack_start,
89009 unsigned long stack_size,
89010 int __user *child_tidptr,
89011 @@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89012 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
89013 #endif
89014 retval = -EAGAIN;
89015 +
89016 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
89017 +
89018 if (atomic_read(&p->real_cred->user->processes) >=
89019 task_rlimit(p, RLIMIT_NPROC)) {
89020 if (p->real_cred->user != INIT_USER &&
89021 @@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
89022 goto bad_fork_free_pid;
89023 }
89024
89025 + /* synchronizes with gr_set_acls()
89026 + we need to call this past the point of no return for fork()
89027 + */
89028 + gr_copy_label(p);
89029 +
89030 if (likely(p->pid)) {
89031 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
89032
89033 @@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
89034 bad_fork_free:
89035 free_task(p);
89036 fork_out:
89037 + gr_log_forkfail(retval);
89038 +
89039 return ERR_PTR(retval);
89040 }
89041
89042 @@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
89043
89044 p = copy_process(clone_flags, stack_start, stack_size,
89045 child_tidptr, NULL, trace);
89046 + add_latent_entropy();
89047 /*
89048 * Do this prior waking up the new thread - the thread pointer
89049 * might get invalid after that point, if the thread exits quickly.
89050 @@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
89051 if (clone_flags & CLONE_PARENT_SETTID)
89052 put_user(nr, parent_tidptr);
89053
89054 + gr_handle_brute_check();
89055 +
89056 if (clone_flags & CLONE_VFORK) {
89057 p->vfork_done = &vfork;
89058 init_completion(&vfork);
89059 @@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
89060 mm_cachep = kmem_cache_create("mm_struct",
89061 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
89062 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
89063 - vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
89064 + vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
89065 mmap_init();
89066 nsproxy_cache_init();
89067 }
89068 @@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
89069 return 0;
89070
89071 /* don't need lock here; in the worst case we'll do useless copy */
89072 - if (fs->users == 1)
89073 + if (atomic_read(&fs->users) == 1)
89074 return 0;
89075
89076 *new_fsp = copy_fs_struct(fs);
89077 @@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
89078 fs = current->fs;
89079 spin_lock(&fs->lock);
89080 current->fs = new_fs;
89081 - if (--fs->users)
89082 + gr_set_chroot_entries(current, &current->fs->root);
89083 + if (atomic_dec_return(&fs->users))
89084 new_fs = NULL;
89085 else
89086 new_fs = fs;
89087 diff --git a/kernel/futex.c b/kernel/futex.c
89088 index 63678b5..512f9af 100644
89089 --- a/kernel/futex.c
89090 +++ b/kernel/futex.c
89091 @@ -201,7 +201,7 @@ struct futex_pi_state {
89092 atomic_t refcount;
89093
89094 union futex_key key;
89095 -};
89096 +} __randomize_layout;
89097
89098 /**
89099 * struct futex_q - The hashed futex queue entry, one per waiting task
89100 @@ -235,7 +235,7 @@ struct futex_q {
89101 struct rt_mutex_waiter *rt_waiter;
89102 union futex_key *requeue_pi_key;
89103 u32 bitset;
89104 -};
89105 +} __randomize_layout;
89106
89107 static const struct futex_q futex_q_init = {
89108 /* list gets initialized in queue_me()*/
89109 @@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
89110 struct page *page, *page_head;
89111 int err, ro = 0;
89112
89113 +#ifdef CONFIG_PAX_SEGMEXEC
89114 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
89115 + return -EFAULT;
89116 +#endif
89117 +
89118 /*
89119 * The futex address must be "naturally" aligned.
89120 */
89121 @@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
89122
89123 static int get_futex_value_locked(u32 *dest, u32 __user *from)
89124 {
89125 - int ret;
89126 + unsigned long ret;
89127
89128 pagefault_disable();
89129 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
89130 @@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
89131 {
89132 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
89133 u32 curval;
89134 + mm_segment_t oldfs;
89135
89136 /*
89137 * This will fail and we want it. Some arch implementations do
89138 @@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
89139 * implementation, the non-functional ones will return
89140 * -ENOSYS.
89141 */
89142 + oldfs = get_fs();
89143 + set_fs(USER_DS);
89144 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
89145 futex_cmpxchg_enabled = 1;
89146 + set_fs(oldfs);
89147 #endif
89148 }
89149
89150 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
89151 index 55c8c93..9ba7ad6 100644
89152 --- a/kernel/futex_compat.c
89153 +++ b/kernel/futex_compat.c
89154 @@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
89155 return 0;
89156 }
89157
89158 -static void __user *futex_uaddr(struct robust_list __user *entry,
89159 +static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
89160 compat_long_t futex_offset)
89161 {
89162 compat_uptr_t base = ptr_to_compat(entry);
89163 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
89164 index b358a80..fc25240 100644
89165 --- a/kernel/gcov/base.c
89166 +++ b/kernel/gcov/base.c
89167 @@ -114,11 +114,6 @@ void gcov_enable_events(void)
89168 }
89169
89170 #ifdef CONFIG_MODULES
89171 -static inline int within(void *addr, void *start, unsigned long size)
89172 -{
89173 - return ((addr >= start) && (addr < start + size));
89174 -}
89175 -
89176 /* Update list and generate events when modules are unloaded. */
89177 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89178 void *data)
89179 @@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89180
89181 /* Remove entries located in module from linked list. */
89182 while ((info = gcov_info_next(info))) {
89183 - if (within(info, mod->module_core, mod->core_size)) {
89184 + if (within_module_core_rw((unsigned long)info, mod)) {
89185 gcov_info_unlink(prev, info);
89186 if (gcov_events_enabled)
89187 gcov_event(GCOV_REMOVE, info);
89188 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
89189 index 9019f15..9a3c42e 100644
89190 --- a/kernel/jump_label.c
89191 +++ b/kernel/jump_label.c
89192 @@ -14,6 +14,7 @@
89193 #include <linux/err.h>
89194 #include <linux/static_key.h>
89195 #include <linux/jump_label_ratelimit.h>
89196 +#include <linux/mm.h>
89197
89198 #ifdef HAVE_JUMP_LABEL
89199
89200 @@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89201
89202 size = (((unsigned long)stop - (unsigned long)start)
89203 / sizeof(struct jump_entry));
89204 + pax_open_kernel();
89205 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89206 + pax_close_kernel();
89207 }
89208
89209 static void jump_label_update(struct static_key *key, int enable);
89210 @@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89211 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89212 struct jump_entry *iter;
89213
89214 + pax_open_kernel();
89215 for (iter = iter_start; iter < iter_stop; iter++) {
89216 if (within_module_init(iter->code, mod))
89217 iter->code = 0;
89218 }
89219 + pax_close_kernel();
89220 }
89221
89222 static int
89223 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89224 index 5c5987f..bc502b0 100644
89225 --- a/kernel/kallsyms.c
89226 +++ b/kernel/kallsyms.c
89227 @@ -11,6 +11,9 @@
89228 * Changed the compression method from stem compression to "table lookup"
89229 * compression (see scripts/kallsyms.c for a more complete description)
89230 */
89231 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89232 +#define __INCLUDED_BY_HIDESYM 1
89233 +#endif
89234 #include <linux/kallsyms.h>
89235 #include <linux/module.h>
89236 #include <linux/init.h>
89237 @@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89238
89239 static inline int is_kernel_inittext(unsigned long addr)
89240 {
89241 + if (system_state != SYSTEM_BOOTING)
89242 + return 0;
89243 +
89244 if (addr >= (unsigned long)_sinittext
89245 && addr <= (unsigned long)_einittext)
89246 return 1;
89247 return 0;
89248 }
89249
89250 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89251 +#ifdef CONFIG_MODULES
89252 +static inline int is_module_text(unsigned long addr)
89253 +{
89254 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89255 + return 1;
89256 +
89257 + addr = ktla_ktva(addr);
89258 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89259 +}
89260 +#else
89261 +static inline int is_module_text(unsigned long addr)
89262 +{
89263 + return 0;
89264 +}
89265 +#endif
89266 +#endif
89267 +
89268 static inline int is_kernel_text(unsigned long addr)
89269 {
89270 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89271 @@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89272
89273 static inline int is_kernel(unsigned long addr)
89274 {
89275 +
89276 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89277 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
89278 + return 1;
89279 +
89280 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89281 +#else
89282 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89283 +#endif
89284 +
89285 return 1;
89286 return in_gate_area_no_mm(addr);
89287 }
89288
89289 static int is_ksym_addr(unsigned long addr)
89290 {
89291 +
89292 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89293 + if (is_module_text(addr))
89294 + return 0;
89295 +#endif
89296 +
89297 if (all_var)
89298 return is_kernel(addr);
89299
89300 @@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89301
89302 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89303 {
89304 - iter->name[0] = '\0';
89305 iter->nameoff = get_symbol_offset(new_pos);
89306 iter->pos = new_pos;
89307 }
89308 @@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89309 {
89310 struct kallsym_iter *iter = m->private;
89311
89312 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89313 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89314 + return 0;
89315 +#endif
89316 +
89317 /* Some debugging symbols have no name. Ignore them. */
89318 if (!iter->name[0])
89319 return 0;
89320 @@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89321 */
89322 type = iter->exported ? toupper(iter->type) :
89323 tolower(iter->type);
89324 +
89325 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89326 type, iter->name, iter->module_name);
89327 } else
89328 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89329 index 0aa69ea..a7fcafb 100644
89330 --- a/kernel/kcmp.c
89331 +++ b/kernel/kcmp.c
89332 @@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89333 struct task_struct *task1, *task2;
89334 int ret;
89335
89336 +#ifdef CONFIG_GRKERNSEC
89337 + return -ENOSYS;
89338 +#endif
89339 +
89340 rcu_read_lock();
89341
89342 /*
89343 diff --git a/kernel/kexec.c b/kernel/kexec.c
89344 index 2abf9f6..c40cf85 100644
89345 --- a/kernel/kexec.c
89346 +++ b/kernel/kexec.c
89347 @@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89348 compat_ulong_t, flags)
89349 {
89350 struct compat_kexec_segment in;
89351 - struct kexec_segment out, __user *ksegments;
89352 + struct kexec_segment out;
89353 + struct kexec_segment __user *ksegments;
89354 unsigned long i, result;
89355
89356 /* Don't allow clients that don't understand the native
89357 diff --git a/kernel/kmod.c b/kernel/kmod.c
89358 index 80f7a6d..3c476d3 100644
89359 --- a/kernel/kmod.c
89360 +++ b/kernel/kmod.c
89361 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89362 kfree(info->argv);
89363 }
89364
89365 -static int call_modprobe(char *module_name, int wait)
89366 +static int call_modprobe(char *module_name, char *module_param, int wait)
89367 {
89368 struct subprocess_info *info;
89369 static char *envp[] = {
89370 @@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89371 NULL
89372 };
89373
89374 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89375 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89376 if (!argv)
89377 goto out;
89378
89379 @@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89380 argv[1] = "-q";
89381 argv[2] = "--";
89382 argv[3] = module_name; /* check free_modprobe_argv() */
89383 - argv[4] = NULL;
89384 + argv[4] = module_param;
89385 + argv[5] = NULL;
89386
89387 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89388 NULL, free_modprobe_argv, NULL);
89389 @@ -129,9 +130,8 @@ out:
89390 * If module auto-loading support is disabled then this function
89391 * becomes a no-operation.
89392 */
89393 -int __request_module(bool wait, const char *fmt, ...)
89394 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89395 {
89396 - va_list args;
89397 char module_name[MODULE_NAME_LEN];
89398 unsigned int max_modprobes;
89399 int ret;
89400 @@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89401 if (!modprobe_path[0])
89402 return 0;
89403
89404 - va_start(args, fmt);
89405 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89406 - va_end(args);
89407 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89408 if (ret >= MODULE_NAME_LEN)
89409 return -ENAMETOOLONG;
89410
89411 @@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89412 if (ret)
89413 return ret;
89414
89415 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89416 + if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89417 + /* hack to workaround consolekit/udisks stupidity */
89418 + read_lock(&tasklist_lock);
89419 + if (!strcmp(current->comm, "mount") &&
89420 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89421 + read_unlock(&tasklist_lock);
89422 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89423 + return -EPERM;
89424 + }
89425 + read_unlock(&tasklist_lock);
89426 + }
89427 +#endif
89428 +
89429 /* If modprobe needs a service that is in a module, we get a recursive
89430 * loop. Limit the number of running kmod threads to max_threads/2 or
89431 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89432 @@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89433
89434 trace_module_request(module_name, wait, _RET_IP_);
89435
89436 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89437 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89438
89439 atomic_dec(&kmod_concurrent);
89440 return ret;
89441 }
89442 +
89443 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89444 +{
89445 + va_list args;
89446 + int ret;
89447 +
89448 + va_start(args, fmt);
89449 + ret = ____request_module(wait, module_param, fmt, args);
89450 + va_end(args);
89451 +
89452 + return ret;
89453 +}
89454 +
89455 +int __request_module(bool wait, const char *fmt, ...)
89456 +{
89457 + va_list args;
89458 + int ret;
89459 +
89460 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
89461 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89462 + char module_param[MODULE_NAME_LEN];
89463 +
89464 + memset(module_param, 0, sizeof(module_param));
89465 +
89466 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89467 +
89468 + va_start(args, fmt);
89469 + ret = ____request_module(wait, module_param, fmt, args);
89470 + va_end(args);
89471 +
89472 + return ret;
89473 + }
89474 +#endif
89475 +
89476 + va_start(args, fmt);
89477 + ret = ____request_module(wait, NULL, fmt, args);
89478 + va_end(args);
89479 +
89480 + return ret;
89481 +}
89482 +
89483 EXPORT_SYMBOL(__request_module);
89484 #endif /* CONFIG_MODULES */
89485
89486 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89487 {
89488 +#ifdef CONFIG_GRKERNSEC
89489 + kfree(info->path);
89490 + info->path = info->origpath;
89491 +#endif
89492 if (info->cleanup)
89493 (*info->cleanup)(info);
89494 kfree(info);
89495 @@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89496 */
89497 set_user_nice(current, 0);
89498
89499 +#ifdef CONFIG_GRKERNSEC
89500 + /* this is race-free as far as userland is concerned as we copied
89501 + out the path to be used prior to this point and are now operating
89502 + on that copy
89503 + */
89504 + if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89505 + strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89506 + strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89507 + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89508 + retval = -EPERM;
89509 + goto out;
89510 + }
89511 +#endif
89512 +
89513 retval = -ENOMEM;
89514 new = prepare_kernel_cred(current);
89515 if (!new)
89516 @@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89517 commit_creds(new);
89518
89519 retval = do_execve(getname_kernel(sub_info->path),
89520 - (const char __user *const __user *)sub_info->argv,
89521 - (const char __user *const __user *)sub_info->envp);
89522 + (const char __user *const __force_user *)sub_info->argv,
89523 + (const char __user *const __force_user *)sub_info->envp);
89524 out:
89525 sub_info->retval = retval;
89526 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89527 @@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89528 *
89529 * Thus the __user pointer cast is valid here.
89530 */
89531 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
89532 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89533
89534 /*
89535 * If ret is 0, either ____call_usermodehelper failed and the
89536 @@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89537 goto out;
89538
89539 INIT_WORK(&sub_info->work, __call_usermodehelper);
89540 +#ifdef CONFIG_GRKERNSEC
89541 + sub_info->origpath = path;
89542 + sub_info->path = kstrdup(path, gfp_mask);
89543 +#else
89544 sub_info->path = path;
89545 +#endif
89546 sub_info->argv = argv;
89547 sub_info->envp = envp;
89548
89549 @@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89550 static int proc_cap_handler(struct ctl_table *table, int write,
89551 void __user *buffer, size_t *lenp, loff_t *ppos)
89552 {
89553 - struct ctl_table t;
89554 + ctl_table_no_const t;
89555 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89556 kernel_cap_t new_cap;
89557 int err, i;
89558 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89559 index 3995f54..e247879 100644
89560 --- a/kernel/kprobes.c
89561 +++ b/kernel/kprobes.c
89562 @@ -31,6 +31,9 @@
89563 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89564 * <prasanna@in.ibm.com> added function-return probes.
89565 */
89566 +#ifdef CONFIG_GRKERNSEC_HIDESYM
89567 +#define __INCLUDED_BY_HIDESYM 1
89568 +#endif
89569 #include <linux/kprobes.h>
89570 #include <linux/hash.h>
89571 #include <linux/init.h>
89572 @@ -122,12 +125,12 @@ enum kprobe_slot_state {
89573
89574 static void *alloc_insn_page(void)
89575 {
89576 - return module_alloc(PAGE_SIZE);
89577 + return module_alloc_exec(PAGE_SIZE);
89578 }
89579
89580 static void free_insn_page(void *page)
89581 {
89582 - module_free(NULL, page);
89583 + module_free_exec(NULL, page);
89584 }
89585
89586 struct kprobe_insn_cache kprobe_insn_slots = {
89587 @@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89588 kprobe_type = "k";
89589
89590 if (sym)
89591 - seq_printf(pi, "%p %s %s+0x%x %s ",
89592 + seq_printf(pi, "%pK %s %s+0x%x %s ",
89593 p->addr, kprobe_type, sym, offset,
89594 (modname ? modname : " "));
89595 else
89596 - seq_printf(pi, "%p %s %p ",
89597 + seq_printf(pi, "%pK %s %pK ",
89598 p->addr, kprobe_type, p->addr);
89599
89600 if (!pp)
89601 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89602 index 6683cce..daf8999 100644
89603 --- a/kernel/ksysfs.c
89604 +++ b/kernel/ksysfs.c
89605 @@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89606 {
89607 if (count+1 > UEVENT_HELPER_PATH_LEN)
89608 return -ENOENT;
89609 + if (!capable(CAP_SYS_ADMIN))
89610 + return -EPERM;
89611 memcpy(uevent_helper, buf, count);
89612 uevent_helper[count] = '\0';
89613 if (count && uevent_helper[count-1] == '\n')
89614 @@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89615 return count;
89616 }
89617
89618 -static struct bin_attribute notes_attr = {
89619 +static bin_attribute_no_const notes_attr __read_only = {
89620 .attr = {
89621 .name = "notes",
89622 .mode = S_IRUGO,
89623 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89624 index 88d0d44..e9ce0ee 100644
89625 --- a/kernel/locking/lockdep.c
89626 +++ b/kernel/locking/lockdep.c
89627 @@ -599,6 +599,10 @@ static int static_obj(void *obj)
89628 end = (unsigned long) &_end,
89629 addr = (unsigned long) obj;
89630
89631 +#ifdef CONFIG_PAX_KERNEXEC
89632 + start = ktla_ktva(start);
89633 +#endif
89634 +
89635 /*
89636 * static variable?
89637 */
89638 @@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89639 if (!static_obj(lock->key)) {
89640 debug_locks_off();
89641 printk("INFO: trying to register non-static key.\n");
89642 + printk("lock:%pS key:%pS.\n", lock, lock->key);
89643 printk("the code is fine but needs lockdep annotation.\n");
89644 printk("turning off the locking correctness validator.\n");
89645 dump_stack();
89646 @@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89647 if (!class)
89648 return 0;
89649 }
89650 - atomic_inc((atomic_t *)&class->ops);
89651 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89652 if (very_verbose(class)) {
89653 printk("\nacquire class [%p] %s", class->key, class->name);
89654 if (class->name_version > 1)
89655 diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89656 index ef43ac4..2720dfa 100644
89657 --- a/kernel/locking/lockdep_proc.c
89658 +++ b/kernel/locking/lockdep_proc.c
89659 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89660 return 0;
89661 }
89662
89663 - seq_printf(m, "%p", class->key);
89664 + seq_printf(m, "%pK", class->key);
89665 #ifdef CONFIG_DEBUG_LOCKDEP
89666 seq_printf(m, " OPS:%8ld", class->ops);
89667 #endif
89668 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89669
89670 list_for_each_entry(entry, &class->locks_after, entry) {
89671 if (entry->distance == 1) {
89672 - seq_printf(m, " -> [%p] ", entry->class->key);
89673 + seq_printf(m, " -> [%pK] ", entry->class->key);
89674 print_name(m, entry->class);
89675 seq_puts(m, "\n");
89676 }
89677 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89678 if (!class->key)
89679 continue;
89680
89681 - seq_printf(m, "[%p] ", class->key);
89682 + seq_printf(m, "[%pK] ", class->key);
89683 print_name(m, class);
89684 seq_puts(m, "\n");
89685 }
89686 @@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89687 if (!i)
89688 seq_line(m, '-', 40-namelen, namelen);
89689
89690 - snprintf(ip, sizeof(ip), "[<%p>]",
89691 + snprintf(ip, sizeof(ip), "[<%pK>]",
89692 (void *)class->contention_point[i]);
89693 seq_printf(m, "%40s %14lu %29s %pS\n",
89694 name, stats->contention_point[i],
89695 @@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89696 if (!i)
89697 seq_line(m, '-', 40-namelen, namelen);
89698
89699 - snprintf(ip, sizeof(ip), "[<%p>]",
89700 + snprintf(ip, sizeof(ip), "[<%pK>]",
89701 (void *)class->contending_point[i]);
89702 seq_printf(m, "%40s %14lu %29s %pS\n",
89703 name, stats->contending_point[i],
89704 diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89705 index 9887a90..0cd2b1d 100644
89706 --- a/kernel/locking/mcs_spinlock.c
89707 +++ b/kernel/locking/mcs_spinlock.c
89708 @@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89709
89710 prev = decode_cpu(old);
89711 node->prev = prev;
89712 - ACCESS_ONCE(prev->next) = node;
89713 + ACCESS_ONCE_RW(prev->next) = node;
89714
89715 /*
89716 * Normally @prev is untouchable after the above store; because at that
89717 @@ -172,8 +172,8 @@ unqueue:
89718 * it will wait in Step-A.
89719 */
89720
89721 - ACCESS_ONCE(next->prev) = prev;
89722 - ACCESS_ONCE(prev->next) = next;
89723 + ACCESS_ONCE_RW(next->prev) = prev;
89724 + ACCESS_ONCE_RW(prev->next) = next;
89725
89726 return false;
89727 }
89728 @@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89729 node = this_cpu_ptr(&osq_node);
89730 next = xchg(&node->next, NULL);
89731 if (next) {
89732 - ACCESS_ONCE(next->locked) = 1;
89733 + ACCESS_ONCE_RW(next->locked) = 1;
89734 return;
89735 }
89736
89737 next = osq_wait_next(lock, node, NULL);
89738 if (next)
89739 - ACCESS_ONCE(next->locked) = 1;
89740 + ACCESS_ONCE_RW(next->locked) = 1;
89741 }
89742
89743 #endif
89744 diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
89745 index 4d60986..5d351c1 100644
89746 --- a/kernel/locking/mcs_spinlock.h
89747 +++ b/kernel/locking/mcs_spinlock.h
89748 @@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
89749 */
89750 return;
89751 }
89752 - ACCESS_ONCE(prev->next) = node;
89753 + ACCESS_ONCE_RW(prev->next) = node;
89754
89755 /* Wait until the lock holder passes the lock down. */
89756 arch_mcs_spin_lock_contended(&node->locked);
89757 diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
89758 index 5cf6731..ce3bc5a 100644
89759 --- a/kernel/locking/mutex-debug.c
89760 +++ b/kernel/locking/mutex-debug.c
89761 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
89762 }
89763
89764 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89765 - struct thread_info *ti)
89766 + struct task_struct *task)
89767 {
89768 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
89769
89770 /* Mark the current thread as blocked on the lock: */
89771 - ti->task->blocked_on = waiter;
89772 + task->blocked_on = waiter;
89773 }
89774
89775 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89776 - struct thread_info *ti)
89777 + struct task_struct *task)
89778 {
89779 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
89780 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
89781 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
89782 - ti->task->blocked_on = NULL;
89783 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
89784 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
89785 + task->blocked_on = NULL;
89786
89787 list_del_init(&waiter->list);
89788 waiter->task = NULL;
89789 diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
89790 index 0799fd3..d06ae3b 100644
89791 --- a/kernel/locking/mutex-debug.h
89792 +++ b/kernel/locking/mutex-debug.h
89793 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
89794 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
89795 extern void debug_mutex_add_waiter(struct mutex *lock,
89796 struct mutex_waiter *waiter,
89797 - struct thread_info *ti);
89798 + struct task_struct *task);
89799 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89800 - struct thread_info *ti);
89801 + struct task_struct *task);
89802 extern void debug_mutex_unlock(struct mutex *lock);
89803 extern void debug_mutex_init(struct mutex *lock, const char *name,
89804 struct lock_class_key *key);
89805 diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
89806 index dadbf88..4500507 100644
89807 --- a/kernel/locking/mutex.c
89808 +++ b/kernel/locking/mutex.c
89809 @@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89810 goto skip_wait;
89811
89812 debug_mutex_lock_common(lock, &waiter);
89813 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
89814 + debug_mutex_add_waiter(lock, &waiter, task);
89815
89816 /* add waiting tasks to the end of the waitqueue (FIFO): */
89817 list_add_tail(&waiter.list, &lock->wait_list);
89818 @@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89819 schedule_preempt_disabled();
89820 spin_lock_mutex(&lock->wait_lock, flags);
89821 }
89822 - mutex_remove_waiter(lock, &waiter, current_thread_info());
89823 + mutex_remove_waiter(lock, &waiter, task);
89824 /* set it to 0 if there are no waiters left: */
89825 if (likely(list_empty(&lock->wait_list)))
89826 atomic_set(&lock->count, 0);
89827 @@ -600,7 +600,7 @@ skip_wait:
89828 return 0;
89829
89830 err:
89831 - mutex_remove_waiter(lock, &waiter, task_thread_info(task));
89832 + mutex_remove_waiter(lock, &waiter, task);
89833 spin_unlock_mutex(&lock->wait_lock, flags);
89834 debug_mutex_free_waiter(&waiter);
89835 mutex_release(&lock->dep_map, 1, ip);
89836 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
89837 index 1d96dd0..994ff19 100644
89838 --- a/kernel/locking/rtmutex-tester.c
89839 +++ b/kernel/locking/rtmutex-tester.c
89840 @@ -22,7 +22,7 @@
89841 #define MAX_RT_TEST_MUTEXES 8
89842
89843 static spinlock_t rttest_lock;
89844 -static atomic_t rttest_event;
89845 +static atomic_unchecked_t rttest_event;
89846
89847 struct test_thread_data {
89848 int opcode;
89849 @@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89850
89851 case RTTEST_LOCKCONT:
89852 td->mutexes[td->opdata] = 1;
89853 - td->event = atomic_add_return(1, &rttest_event);
89854 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89855 return 0;
89856
89857 case RTTEST_RESET:
89858 @@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89859 return 0;
89860
89861 case RTTEST_RESETEVENT:
89862 - atomic_set(&rttest_event, 0);
89863 + atomic_set_unchecked(&rttest_event, 0);
89864 return 0;
89865
89866 default:
89867 @@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89868 return ret;
89869
89870 td->mutexes[id] = 1;
89871 - td->event = atomic_add_return(1, &rttest_event);
89872 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89873 rt_mutex_lock(&mutexes[id]);
89874 - td->event = atomic_add_return(1, &rttest_event);
89875 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89876 td->mutexes[id] = 4;
89877 return 0;
89878
89879 @@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89880 return ret;
89881
89882 td->mutexes[id] = 1;
89883 - td->event = atomic_add_return(1, &rttest_event);
89884 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89885 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
89886 - td->event = atomic_add_return(1, &rttest_event);
89887 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89888 td->mutexes[id] = ret ? 0 : 4;
89889 return ret ? -EINTR : 0;
89890
89891 @@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89892 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
89893 return ret;
89894
89895 - td->event = atomic_add_return(1, &rttest_event);
89896 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89897 rt_mutex_unlock(&mutexes[id]);
89898 - td->event = atomic_add_return(1, &rttest_event);
89899 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89900 td->mutexes[id] = 0;
89901 return 0;
89902
89903 @@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89904 break;
89905
89906 td->mutexes[dat] = 2;
89907 - td->event = atomic_add_return(1, &rttest_event);
89908 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89909 break;
89910
89911 default:
89912 @@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89913 return;
89914
89915 td->mutexes[dat] = 3;
89916 - td->event = atomic_add_return(1, &rttest_event);
89917 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89918 break;
89919
89920 case RTTEST_LOCKNOWAIT:
89921 @@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89922 return;
89923
89924 td->mutexes[dat] = 1;
89925 - td->event = atomic_add_return(1, &rttest_event);
89926 + td->event = atomic_add_return_unchecked(1, &rttest_event);
89927 return;
89928
89929 default:
89930 diff --git a/kernel/module.c b/kernel/module.c
89931 index 88cec1d..d097c28 100644
89932 --- a/kernel/module.c
89933 +++ b/kernel/module.c
89934 @@ -60,6 +60,7 @@
89935 #include <linux/jump_label.h>
89936 #include <linux/pfn.h>
89937 #include <linux/bsearch.h>
89938 +#include <linux/grsecurity.h>
89939 #include <uapi/linux/module.h>
89940 #include "module-internal.h"
89941
89942 @@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
89943
89944 /* Bounds of module allocation, for speeding __module_address.
89945 * Protected by module_mutex. */
89946 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
89947 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
89948 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
89949
89950 int register_module_notifier(struct notifier_block * nb)
89951 {
89952 @@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89953 return true;
89954
89955 list_for_each_entry_rcu(mod, &modules, list) {
89956 - struct symsearch arr[] = {
89957 + struct symsearch modarr[] = {
89958 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
89959 NOT_GPL_ONLY, false },
89960 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
89961 @@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89962 if (mod->state == MODULE_STATE_UNFORMED)
89963 continue;
89964
89965 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
89966 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
89967 return true;
89968 }
89969 return false;
89970 @@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
89971 if (!pcpusec->sh_size)
89972 return 0;
89973
89974 - if (align > PAGE_SIZE) {
89975 + if (align-1 >= PAGE_SIZE) {
89976 pr_warn("%s: per-cpu alignment %li > %li\n",
89977 mod->name, align, PAGE_SIZE);
89978 align = PAGE_SIZE;
89979 @@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
89980 static ssize_t show_coresize(struct module_attribute *mattr,
89981 struct module_kobject *mk, char *buffer)
89982 {
89983 - return sprintf(buffer, "%u\n", mk->mod->core_size);
89984 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
89985 }
89986
89987 static struct module_attribute modinfo_coresize =
89988 @@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
89989 static ssize_t show_initsize(struct module_attribute *mattr,
89990 struct module_kobject *mk, char *buffer)
89991 {
89992 - return sprintf(buffer, "%u\n", mk->mod->init_size);
89993 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
89994 }
89995
89996 static struct module_attribute modinfo_initsize =
89997 @@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
89998 goto bad_version;
89999 }
90000
90001 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90002 + /*
90003 + * avoid potentially printing jibberish on attempted load
90004 + * of a module randomized with a different seed
90005 + */
90006 + pr_warn("no symbol version for %s\n", symname);
90007 +#else
90008 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
90009 +#endif
90010 return 0;
90011
90012 bad_version:
90013 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90014 + /*
90015 + * avoid potentially printing jibberish on attempted load
90016 + * of a module randomized with a different seed
90017 + */
90018 + printk("attempted module disagrees about version of symbol %s\n",
90019 + symname);
90020 +#else
90021 printk("%s: disagrees about version of symbol %s\n",
90022 mod->name, symname);
90023 +#endif
90024 return 0;
90025 }
90026
90027 @@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
90028 */
90029 #ifdef CONFIG_SYSFS
90030
90031 -#ifdef CONFIG_KALLSYMS
90032 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
90033 static inline bool sect_empty(const Elf_Shdr *sect)
90034 {
90035 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
90036 @@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
90037 {
90038 unsigned int notes, loaded, i;
90039 struct module_notes_attrs *notes_attrs;
90040 - struct bin_attribute *nattr;
90041 + bin_attribute_no_const *nattr;
90042
90043 /* failed to create section attributes, so can't create notes */
90044 if (!mod->sect_attrs)
90045 @@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
90046 static int module_add_modinfo_attrs(struct module *mod)
90047 {
90048 struct module_attribute *attr;
90049 - struct module_attribute *temp_attr;
90050 + module_attribute_no_const *temp_attr;
90051 int error = 0;
90052 int i;
90053
90054 @@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
90055
90056 static void unset_module_core_ro_nx(struct module *mod)
90057 {
90058 - set_page_attributes(mod->module_core + mod->core_text_size,
90059 - mod->module_core + mod->core_size,
90060 + set_page_attributes(mod->module_core_rw,
90061 + mod->module_core_rw + mod->core_size_rw,
90062 set_memory_x);
90063 - set_page_attributes(mod->module_core,
90064 - mod->module_core + mod->core_ro_size,
90065 + set_page_attributes(mod->module_core_rx,
90066 + mod->module_core_rx + mod->core_size_rx,
90067 set_memory_rw);
90068 }
90069
90070 static void unset_module_init_ro_nx(struct module *mod)
90071 {
90072 - set_page_attributes(mod->module_init + mod->init_text_size,
90073 - mod->module_init + mod->init_size,
90074 + set_page_attributes(mod->module_init_rw,
90075 + mod->module_init_rw + mod->init_size_rw,
90076 set_memory_x);
90077 - set_page_attributes(mod->module_init,
90078 - mod->module_init + mod->init_ro_size,
90079 + set_page_attributes(mod->module_init_rx,
90080 + mod->module_init_rx + mod->init_size_rx,
90081 set_memory_rw);
90082 }
90083
90084 @@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
90085 list_for_each_entry_rcu(mod, &modules, list) {
90086 if (mod->state == MODULE_STATE_UNFORMED)
90087 continue;
90088 - if ((mod->module_core) && (mod->core_text_size)) {
90089 - set_page_attributes(mod->module_core,
90090 - mod->module_core + mod->core_text_size,
90091 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
90092 + set_page_attributes(mod->module_core_rx,
90093 + mod->module_core_rx + mod->core_size_rx,
90094 set_memory_rw);
90095 }
90096 - if ((mod->module_init) && (mod->init_text_size)) {
90097 - set_page_attributes(mod->module_init,
90098 - mod->module_init + mod->init_text_size,
90099 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
90100 + set_page_attributes(mod->module_init_rx,
90101 + mod->module_init_rx + mod->init_size_rx,
90102 set_memory_rw);
90103 }
90104 }
90105 @@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
90106 list_for_each_entry_rcu(mod, &modules, list) {
90107 if (mod->state == MODULE_STATE_UNFORMED)
90108 continue;
90109 - if ((mod->module_core) && (mod->core_text_size)) {
90110 - set_page_attributes(mod->module_core,
90111 - mod->module_core + mod->core_text_size,
90112 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
90113 + set_page_attributes(mod->module_core_rx,
90114 + mod->module_core_rx + mod->core_size_rx,
90115 set_memory_ro);
90116 }
90117 - if ((mod->module_init) && (mod->init_text_size)) {
90118 - set_page_attributes(mod->module_init,
90119 - mod->module_init + mod->init_text_size,
90120 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
90121 + set_page_attributes(mod->module_init_rx,
90122 + mod->module_init_rx + mod->init_size_rx,
90123 set_memory_ro);
90124 }
90125 }
90126 @@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
90127
90128 /* This may be NULL, but that's OK */
90129 unset_module_init_ro_nx(mod);
90130 - module_free(mod, mod->module_init);
90131 + module_free(mod, mod->module_init_rw);
90132 + module_free_exec(mod, mod->module_init_rx);
90133 kfree(mod->args);
90134 percpu_modfree(mod);
90135
90136 /* Free lock-classes: */
90137 - lockdep_free_key_range(mod->module_core, mod->core_size);
90138 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
90139 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
90140
90141 /* Finally, free the core (containing the module structure) */
90142 unset_module_core_ro_nx(mod);
90143 - module_free(mod, mod->module_core);
90144 + module_free_exec(mod, mod->module_core_rx);
90145 + module_free(mod, mod->module_core_rw);
90146
90147 #ifdef CONFIG_MPU
90148 update_protections(current->mm);
90149 @@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90150 int ret = 0;
90151 const struct kernel_symbol *ksym;
90152
90153 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90154 + int is_fs_load = 0;
90155 + int register_filesystem_found = 0;
90156 + char *p;
90157 +
90158 + p = strstr(mod->args, "grsec_modharden_fs");
90159 + if (p) {
90160 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
90161 + /* copy \0 as well */
90162 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
90163 + is_fs_load = 1;
90164 + }
90165 +#endif
90166 +
90167 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
90168 const char *name = info->strtab + sym[i].st_name;
90169
90170 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90171 + /* it's a real shame this will never get ripped and copied
90172 + upstream! ;(
90173 + */
90174 + if (is_fs_load && !strcmp(name, "register_filesystem"))
90175 + register_filesystem_found = 1;
90176 +#endif
90177 +
90178 switch (sym[i].st_shndx) {
90179 case SHN_COMMON:
90180 /* Ignore common symbols */
90181 @@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90182 ksym = resolve_symbol_wait(mod, info, name);
90183 /* Ok if resolved. */
90184 if (ksym && !IS_ERR(ksym)) {
90185 + pax_open_kernel();
90186 sym[i].st_value = ksym->value;
90187 + pax_close_kernel();
90188 break;
90189 }
90190
90191 @@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90192 secbase = (unsigned long)mod_percpu(mod);
90193 else
90194 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
90195 + pax_open_kernel();
90196 sym[i].st_value += secbase;
90197 + pax_close_kernel();
90198 break;
90199 }
90200 }
90201
90202 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90203 + if (is_fs_load && !register_filesystem_found) {
90204 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90205 + ret = -EPERM;
90206 + }
90207 +#endif
90208 +
90209 return ret;
90210 }
90211
90212 @@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90213 || s->sh_entsize != ~0UL
90214 || strstarts(sname, ".init"))
90215 continue;
90216 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90217 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90218 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90219 + else
90220 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90221 pr_debug("\t%s\n", sname);
90222 }
90223 - switch (m) {
90224 - case 0: /* executable */
90225 - mod->core_size = debug_align(mod->core_size);
90226 - mod->core_text_size = mod->core_size;
90227 - break;
90228 - case 1: /* RO: text and ro-data */
90229 - mod->core_size = debug_align(mod->core_size);
90230 - mod->core_ro_size = mod->core_size;
90231 - break;
90232 - case 3: /* whole core */
90233 - mod->core_size = debug_align(mod->core_size);
90234 - break;
90235 - }
90236 }
90237
90238 pr_debug("Init section allocation order:\n");
90239 @@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90240 || s->sh_entsize != ~0UL
90241 || !strstarts(sname, ".init"))
90242 continue;
90243 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90244 - | INIT_OFFSET_MASK);
90245 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90246 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90247 + else
90248 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90249 + s->sh_entsize |= INIT_OFFSET_MASK;
90250 pr_debug("\t%s\n", sname);
90251 }
90252 - switch (m) {
90253 - case 0: /* executable */
90254 - mod->init_size = debug_align(mod->init_size);
90255 - mod->init_text_size = mod->init_size;
90256 - break;
90257 - case 1: /* RO: text and ro-data */
90258 - mod->init_size = debug_align(mod->init_size);
90259 - mod->init_ro_size = mod->init_size;
90260 - break;
90261 - case 3: /* whole init */
90262 - mod->init_size = debug_align(mod->init_size);
90263 - break;
90264 - }
90265 }
90266 }
90267
90268 @@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90269
90270 /* Put symbol section at end of init part of module. */
90271 symsect->sh_flags |= SHF_ALLOC;
90272 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90273 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90274 info->index.sym) | INIT_OFFSET_MASK;
90275 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90276
90277 @@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90278 }
90279
90280 /* Append room for core symbols at end of core part. */
90281 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90282 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90283 - mod->core_size += strtab_size;
90284 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90285 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90286 + mod->core_size_rx += strtab_size;
90287
90288 /* Put string table section at end of init part of module. */
90289 strsect->sh_flags |= SHF_ALLOC;
90290 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90291 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90292 info->index.str) | INIT_OFFSET_MASK;
90293 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90294 }
90295 @@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90296 /* Make sure we get permanent strtab: don't use info->strtab. */
90297 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90298
90299 + pax_open_kernel();
90300 +
90301 /* Set types up while we still have access to sections. */
90302 for (i = 0; i < mod->num_symtab; i++)
90303 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90304
90305 - mod->core_symtab = dst = mod->module_core + info->symoffs;
90306 - mod->core_strtab = s = mod->module_core + info->stroffs;
90307 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90308 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90309 src = mod->symtab;
90310 for (ndst = i = 0; i < mod->num_symtab; i++) {
90311 if (i == 0 ||
90312 @@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90313 }
90314 }
90315 mod->core_num_syms = ndst;
90316 +
90317 + pax_close_kernel();
90318 }
90319 #else
90320 static inline void layout_symtab(struct module *mod, struct load_info *info)
90321 @@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90322 return vmalloc_exec(size);
90323 }
90324
90325 -static void *module_alloc_update_bounds(unsigned long size)
90326 +static void *module_alloc_update_bounds_rw(unsigned long size)
90327 {
90328 void *ret = module_alloc(size);
90329
90330 if (ret) {
90331 mutex_lock(&module_mutex);
90332 /* Update module bounds. */
90333 - if ((unsigned long)ret < module_addr_min)
90334 - module_addr_min = (unsigned long)ret;
90335 - if ((unsigned long)ret + size > module_addr_max)
90336 - module_addr_max = (unsigned long)ret + size;
90337 + if ((unsigned long)ret < module_addr_min_rw)
90338 + module_addr_min_rw = (unsigned long)ret;
90339 + if ((unsigned long)ret + size > module_addr_max_rw)
90340 + module_addr_max_rw = (unsigned long)ret + size;
90341 + mutex_unlock(&module_mutex);
90342 + }
90343 + return ret;
90344 +}
90345 +
90346 +static void *module_alloc_update_bounds_rx(unsigned long size)
90347 +{
90348 + void *ret = module_alloc_exec(size);
90349 +
90350 + if (ret) {
90351 + mutex_lock(&module_mutex);
90352 + /* Update module bounds. */
90353 + if ((unsigned long)ret < module_addr_min_rx)
90354 + module_addr_min_rx = (unsigned long)ret;
90355 + if ((unsigned long)ret + size > module_addr_max_rx)
90356 + module_addr_max_rx = (unsigned long)ret + size;
90357 mutex_unlock(&module_mutex);
90358 }
90359 return ret;
90360 @@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90361 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90362
90363 if (info->index.sym == 0) {
90364 +#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90365 + /*
90366 + * avoid potentially printing jibberish on attempted load
90367 + * of a module randomized with a different seed
90368 + */
90369 + pr_warn("module has no symbols (stripped?)\n");
90370 +#else
90371 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90372 +#endif
90373 return ERR_PTR(-ENOEXEC);
90374 }
90375
90376 @@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90377 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90378 {
90379 const char *modmagic = get_modinfo(info, "vermagic");
90380 + const char *license = get_modinfo(info, "license");
90381 int err;
90382
90383 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90384 + if (!license || !license_is_gpl_compatible(license))
90385 + return -ENOEXEC;
90386 +#endif
90387 +
90388 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90389 modmagic = NULL;
90390
90391 @@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90392 }
90393
90394 /* Set up license info based on the info section */
90395 - set_license(mod, get_modinfo(info, "license"));
90396 + set_license(mod, license);
90397
90398 return 0;
90399 }
90400 @@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90401 void *ptr;
90402
90403 /* Do the allocs. */
90404 - ptr = module_alloc_update_bounds(mod->core_size);
90405 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90406 /*
90407 * The pointer to this block is stored in the module structure
90408 * which is inside the block. Just mark it as not being a
90409 @@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90410 if (!ptr)
90411 return -ENOMEM;
90412
90413 - memset(ptr, 0, mod->core_size);
90414 - mod->module_core = ptr;
90415 + memset(ptr, 0, mod->core_size_rw);
90416 + mod->module_core_rw = ptr;
90417
90418 - if (mod->init_size) {
90419 - ptr = module_alloc_update_bounds(mod->init_size);
90420 + if (mod->init_size_rw) {
90421 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90422 /*
90423 * The pointer to this block is stored in the module structure
90424 * which is inside the block. This block doesn't need to be
90425 @@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90426 */
90427 kmemleak_ignore(ptr);
90428 if (!ptr) {
90429 - module_free(mod, mod->module_core);
90430 + module_free(mod, mod->module_core_rw);
90431 return -ENOMEM;
90432 }
90433 - memset(ptr, 0, mod->init_size);
90434 - mod->module_init = ptr;
90435 + memset(ptr, 0, mod->init_size_rw);
90436 + mod->module_init_rw = ptr;
90437 } else
90438 - mod->module_init = NULL;
90439 + mod->module_init_rw = NULL;
90440 +
90441 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90442 + kmemleak_not_leak(ptr);
90443 + if (!ptr) {
90444 + if (mod->module_init_rw)
90445 + module_free(mod, mod->module_init_rw);
90446 + module_free(mod, mod->module_core_rw);
90447 + return -ENOMEM;
90448 + }
90449 +
90450 + pax_open_kernel();
90451 + memset(ptr, 0, mod->core_size_rx);
90452 + pax_close_kernel();
90453 + mod->module_core_rx = ptr;
90454 +
90455 + if (mod->init_size_rx) {
90456 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90457 + kmemleak_ignore(ptr);
90458 + if (!ptr && mod->init_size_rx) {
90459 + module_free_exec(mod, mod->module_core_rx);
90460 + if (mod->module_init_rw)
90461 + module_free(mod, mod->module_init_rw);
90462 + module_free(mod, mod->module_core_rw);
90463 + return -ENOMEM;
90464 + }
90465 +
90466 + pax_open_kernel();
90467 + memset(ptr, 0, mod->init_size_rx);
90468 + pax_close_kernel();
90469 + mod->module_init_rx = ptr;
90470 + } else
90471 + mod->module_init_rx = NULL;
90472
90473 /* Transfer each section which specifies SHF_ALLOC */
90474 pr_debug("final section addresses:\n");
90475 @@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90476 if (!(shdr->sh_flags & SHF_ALLOC))
90477 continue;
90478
90479 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
90480 - dest = mod->module_init
90481 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90482 - else
90483 - dest = mod->module_core + shdr->sh_entsize;
90484 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90485 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90486 + dest = mod->module_init_rw
90487 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90488 + else
90489 + dest = mod->module_init_rx
90490 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90491 + } else {
90492 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90493 + dest = mod->module_core_rw + shdr->sh_entsize;
90494 + else
90495 + dest = mod->module_core_rx + shdr->sh_entsize;
90496 + }
90497 +
90498 + if (shdr->sh_type != SHT_NOBITS) {
90499 +
90500 +#ifdef CONFIG_PAX_KERNEXEC
90501 +#ifdef CONFIG_X86_64
90502 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90503 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90504 +#endif
90505 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90506 + pax_open_kernel();
90507 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90508 + pax_close_kernel();
90509 + } else
90510 +#endif
90511
90512 - if (shdr->sh_type != SHT_NOBITS)
90513 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90514 + }
90515 /* Update sh_addr to point to copy in image. */
90516 - shdr->sh_addr = (unsigned long)dest;
90517 +
90518 +#ifdef CONFIG_PAX_KERNEXEC
90519 + if (shdr->sh_flags & SHF_EXECINSTR)
90520 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
90521 + else
90522 +#endif
90523 +
90524 + shdr->sh_addr = (unsigned long)dest;
90525 pr_debug("\t0x%lx %s\n",
90526 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90527 }
90528 @@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90529 * Do it before processing of module parameters, so the module
90530 * can provide parameter accessor functions of its own.
90531 */
90532 - if (mod->module_init)
90533 - flush_icache_range((unsigned long)mod->module_init,
90534 - (unsigned long)mod->module_init
90535 - + mod->init_size);
90536 - flush_icache_range((unsigned long)mod->module_core,
90537 - (unsigned long)mod->module_core + mod->core_size);
90538 + if (mod->module_init_rx)
90539 + flush_icache_range((unsigned long)mod->module_init_rx,
90540 + (unsigned long)mod->module_init_rx
90541 + + mod->init_size_rx);
90542 + flush_icache_range((unsigned long)mod->module_core_rx,
90543 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
90544
90545 set_fs(old_fs);
90546 }
90547 @@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90548 static void module_deallocate(struct module *mod, struct load_info *info)
90549 {
90550 percpu_modfree(mod);
90551 - module_free(mod, mod->module_init);
90552 - module_free(mod, mod->module_core);
90553 + module_free_exec(mod, mod->module_init_rx);
90554 + module_free_exec(mod, mod->module_core_rx);
90555 + module_free(mod, mod->module_init_rw);
90556 + module_free(mod, mod->module_core_rw);
90557 }
90558
90559 int __weak module_finalize(const Elf_Ehdr *hdr,
90560 @@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90561 static int post_relocation(struct module *mod, const struct load_info *info)
90562 {
90563 /* Sort exception table now relocations are done. */
90564 + pax_open_kernel();
90565 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90566 + pax_close_kernel();
90567
90568 /* Copy relocated percpu area over. */
90569 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90570 @@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90571 mod->strtab = mod->core_strtab;
90572 #endif
90573 unset_module_init_ro_nx(mod);
90574 - module_free(mod, mod->module_init);
90575 - mod->module_init = NULL;
90576 - mod->init_size = 0;
90577 - mod->init_ro_size = 0;
90578 - mod->init_text_size = 0;
90579 + module_free(mod, mod->module_init_rw);
90580 + module_free_exec(mod, mod->module_init_rx);
90581 + mod->module_init_rw = NULL;
90582 + mod->module_init_rx = NULL;
90583 + mod->init_size_rw = 0;
90584 + mod->init_size_rx = 0;
90585 mutex_unlock(&module_mutex);
90586 wake_up_all(&module_wq);
90587
90588 @@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90589 module_bug_finalize(info->hdr, info->sechdrs, mod);
90590
90591 /* Set RO and NX regions for core */
90592 - set_section_ro_nx(mod->module_core,
90593 - mod->core_text_size,
90594 - mod->core_ro_size,
90595 - mod->core_size);
90596 + set_section_ro_nx(mod->module_core_rx,
90597 + mod->core_size_rx,
90598 + mod->core_size_rx,
90599 + mod->core_size_rx);
90600
90601 /* Set RO and NX regions for init */
90602 - set_section_ro_nx(mod->module_init,
90603 - mod->init_text_size,
90604 - mod->init_ro_size,
90605 - mod->init_size);
90606 + set_section_ro_nx(mod->module_init_rx,
90607 + mod->init_size_rx,
90608 + mod->init_size_rx,
90609 + mod->init_size_rx);
90610
90611 /* Mark state as coming so strong_try_module_get() ignores us,
90612 * but kallsyms etc. can see us. */
90613 @@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90614 if (err)
90615 goto free_unload;
90616
90617 + /* Now copy in args */
90618 + mod->args = strndup_user(uargs, ~0UL >> 1);
90619 + if (IS_ERR(mod->args)) {
90620 + err = PTR_ERR(mod->args);
90621 + goto free_unload;
90622 + }
90623 +
90624 /* Set up MODINFO_ATTR fields */
90625 setup_modinfo(mod, info);
90626
90627 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
90628 + {
90629 + char *p, *p2;
90630 +
90631 + if (strstr(mod->args, "grsec_modharden_netdev")) {
90632 + 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);
90633 + err = -EPERM;
90634 + goto free_modinfo;
90635 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90636 + p += sizeof("grsec_modharden_normal") - 1;
90637 + p2 = strstr(p, "_");
90638 + if (p2) {
90639 + *p2 = '\0';
90640 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90641 + *p2 = '_';
90642 + }
90643 + err = -EPERM;
90644 + goto free_modinfo;
90645 + }
90646 + }
90647 +#endif
90648 +
90649 /* Fix up syms, so that st_value is a pointer to location. */
90650 err = simplify_symbols(mod, info);
90651 if (err < 0)
90652 @@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90653
90654 flush_module_icache(mod);
90655
90656 - /* Now copy in args */
90657 - mod->args = strndup_user(uargs, ~0UL >> 1);
90658 - if (IS_ERR(mod->args)) {
90659 - err = PTR_ERR(mod->args);
90660 - goto free_arch_cleanup;
90661 - }
90662 -
90663 dynamic_debug_setup(info->debug, info->num_debug);
90664
90665 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90666 @@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90667 ddebug_cleanup:
90668 dynamic_debug_remove(info->debug);
90669 synchronize_sched();
90670 - kfree(mod->args);
90671 - free_arch_cleanup:
90672 module_arch_cleanup(mod);
90673 free_modinfo:
90674 free_modinfo(mod);
90675 + kfree(mod->args);
90676 free_unload:
90677 module_unload_free(mod);
90678 unlink_mod:
90679 @@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90680 unsigned long nextval;
90681
90682 /* At worse, next value is at end of module */
90683 - if (within_module_init(addr, mod))
90684 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
90685 + if (within_module_init_rx(addr, mod))
90686 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90687 + else if (within_module_init_rw(addr, mod))
90688 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90689 + else if (within_module_core_rx(addr, mod))
90690 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90691 + else if (within_module_core_rw(addr, mod))
90692 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90693 else
90694 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
90695 + return NULL;
90696
90697 /* Scan for closest preceding symbol, and next symbol. (ELF
90698 starts real symbols at 1). */
90699 @@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90700 return 0;
90701
90702 seq_printf(m, "%s %u",
90703 - mod->name, mod->init_size + mod->core_size);
90704 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90705 print_unload_info(m, mod);
90706
90707 /* Informative for users. */
90708 @@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90709 mod->state == MODULE_STATE_COMING ? "Loading":
90710 "Live");
90711 /* Used by oprofile and other similar tools. */
90712 - seq_printf(m, " 0x%pK", mod->module_core);
90713 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90714
90715 /* Taints info */
90716 if (mod->taints)
90717 @@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90718
90719 static int __init proc_modules_init(void)
90720 {
90721 +#ifndef CONFIG_GRKERNSEC_HIDESYM
90722 +#ifdef CONFIG_GRKERNSEC_PROC_USER
90723 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90724 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90725 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90726 +#else
90727 proc_create("modules", 0, NULL, &proc_modules_operations);
90728 +#endif
90729 +#else
90730 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90731 +#endif
90732 return 0;
90733 }
90734 module_init(proc_modules_init);
90735 @@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
90736 {
90737 struct module *mod;
90738
90739 - if (addr < module_addr_min || addr > module_addr_max)
90740 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
90741 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
90742 return NULL;
90743
90744 list_for_each_entry_rcu(mod, &modules, list) {
90745 @@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
90746 */
90747 struct module *__module_text_address(unsigned long addr)
90748 {
90749 - struct module *mod = __module_address(addr);
90750 + struct module *mod;
90751 +
90752 +#ifdef CONFIG_X86_32
90753 + addr = ktla_ktva(addr);
90754 +#endif
90755 +
90756 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
90757 + return NULL;
90758 +
90759 + mod = __module_address(addr);
90760 +
90761 if (mod) {
90762 /* Make sure it's within the text section. */
90763 - if (!within(addr, mod->module_init, mod->init_text_size)
90764 - && !within(addr, mod->module_core, mod->core_text_size))
90765 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
90766 mod = NULL;
90767 }
90768 return mod;
90769 diff --git a/kernel/notifier.c b/kernel/notifier.c
90770 index 4803da6..1c5eea6 100644
90771 --- a/kernel/notifier.c
90772 +++ b/kernel/notifier.c
90773 @@ -5,6 +5,7 @@
90774 #include <linux/rcupdate.h>
90775 #include <linux/vmalloc.h>
90776 #include <linux/reboot.h>
90777 +#include <linux/mm.h>
90778
90779 /*
90780 * Notifier list for kernel code which wants to be called
90781 @@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
90782 while ((*nl) != NULL) {
90783 if (n->priority > (*nl)->priority)
90784 break;
90785 - nl = &((*nl)->next);
90786 + nl = (struct notifier_block **)&((*nl)->next);
90787 }
90788 - n->next = *nl;
90789 + pax_open_kernel();
90790 + *(const void **)&n->next = *nl;
90791 rcu_assign_pointer(*nl, n);
90792 + pax_close_kernel();
90793 return 0;
90794 }
90795
90796 @@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
90797 return 0;
90798 if (n->priority > (*nl)->priority)
90799 break;
90800 - nl = &((*nl)->next);
90801 + nl = (struct notifier_block **)&((*nl)->next);
90802 }
90803 - n->next = *nl;
90804 + pax_open_kernel();
90805 + *(const void **)&n->next = *nl;
90806 rcu_assign_pointer(*nl, n);
90807 + pax_close_kernel();
90808 return 0;
90809 }
90810
90811 @@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
90812 {
90813 while ((*nl) != NULL) {
90814 if ((*nl) == n) {
90815 + pax_open_kernel();
90816 rcu_assign_pointer(*nl, n->next);
90817 + pax_close_kernel();
90818 return 0;
90819 }
90820 - nl = &((*nl)->next);
90821 + nl = (struct notifier_block **)&((*nl)->next);
90822 }
90823 return -ENOENT;
90824 }
90825 diff --git a/kernel/padata.c b/kernel/padata.c
90826 index 161402f..598814c 100644
90827 --- a/kernel/padata.c
90828 +++ b/kernel/padata.c
90829 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
90830 * seq_nr mod. number of cpus in use.
90831 */
90832
90833 - seq_nr = atomic_inc_return(&pd->seq_nr);
90834 + seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
90835 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
90836
90837 return padata_index_to_cpu(pd, cpu_index);
90838 @@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
90839 padata_init_pqueues(pd);
90840 padata_init_squeues(pd);
90841 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
90842 - atomic_set(&pd->seq_nr, -1);
90843 + atomic_set_unchecked(&pd->seq_nr, -1);
90844 atomic_set(&pd->reorder_objects, 0);
90845 atomic_set(&pd->refcnt, 0);
90846 pd->pinst = pinst;
90847 diff --git a/kernel/panic.c b/kernel/panic.c
90848 index cf80672..f6771b2 100644
90849 --- a/kernel/panic.c
90850 +++ b/kernel/panic.c
90851 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
90852 /*
90853 * Stop ourself in panic -- architecture code may override this
90854 */
90855 -void __weak panic_smp_self_stop(void)
90856 +void __weak __noreturn panic_smp_self_stop(void)
90857 {
90858 while (1)
90859 cpu_relax();
90860 @@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
90861 disable_trace_on_warning();
90862
90863 pr_warn("------------[ cut here ]------------\n");
90864 - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
90865 + pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
90866 raw_smp_processor_id(), current->pid, file, line, caller);
90867
90868 if (args)
90869 @@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
90870 */
90871 __visible void __stack_chk_fail(void)
90872 {
90873 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
90874 + dump_stack();
90875 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
90876 __builtin_return_address(0));
90877 }
90878 EXPORT_SYMBOL(__stack_chk_fail);
90879 diff --git a/kernel/pid.c b/kernel/pid.c
90880 index 82430c8..53d7793 100644
90881 --- a/kernel/pid.c
90882 +++ b/kernel/pid.c
90883 @@ -33,6 +33,7 @@
90884 #include <linux/rculist.h>
90885 #include <linux/bootmem.h>
90886 #include <linux/hash.h>
90887 +#include <linux/security.h>
90888 #include <linux/pid_namespace.h>
90889 #include <linux/init_task.h>
90890 #include <linux/syscalls.h>
90891 @@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
90892
90893 int pid_max = PID_MAX_DEFAULT;
90894
90895 -#define RESERVED_PIDS 300
90896 +#define RESERVED_PIDS 500
90897
90898 int pid_max_min = RESERVED_PIDS + 1;
90899 int pid_max_max = PID_MAX_LIMIT;
90900 @@ -447,10 +448,18 @@ EXPORT_SYMBOL(pid_task);
90901 */
90902 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
90903 {
90904 + struct task_struct *task;
90905 +
90906 rcu_lockdep_assert(rcu_read_lock_held(),
90907 "find_task_by_pid_ns() needs rcu_read_lock()"
90908 " protection");
90909 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90910 +
90911 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90912 +
90913 + if (gr_pid_is_chrooted(task))
90914 + return NULL;
90915 +
90916 + return task;
90917 }
90918
90919 struct task_struct *find_task_by_vpid(pid_t vnr)
90920 @@ -458,6 +467,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
90921 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
90922 }
90923
90924 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
90925 +{
90926 + rcu_lockdep_assert(rcu_read_lock_held(),
90927 + "find_task_by_pid_ns() needs rcu_read_lock()"
90928 + " protection");
90929 + return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
90930 +}
90931 +
90932 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
90933 {
90934 struct pid *pid;
90935 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
90936 index db95d8e..a0ca23f 100644
90937 --- a/kernel/pid_namespace.c
90938 +++ b/kernel/pid_namespace.c
90939 @@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
90940 void __user *buffer, size_t *lenp, loff_t *ppos)
90941 {
90942 struct pid_namespace *pid_ns = task_active_pid_ns(current);
90943 - struct ctl_table tmp = *table;
90944 + ctl_table_no_const tmp = *table;
90945
90946 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
90947 return -EPERM;
90948 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
90949 index bbef57f..5f94462 100644
90950 --- a/kernel/power/Kconfig
90951 +++ b/kernel/power/Kconfig
90952 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
90953 config HIBERNATION
90954 bool "Hibernation (aka 'suspend to disk')"
90955 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
90956 + depends on !GRKERNSEC_KMEM
90957 + depends on !PAX_MEMORY_SANITIZE
90958 select HIBERNATE_CALLBACKS
90959 select LZO_COMPRESS
90960 select LZO_DECOMPRESS
90961 diff --git a/kernel/power/process.c b/kernel/power/process.c
90962 index 5a6ec86..3a8c884 100644
90963 --- a/kernel/power/process.c
90964 +++ b/kernel/power/process.c
90965 @@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
90966 unsigned int elapsed_msecs;
90967 bool wakeup = false;
90968 int sleep_usecs = USEC_PER_MSEC;
90969 + bool timedout = false;
90970
90971 do_gettimeofday(&start);
90972
90973 @@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
90974
90975 while (true) {
90976 todo = 0;
90977 + if (time_after(jiffies, end_time))
90978 + timedout = true;
90979 read_lock(&tasklist_lock);
90980 for_each_process_thread(g, p) {
90981 if (p == current || !freeze_task(p))
90982 continue;
90983
90984 - if (!freezer_should_skip(p))
90985 + if (!freezer_should_skip(p)) {
90986 todo++;
90987 + if (timedout) {
90988 + printk(KERN_ERR "Task refusing to freeze:\n");
90989 + sched_show_task(p);
90990 + }
90991 + }
90992 }
90993 read_unlock(&tasklist_lock);
90994
90995 @@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
90996 todo += wq_busy;
90997 }
90998
90999 - if (!todo || time_after(jiffies, end_time))
91000 + if (!todo || timedout)
91001 break;
91002
91003 if (pm_wakeup_pending()) {
91004 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
91005 index ced2b84..ffc4791 100644
91006 --- a/kernel/printk/printk.c
91007 +++ b/kernel/printk/printk.c
91008 @@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
91009 if (from_file && type != SYSLOG_ACTION_OPEN)
91010 return 0;
91011
91012 +#ifdef CONFIG_GRKERNSEC_DMESG
91013 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
91014 + return -EPERM;
91015 +#endif
91016 +
91017 if (syslog_action_restricted(type)) {
91018 if (capable(CAP_SYSLOG))
91019 return 0;
91020 diff --git a/kernel/profile.c b/kernel/profile.c
91021 index 54bf5ba..df6e0a2 100644
91022 --- a/kernel/profile.c
91023 +++ b/kernel/profile.c
91024 @@ -37,7 +37,7 @@ struct profile_hit {
91025 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
91026 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
91027
91028 -static atomic_t *prof_buffer;
91029 +static atomic_unchecked_t *prof_buffer;
91030 static unsigned long prof_len, prof_shift;
91031
91032 int prof_on __read_mostly;
91033 @@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
91034 hits[i].pc = 0;
91035 continue;
91036 }
91037 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
91038 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
91039 hits[i].hits = hits[i].pc = 0;
91040 }
91041 }
91042 @@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
91043 * Add the current hit(s) and flush the write-queue out
91044 * to the global buffer:
91045 */
91046 - atomic_add(nr_hits, &prof_buffer[pc]);
91047 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
91048 for (i = 0; i < NR_PROFILE_HIT; ++i) {
91049 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
91050 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
91051 hits[i].pc = hits[i].hits = 0;
91052 }
91053 out:
91054 @@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
91055 {
91056 unsigned long pc;
91057 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
91058 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
91059 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
91060 }
91061 #endif /* !CONFIG_SMP */
91062
91063 @@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
91064 return -EFAULT;
91065 buf++; p++; count--; read++;
91066 }
91067 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
91068 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
91069 if (copy_to_user(buf, (void *)pnt, count))
91070 return -EFAULT;
91071 read += count;
91072 @@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
91073 }
91074 #endif
91075 profile_discard_flip_buffers();
91076 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
91077 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
91078 return count;
91079 }
91080
91081 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
91082 index 54e7522..5b82dd6 100644
91083 --- a/kernel/ptrace.c
91084 +++ b/kernel/ptrace.c
91085 @@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
91086 if (seize)
91087 flags |= PT_SEIZED;
91088 rcu_read_lock();
91089 - if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91090 + if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91091 flags |= PT_PTRACE_CAP;
91092 rcu_read_unlock();
91093 task->ptrace = flags;
91094 @@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
91095 break;
91096 return -EIO;
91097 }
91098 - if (copy_to_user(dst, buf, retval))
91099 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
91100 return -EFAULT;
91101 copied += retval;
91102 src += retval;
91103 @@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
91104 bool seized = child->ptrace & PT_SEIZED;
91105 int ret = -EIO;
91106 siginfo_t siginfo, *si;
91107 - void __user *datavp = (void __user *) data;
91108 + void __user *datavp = (__force void __user *) data;
91109 unsigned long __user *datalp = datavp;
91110 unsigned long flags;
91111
91112 @@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
91113 goto out;
91114 }
91115
91116 + if (gr_handle_ptrace(child, request)) {
91117 + ret = -EPERM;
91118 + goto out_put_task_struct;
91119 + }
91120 +
91121 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91122 ret = ptrace_attach(child, request, addr, data);
91123 /*
91124 * Some architectures need to do book-keeping after
91125 * a ptrace attach.
91126 */
91127 - if (!ret)
91128 + if (!ret) {
91129 arch_ptrace_attach(child);
91130 + gr_audit_ptrace(child);
91131 + }
91132 goto out_put_task_struct;
91133 }
91134
91135 @@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
91136 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
91137 if (copied != sizeof(tmp))
91138 return -EIO;
91139 - return put_user(tmp, (unsigned long __user *)data);
91140 + return put_user(tmp, (__force unsigned long __user *)data);
91141 }
91142
91143 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
91144 @@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
91145 }
91146
91147 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91148 - compat_long_t, addr, compat_long_t, data)
91149 + compat_ulong_t, addr, compat_ulong_t, data)
91150 {
91151 struct task_struct *child;
91152 long ret;
91153 @@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91154 goto out;
91155 }
91156
91157 + if (gr_handle_ptrace(child, request)) {
91158 + ret = -EPERM;
91159 + goto out_put_task_struct;
91160 + }
91161 +
91162 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91163 ret = ptrace_attach(child, request, addr, data);
91164 /*
91165 * Some architectures need to do book-keeping after
91166 * a ptrace attach.
91167 */
91168 - if (!ret)
91169 + if (!ret) {
91170 arch_ptrace_attach(child);
91171 + gr_audit_ptrace(child);
91172 + }
91173 goto out_put_task_struct;
91174 }
91175
91176 diff --git a/kernel/range.c b/kernel/range.c
91177 index 322ea8e..82cfc28 100644
91178 --- a/kernel/range.c
91179 +++ b/kernel/range.c
91180 @@ -113,12 +113,12 @@ static int cmp_range(const void *x1, const void *x2)
91181 {
91182 const struct range *r1 = x1;
91183 const struct range *r2 = x2;
91184 - s64 start1, start2;
91185
91186 - start1 = r1->start;
91187 - start2 = r2->start;
91188 -
91189 - return start1 - start2;
91190 + if (r1->start < r2->start)
91191 + return -1;
91192 + if (r1->start > r2->start)
91193 + return 1;
91194 + return 0;
91195 }
91196
91197 int clean_sort_range(struct range *range, int az)
91198 diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
91199 index 240fa90..5fa56bd 100644
91200 --- a/kernel/rcu/rcutorture.c
91201 +++ b/kernel/rcu/rcutorture.c
91202 @@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91203 rcu_torture_count) = { 0 };
91204 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91205 rcu_torture_batch) = { 0 };
91206 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91207 -static atomic_t n_rcu_torture_alloc;
91208 -static atomic_t n_rcu_torture_alloc_fail;
91209 -static atomic_t n_rcu_torture_free;
91210 -static atomic_t n_rcu_torture_mberror;
91211 -static atomic_t n_rcu_torture_error;
91212 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91213 +static atomic_unchecked_t n_rcu_torture_alloc;
91214 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
91215 +static atomic_unchecked_t n_rcu_torture_free;
91216 +static atomic_unchecked_t n_rcu_torture_mberror;
91217 +static atomic_unchecked_t n_rcu_torture_error;
91218 static long n_rcu_torture_barrier_error;
91219 static long n_rcu_torture_boost_ktrerror;
91220 static long n_rcu_torture_boost_rterror;
91221 @@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91222 static long n_rcu_torture_timers;
91223 static long n_barrier_attempts;
91224 static long n_barrier_successes;
91225 -static atomic_long_t n_cbfloods;
91226 +static atomic_long_unchecked_t n_cbfloods;
91227 static struct list_head rcu_torture_removed;
91228
91229 static int rcu_torture_writer_state;
91230 @@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91231
91232 spin_lock_bh(&rcu_torture_lock);
91233 if (list_empty(&rcu_torture_freelist)) {
91234 - atomic_inc(&n_rcu_torture_alloc_fail);
91235 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91236 spin_unlock_bh(&rcu_torture_lock);
91237 return NULL;
91238 }
91239 - atomic_inc(&n_rcu_torture_alloc);
91240 + atomic_inc_unchecked(&n_rcu_torture_alloc);
91241 p = rcu_torture_freelist.next;
91242 list_del_init(p);
91243 spin_unlock_bh(&rcu_torture_lock);
91244 @@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91245 static void
91246 rcu_torture_free(struct rcu_torture *p)
91247 {
91248 - atomic_inc(&n_rcu_torture_free);
91249 + atomic_inc_unchecked(&n_rcu_torture_free);
91250 spin_lock_bh(&rcu_torture_lock);
91251 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91252 spin_unlock_bh(&rcu_torture_lock);
91253 @@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91254 i = rp->rtort_pipe_count;
91255 if (i > RCU_TORTURE_PIPE_LEN)
91256 i = RCU_TORTURE_PIPE_LEN;
91257 - atomic_inc(&rcu_torture_wcount[i]);
91258 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91259 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91260 rp->rtort_mbtest = 0;
91261 return true;
91262 @@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91263 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91264 do {
91265 schedule_timeout_interruptible(cbflood_inter_holdoff);
91266 - atomic_long_inc(&n_cbfloods);
91267 + atomic_long_inc_unchecked(&n_cbfloods);
91268 WARN_ON(signal_pending(current));
91269 for (i = 0; i < cbflood_n_burst; i++) {
91270 for (j = 0; j < cbflood_n_per_burst; j++) {
91271 @@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91272 i = old_rp->rtort_pipe_count;
91273 if (i > RCU_TORTURE_PIPE_LEN)
91274 i = RCU_TORTURE_PIPE_LEN;
91275 - atomic_inc(&rcu_torture_wcount[i]);
91276 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
91277 old_rp->rtort_pipe_count++;
91278 switch (synctype[torture_random(&rand) % nsynctypes]) {
91279 case RTWS_DEF_FREE:
91280 @@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91281 return;
91282 }
91283 if (p->rtort_mbtest == 0)
91284 - atomic_inc(&n_rcu_torture_mberror);
91285 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91286 spin_lock(&rand_lock);
91287 cur_ops->read_delay(&rand);
91288 n_rcu_torture_timers++;
91289 @@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91290 continue;
91291 }
91292 if (p->rtort_mbtest == 0)
91293 - atomic_inc(&n_rcu_torture_mberror);
91294 + atomic_inc_unchecked(&n_rcu_torture_mberror);
91295 cur_ops->read_delay(&rand);
91296 preempt_disable();
91297 pipe_count = p->rtort_pipe_count;
91298 @@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91299 rcu_torture_current,
91300 rcu_torture_current_version,
91301 list_empty(&rcu_torture_freelist),
91302 - atomic_read(&n_rcu_torture_alloc),
91303 - atomic_read(&n_rcu_torture_alloc_fail),
91304 - atomic_read(&n_rcu_torture_free));
91305 + atomic_read_unchecked(&n_rcu_torture_alloc),
91306 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91307 + atomic_read_unchecked(&n_rcu_torture_free));
91308 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91309 - atomic_read(&n_rcu_torture_mberror),
91310 + atomic_read_unchecked(&n_rcu_torture_mberror),
91311 n_rcu_torture_boost_ktrerror,
91312 n_rcu_torture_boost_rterror);
91313 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91314 @@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91315 n_barrier_successes,
91316 n_barrier_attempts,
91317 n_rcu_torture_barrier_error);
91318 - pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91319 + pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91320
91321 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91322 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91323 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91324 n_rcu_torture_barrier_error != 0 ||
91325 n_rcu_torture_boost_ktrerror != 0 ||
91326 n_rcu_torture_boost_rterror != 0 ||
91327 n_rcu_torture_boost_failure != 0 ||
91328 i > 1) {
91329 pr_cont("%s", "!!! ");
91330 - atomic_inc(&n_rcu_torture_error);
91331 + atomic_inc_unchecked(&n_rcu_torture_error);
91332 WARN_ON_ONCE(1);
91333 }
91334 pr_cont("Reader Pipe: ");
91335 @@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91336 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91337 pr_cont("Free-Block Circulation: ");
91338 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91339 - pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91340 + pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91341 }
91342 pr_cont("\n");
91343
91344 @@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91345
91346 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91347
91348 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91349 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91350 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91351 else if (torture_onoff_failures())
91352 rcu_torture_print_module_parms(cur_ops,
91353 @@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91354
91355 rcu_torture_current = NULL;
91356 rcu_torture_current_version = 0;
91357 - atomic_set(&n_rcu_torture_alloc, 0);
91358 - atomic_set(&n_rcu_torture_alloc_fail, 0);
91359 - atomic_set(&n_rcu_torture_free, 0);
91360 - atomic_set(&n_rcu_torture_mberror, 0);
91361 - atomic_set(&n_rcu_torture_error, 0);
91362 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91363 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91364 + atomic_set_unchecked(&n_rcu_torture_free, 0);
91365 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91366 + atomic_set_unchecked(&n_rcu_torture_error, 0);
91367 n_rcu_torture_barrier_error = 0;
91368 n_rcu_torture_boost_ktrerror = 0;
91369 n_rcu_torture_boost_rterror = 0;
91370 n_rcu_torture_boost_failure = 0;
91371 n_rcu_torture_boosts = 0;
91372 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91373 - atomic_set(&rcu_torture_wcount[i], 0);
91374 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91375 for_each_possible_cpu(cpu) {
91376 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91377 per_cpu(rcu_torture_count, cpu)[i] = 0;
91378 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91379 index c0623fc..329c091 100644
91380 --- a/kernel/rcu/tiny.c
91381 +++ b/kernel/rcu/tiny.c
91382 @@ -42,7 +42,7 @@
91383 /* Forward declarations for tiny_plugin.h. */
91384 struct rcu_ctrlblk;
91385 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91386 -static void rcu_process_callbacks(struct softirq_action *unused);
91387 +static void rcu_process_callbacks(void);
91388 static void __call_rcu(struct rcu_head *head,
91389 void (*func)(struct rcu_head *rcu),
91390 struct rcu_ctrlblk *rcp);
91391 @@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91392 false));
91393 }
91394
91395 -static void rcu_process_callbacks(struct softirq_action *unused)
91396 +static __latent_entropy void rcu_process_callbacks(void)
91397 {
91398 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91399 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91400 diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91401 index 858c565..7efd915 100644
91402 --- a/kernel/rcu/tiny_plugin.h
91403 +++ b/kernel/rcu/tiny_plugin.h
91404 @@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91405 dump_stack();
91406 }
91407 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91408 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91409 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91410 3 * rcu_jiffies_till_stall_check() + 3;
91411 else if (ULONG_CMP_GE(j, js))
91412 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91413 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91414 }
91415
91416 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91417 {
91418 rcp->ticks_this_gp = 0;
91419 rcp->gp_start = jiffies;
91420 - ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91421 + ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91422 }
91423
91424 static void check_cpu_stalls(void)
91425 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91426 index 9815447..2cdf92a 100644
91427 --- a/kernel/rcu/tree.c
91428 +++ b/kernel/rcu/tree.c
91429 @@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91430 */
91431 rdtp = this_cpu_ptr(&rcu_dynticks);
91432 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91433 - atomic_add(2, &rdtp->dynticks); /* QS. */
91434 + atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91435 smp_mb__after_atomic(); /* Later stuff after QS. */
91436 break;
91437 }
91438 @@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91439 rcu_prepare_for_idle(smp_processor_id());
91440 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91441 smp_mb__before_atomic(); /* See above. */
91442 - atomic_inc(&rdtp->dynticks);
91443 + atomic_inc_unchecked(&rdtp->dynticks);
91444 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91445 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91446 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91447 rcu_dynticks_task_enter();
91448
91449 /*
91450 @@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91451 {
91452 rcu_dynticks_task_exit();
91453 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91454 - atomic_inc(&rdtp->dynticks);
91455 + atomic_inc_unchecked(&rdtp->dynticks);
91456 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91457 smp_mb__after_atomic(); /* See above. */
91458 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91459 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91460 rcu_cleanup_after_idle(smp_processor_id());
91461 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91462 if (!user && !is_idle_task(current)) {
91463 @@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91464 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91465
91466 if (rdtp->dynticks_nmi_nesting == 0 &&
91467 - (atomic_read(&rdtp->dynticks) & 0x1))
91468 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91469 return;
91470 rdtp->dynticks_nmi_nesting++;
91471 smp_mb__before_atomic(); /* Force delay from prior write. */
91472 - atomic_inc(&rdtp->dynticks);
91473 + atomic_inc_unchecked(&rdtp->dynticks);
91474 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91475 smp_mb__after_atomic(); /* See above. */
91476 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91477 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91478 }
91479
91480 /**
91481 @@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91482 return;
91483 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91484 smp_mb__before_atomic(); /* See above. */
91485 - atomic_inc(&rdtp->dynticks);
91486 + atomic_inc_unchecked(&rdtp->dynticks);
91487 smp_mb__after_atomic(); /* Force delay to next write. */
91488 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91489 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91490 }
91491
91492 /**
91493 @@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91494 */
91495 bool notrace __rcu_is_watching(void)
91496 {
91497 - return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91498 + return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91499 }
91500
91501 /**
91502 @@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91503 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91504 bool *isidle, unsigned long *maxj)
91505 {
91506 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91507 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91508 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91509 if ((rdp->dynticks_snap & 0x1) == 0) {
91510 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91511 @@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91512 int *rcrmp;
91513 unsigned int snap;
91514
91515 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91516 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91517 snap = (unsigned int)rdp->dynticks_snap;
91518
91519 /*
91520 @@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91521 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91522 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91523 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91524 - ACCESS_ONCE(rdp->cond_resched_completed) =
91525 + ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91526 ACCESS_ONCE(rdp->mynode->completed);
91527 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91528 - ACCESS_ONCE(*rcrmp) =
91529 + ACCESS_ONCE_RW(*rcrmp) =
91530 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91531 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91532 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91533 @@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91534 rsp->gp_start = j;
91535 smp_wmb(); /* Record start time before stall time. */
91536 j1 = rcu_jiffies_till_stall_check();
91537 - ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91538 + ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91539 rsp->jiffies_resched = j + j1 / 2;
91540 }
91541
91542 @@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91543 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91544 return;
91545 }
91546 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91547 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91548 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91549
91550 /*
91551 @@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91552
91553 raw_spin_lock_irqsave(&rnp->lock, flags);
91554 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91555 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91556 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91557 3 * rcu_jiffies_till_stall_check() + 3;
91558 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91559
91560 @@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91561 struct rcu_state *rsp;
91562
91563 for_each_rcu_flavor(rsp)
91564 - ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91565 + ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91566 }
91567
91568 /*
91569 @@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91570 raw_spin_unlock_irq(&rnp->lock);
91571 return 0;
91572 }
91573 - ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91574 + ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91575
91576 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91577 /*
91578 @@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91579 rdp = this_cpu_ptr(rsp->rda);
91580 rcu_preempt_check_blocked_tasks(rnp);
91581 rnp->qsmask = rnp->qsmaskinit;
91582 - ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91583 + ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91584 WARN_ON_ONCE(rnp->completed != rsp->completed);
91585 - ACCESS_ONCE(rnp->completed) = rsp->completed;
91586 + ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91587 if (rnp == rdp->mynode)
91588 (void)__note_gp_changes(rsp, rnp, rdp);
91589 rcu_preempt_boost_start_gp(rnp);
91590 @@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91591 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91592 raw_spin_lock_irq(&rnp->lock);
91593 smp_mb__after_unlock_lock();
91594 - ACCESS_ONCE(rsp->gp_flags) =
91595 + ACCESS_ONCE_RW(rsp->gp_flags) =
91596 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91597 raw_spin_unlock_irq(&rnp->lock);
91598 }
91599 @@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91600 rcu_for_each_node_breadth_first(rsp, rnp) {
91601 raw_spin_lock_irq(&rnp->lock);
91602 smp_mb__after_unlock_lock();
91603 - ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91604 + ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91605 rdp = this_cpu_ptr(rsp->rda);
91606 if (rnp == rdp->mynode)
91607 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91608 @@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91609 rcu_nocb_gp_set(rnp, nocb);
91610
91611 /* Declare grace period done. */
91612 - ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91613 + ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91614 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91615 rsp->fqs_state = RCU_GP_IDLE;
91616 rdp = this_cpu_ptr(rsp->rda);
91617 /* Advance CBs to reduce false positives below. */
91618 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91619 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91620 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91621 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91622 trace_rcu_grace_period(rsp->name,
91623 ACCESS_ONCE(rsp->gpnum),
91624 TPS("newreq"));
91625 @@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91626 */
91627 return false;
91628 }
91629 - ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91630 + ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91631 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91632 TPS("newreq"));
91633
91634 @@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91635 rsp->qlen += rdp->qlen;
91636 rdp->n_cbs_orphaned += rdp->qlen;
91637 rdp->qlen_lazy = 0;
91638 - ACCESS_ONCE(rdp->qlen) = 0;
91639 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91640 }
91641
91642 /*
91643 @@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91644 }
91645 smp_mb(); /* List handling before counting for rcu_barrier(). */
91646 rdp->qlen_lazy -= count_lazy;
91647 - ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91648 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91649 rdp->n_cbs_invoked += count;
91650
91651 /* Reinstate batch limit if we have worked down the excess. */
91652 @@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91653 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91654 return; /* Someone beat us to it. */
91655 }
91656 - ACCESS_ONCE(rsp->gp_flags) =
91657 + ACCESS_ONCE_RW(rsp->gp_flags) =
91658 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91659 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91660 rcu_gp_kthread_wake(rsp);
91661 @@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91662 /*
91663 * Do RCU core processing for the current CPU.
91664 */
91665 -static void rcu_process_callbacks(struct softirq_action *unused)
91666 +static void rcu_process_callbacks(void)
91667 {
91668 struct rcu_state *rsp;
91669
91670 @@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91671 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91672 if (debug_rcu_head_queue(head)) {
91673 /* Probable double call_rcu(), so leak the callback. */
91674 - ACCESS_ONCE(head->func) = rcu_leak_callback;
91675 + ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91676 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91677 return;
91678 }
91679 @@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91680 local_irq_restore(flags);
91681 return;
91682 }
91683 - ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91684 + ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91685 if (lazy)
91686 rdp->qlen_lazy++;
91687 else
91688 @@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91689 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91690 * course be required on a 64-bit system.
91691 */
91692 - if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91693 + if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91694 (ulong)atomic_long_read(&rsp->expedited_done) +
91695 ULONG_MAX / 8)) {
91696 synchronize_sched();
91697 - atomic_long_inc(&rsp->expedited_wrap);
91698 + atomic_long_inc_unchecked(&rsp->expedited_wrap);
91699 return;
91700 }
91701
91702 @@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91703 * Take a ticket. Note that atomic_inc_return() implies a
91704 * full memory barrier.
91705 */
91706 - snap = atomic_long_inc_return(&rsp->expedited_start);
91707 + snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91708 firstsnap = snap;
91709 if (!try_get_online_cpus()) {
91710 /* CPU hotplug operation in flight, fall back to normal GP. */
91711 wait_rcu_gp(call_rcu_sched);
91712 - atomic_long_inc(&rsp->expedited_normal);
91713 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91714 return;
91715 }
91716 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91717 @@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91718 synchronize_sched_expedited_cpu_stop,
91719 NULL) == -EAGAIN) {
91720 put_online_cpus();
91721 - atomic_long_inc(&rsp->expedited_tryfail);
91722 + atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91723
91724 /* Check to see if someone else did our work for us. */
91725 s = atomic_long_read(&rsp->expedited_done);
91726 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91727 /* ensure test happens before caller kfree */
91728 smp_mb__before_atomic(); /* ^^^ */
91729 - atomic_long_inc(&rsp->expedited_workdone1);
91730 + atomic_long_inc_unchecked(&rsp->expedited_workdone1);
91731 return;
91732 }
91733
91734 @@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
91735 udelay(trycount * num_online_cpus());
91736 } else {
91737 wait_rcu_gp(call_rcu_sched);
91738 - atomic_long_inc(&rsp->expedited_normal);
91739 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91740 return;
91741 }
91742
91743 @@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
91744 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91745 /* ensure test happens before caller kfree */
91746 smp_mb__before_atomic(); /* ^^^ */
91747 - atomic_long_inc(&rsp->expedited_workdone2);
91748 + atomic_long_inc_unchecked(&rsp->expedited_workdone2);
91749 return;
91750 }
91751
91752 @@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
91753 if (!try_get_online_cpus()) {
91754 /* CPU hotplug operation in flight, use normal GP. */
91755 wait_rcu_gp(call_rcu_sched);
91756 - atomic_long_inc(&rsp->expedited_normal);
91757 + atomic_long_inc_unchecked(&rsp->expedited_normal);
91758 return;
91759 }
91760 - snap = atomic_long_read(&rsp->expedited_start);
91761 + snap = atomic_long_read_unchecked(&rsp->expedited_start);
91762 smp_mb(); /* ensure read is before try_stop_cpus(). */
91763 }
91764 - atomic_long_inc(&rsp->expedited_stoppedcpus);
91765 + atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
91766
91767 /*
91768 * Everyone up to our most recent fetch is covered by our grace
91769 @@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
91770 * than we did already did their update.
91771 */
91772 do {
91773 - atomic_long_inc(&rsp->expedited_done_tries);
91774 + atomic_long_inc_unchecked(&rsp->expedited_done_tries);
91775 s = atomic_long_read(&rsp->expedited_done);
91776 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
91777 /* ensure test happens before caller kfree */
91778 smp_mb__before_atomic(); /* ^^^ */
91779 - atomic_long_inc(&rsp->expedited_done_lost);
91780 + atomic_long_inc_unchecked(&rsp->expedited_done_lost);
91781 break;
91782 }
91783 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
91784 - atomic_long_inc(&rsp->expedited_done_exit);
91785 + atomic_long_inc_unchecked(&rsp->expedited_done_exit);
91786
91787 put_online_cpus();
91788 }
91789 @@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91790 * ACCESS_ONCE() to prevent the compiler from speculating
91791 * the increment to precede the early-exit check.
91792 */
91793 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91794 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91795 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
91796 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
91797 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
91798 @@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91799
91800 /* Increment ->n_barrier_done to prevent duplicate work. */
91801 smp_mb(); /* Keep increment after above mechanism. */
91802 - ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91803 + ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91804 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
91805 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
91806 smp_mb(); /* Keep increment before caller's subsequent code. */
91807 @@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
91808 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
91809 init_callback_list(rdp);
91810 rdp->qlen_lazy = 0;
91811 - ACCESS_ONCE(rdp->qlen) = 0;
91812 + ACCESS_ONCE_RW(rdp->qlen) = 0;
91813 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
91814 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
91815 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
91816 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
91817 rdp->cpu = cpu;
91818 rdp->rsp = rsp;
91819 rcu_boot_init_nocb_percpu_data(rdp);
91820 @@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
91821 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
91822 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
91823 rcu_sysidle_init_percpu_data(rdp->dynticks);
91824 - atomic_set(&rdp->dynticks->dynticks,
91825 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
91826 + atomic_set_unchecked(&rdp->dynticks->dynticks,
91827 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
91828 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
91829
91830 /* Add CPU to rcu_node bitmasks. */
91831 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
91832 index bbdc45d..c882ccb 100644
91833 --- a/kernel/rcu/tree.h
91834 +++ b/kernel/rcu/tree.h
91835 @@ -87,11 +87,11 @@ struct rcu_dynticks {
91836 long long dynticks_nesting; /* Track irq/process nesting level. */
91837 /* Process level is worth LLONG_MAX/2. */
91838 int dynticks_nmi_nesting; /* Track NMI nesting level. */
91839 - atomic_t dynticks; /* Even value for idle, else odd. */
91840 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
91841 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
91842 long long dynticks_idle_nesting;
91843 /* irq/process nesting level from idle. */
91844 - atomic_t dynticks_idle; /* Even value for idle, else odd. */
91845 + atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
91846 /* "Idle" excludes userspace execution. */
91847 unsigned long dynticks_idle_jiffies;
91848 /* End of last non-NMI non-idle period. */
91849 @@ -466,17 +466,17 @@ struct rcu_state {
91850 /* _rcu_barrier(). */
91851 /* End of fields guarded by barrier_mutex. */
91852
91853 - atomic_long_t expedited_start; /* Starting ticket. */
91854 - atomic_long_t expedited_done; /* Done ticket. */
91855 - atomic_long_t expedited_wrap; /* # near-wrap incidents. */
91856 - atomic_long_t expedited_tryfail; /* # acquisition failures. */
91857 - atomic_long_t expedited_workdone1; /* # done by others #1. */
91858 - atomic_long_t expedited_workdone2; /* # done by others #2. */
91859 - atomic_long_t expedited_normal; /* # fallbacks to normal. */
91860 - atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
91861 - atomic_long_t expedited_done_tries; /* # tries to update _done. */
91862 - atomic_long_t expedited_done_lost; /* # times beaten to _done. */
91863 - atomic_long_t expedited_done_exit; /* # times exited _done loop. */
91864 + atomic_long_unchecked_t expedited_start; /* Starting ticket. */
91865 + atomic_long_t expedited_done; /* Done ticket. */
91866 + atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
91867 + atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
91868 + atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
91869 + atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
91870 + atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
91871 + atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
91872 + atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
91873 + atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
91874 + atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
91875
91876 unsigned long jiffies_force_qs; /* Time at which to invoke */
91877 /* force_quiescent_state(). */
91878 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
91879 index c1d7f27..a64bf49 100644
91880 --- a/kernel/rcu/tree_plugin.h
91881 +++ b/kernel/rcu/tree_plugin.h
91882 @@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
91883 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
91884 {
91885 return !rcu_preempted_readers_exp(rnp) &&
91886 - ACCESS_ONCE(rnp->expmask) == 0;
91887 + ACCESS_ONCE_RW(rnp->expmask) == 0;
91888 }
91889
91890 /*
91891 @@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
91892
91893 /* Clean up and exit. */
91894 smp_mb(); /* ensure expedited GP seen before counter increment. */
91895 - ACCESS_ONCE(sync_rcu_preempt_exp_count) =
91896 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
91897 sync_rcu_preempt_exp_count + 1;
91898 unlock_mb_ret:
91899 mutex_unlock(&sync_rcu_preempt_exp_mutex);
91900 @@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
91901 free_cpumask_var(cm);
91902 }
91903
91904 -static struct smp_hotplug_thread rcu_cpu_thread_spec = {
91905 +static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
91906 .store = &rcu_cpu_kthread_task,
91907 .thread_should_run = rcu_cpu_kthread_should_run,
91908 .thread_fn = rcu_cpu_kthread,
91909 @@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
91910 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
91911 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
91912 cpu, ticks_value, ticks_title,
91913 - atomic_read(&rdtp->dynticks) & 0xfff,
91914 + atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
91915 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
91916 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
91917 fast_no_hz);
91918 @@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
91919 return;
91920 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
91921 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
91922 - ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
91923 + ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
91924 wake_up(&rdp_leader->nocb_wq);
91925 }
91926 }
91927 @@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
91928
91929 /* Enqueue the callback on the nocb list and update counts. */
91930 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
91931 - ACCESS_ONCE(*old_rhpp) = rhp;
91932 + ACCESS_ONCE_RW(*old_rhpp) = rhp;
91933 atomic_long_add(rhcount, &rdp->nocb_q_count);
91934 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
91935 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
91936 @@ -2286,7 +2286,7 @@ wait_again:
91937 continue; /* No CBs here, try next follower. */
91938
91939 /* Move callbacks to wait-for-GP list, which is empty. */
91940 - ACCESS_ONCE(rdp->nocb_head) = NULL;
91941 + ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
91942 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
91943 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
91944 rdp->nocb_gp_count_lazy =
91945 @@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
91946 list = ACCESS_ONCE(rdp->nocb_follower_head);
91947 BUG_ON(!list);
91948 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
91949 - ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
91950 + ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
91951 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
91952 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
91953 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
91954 @@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
91955 list = next;
91956 }
91957 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
91958 - ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91959 - ACCESS_ONCE(rdp->nocb_p_count_lazy) =
91960 + ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91961 + ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
91962 rdp->nocb_p_count_lazy - cl;
91963 rdp->n_nocbs_invoked += c;
91964 }
91965 @@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
91966 if (!rcu_nocb_need_deferred_wakeup(rdp))
91967 return;
91968 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
91969 - ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91970 + ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91971 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
91972 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
91973 }
91974 @@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
91975 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
91976 "rcuo%c/%d", rsp->abbr, cpu);
91977 BUG_ON(IS_ERR(t));
91978 - ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
91979 + ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
91980 }
91981
91982 /*
91983 @@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
91984
91985 /* Record start of fully idle period. */
91986 j = jiffies;
91987 - ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
91988 + ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
91989 smp_mb__before_atomic();
91990 - atomic_inc(&rdtp->dynticks_idle);
91991 + atomic_inc_unchecked(&rdtp->dynticks_idle);
91992 smp_mb__after_atomic();
91993 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
91994 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
91995 }
91996
91997 /*
91998 @@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
91999
92000 /* Record end of idle period. */
92001 smp_mb__before_atomic();
92002 - atomic_inc(&rdtp->dynticks_idle);
92003 + atomic_inc_unchecked(&rdtp->dynticks_idle);
92004 smp_mb__after_atomic();
92005 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
92006 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
92007
92008 /*
92009 * If we are the timekeeping CPU, we are permitted to be non-idle
92010 @@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
92011 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
92012
92013 /* Pick up current idle and NMI-nesting counter and check. */
92014 - cur = atomic_read(&rdtp->dynticks_idle);
92015 + cur = atomic_read_unchecked(&rdtp->dynticks_idle);
92016 if (cur & 0x1) {
92017 *isidle = false; /* We are not idle! */
92018 return;
92019 @@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
92020 case RCU_SYSIDLE_NOT:
92021
92022 /* First time all are idle, so note a short idle period. */
92023 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92024 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
92025 break;
92026
92027 case RCU_SYSIDLE_SHORT:
92028 @@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
92029 {
92030 smp_mb();
92031 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
92032 - ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
92033 + ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
92034 }
92035
92036 /*
92037 @@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
92038 smp_mb(); /* grace period precedes setting inuse. */
92039
92040 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
92041 - ACCESS_ONCE(rshp->inuse) = 0;
92042 + ACCESS_ONCE_RW(rshp->inuse) = 0;
92043 }
92044
92045 /*
92046 @@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
92047 static void rcu_dynticks_task_enter(void)
92048 {
92049 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
92050 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
92051 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
92052 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
92053 }
92054
92055 @@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
92056 static void rcu_dynticks_task_exit(void)
92057 {
92058 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
92059 - ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
92060 + ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
92061 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
92062 }
92063 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
92064 index 5cdc62e..cc52e88 100644
92065 --- a/kernel/rcu/tree_trace.c
92066 +++ b/kernel/rcu/tree_trace.c
92067 @@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
92068 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
92069 rdp->passed_quiesce, rdp->qs_pending);
92070 seq_printf(m, " dt=%d/%llx/%d df=%lu",
92071 - atomic_read(&rdp->dynticks->dynticks),
92072 + atomic_read_unchecked(&rdp->dynticks->dynticks),
92073 rdp->dynticks->dynticks_nesting,
92074 rdp->dynticks->dynticks_nmi_nesting,
92075 rdp->dynticks_fqs);
92076 @@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
92077 struct rcu_state *rsp = (struct rcu_state *)m->private;
92078
92079 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",
92080 - atomic_long_read(&rsp->expedited_start),
92081 + atomic_long_read_unchecked(&rsp->expedited_start),
92082 atomic_long_read(&rsp->expedited_done),
92083 - atomic_long_read(&rsp->expedited_wrap),
92084 - atomic_long_read(&rsp->expedited_tryfail),
92085 - atomic_long_read(&rsp->expedited_workdone1),
92086 - atomic_long_read(&rsp->expedited_workdone2),
92087 - atomic_long_read(&rsp->expedited_normal),
92088 - atomic_long_read(&rsp->expedited_stoppedcpus),
92089 - atomic_long_read(&rsp->expedited_done_tries),
92090 - atomic_long_read(&rsp->expedited_done_lost),
92091 - atomic_long_read(&rsp->expedited_done_exit));
92092 + atomic_long_read_unchecked(&rsp->expedited_wrap),
92093 + atomic_long_read_unchecked(&rsp->expedited_tryfail),
92094 + atomic_long_read_unchecked(&rsp->expedited_workdone1),
92095 + atomic_long_read_unchecked(&rsp->expedited_workdone2),
92096 + atomic_long_read_unchecked(&rsp->expedited_normal),
92097 + atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
92098 + atomic_long_read_unchecked(&rsp->expedited_done_tries),
92099 + atomic_long_read_unchecked(&rsp->expedited_done_lost),
92100 + atomic_long_read_unchecked(&rsp->expedited_done_exit));
92101 return 0;
92102 }
92103
92104 diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
92105 index 3ef8ba5..8c5ebfb6 100644
92106 --- a/kernel/rcu/update.c
92107 +++ b/kernel/rcu/update.c
92108 @@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
92109 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
92110 */
92111 if (till_stall_check < 3) {
92112 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
92113 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
92114 till_stall_check = 3;
92115 } else if (till_stall_check > 300) {
92116 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
92117 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
92118 till_stall_check = 300;
92119 }
92120 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
92121 @@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
92122 !ACCESS_ONCE(t->on_rq) ||
92123 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
92124 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
92125 - ACCESS_ONCE(t->rcu_tasks_holdout) = false;
92126 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
92127 list_del_init(&t->rcu_tasks_holdout_list);
92128 put_task_struct(t);
92129 return;
92130 @@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
92131 !is_idle_task(t)) {
92132 get_task_struct(t);
92133 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
92134 - ACCESS_ONCE(t->rcu_tasks_holdout) = true;
92135 + ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
92136 list_add(&t->rcu_tasks_holdout_list,
92137 &rcu_tasks_holdouts);
92138 }
92139 @@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
92140 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
92141 BUG_ON(IS_ERR(t));
92142 smp_mb(); /* Ensure others see full kthread. */
92143 - ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
92144 + ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
92145 mutex_unlock(&rcu_tasks_kthread_mutex);
92146 }
92147
92148 diff --git a/kernel/resource.c b/kernel/resource.c
92149 index 0bcebff..e7cd5b2 100644
92150 --- a/kernel/resource.c
92151 +++ b/kernel/resource.c
92152 @@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
92153
92154 static int __init ioresources_init(void)
92155 {
92156 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
92157 +#ifdef CONFIG_GRKERNSEC_PROC_USER
92158 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
92159 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
92160 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92161 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
92162 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
92163 +#endif
92164 +#else
92165 proc_create("ioports", 0, NULL, &proc_ioports_operations);
92166 proc_create("iomem", 0, NULL, &proc_iomem_operations);
92167 +#endif
92168 return 0;
92169 }
92170 __initcall(ioresources_init);
92171 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
92172 index 8a2e230..6020954 100644
92173 --- a/kernel/sched/auto_group.c
92174 +++ b/kernel/sched/auto_group.c
92175 @@ -11,7 +11,7 @@
92176
92177 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
92178 static struct autogroup autogroup_default;
92179 -static atomic_t autogroup_seq_nr;
92180 +static atomic_unchecked_t autogroup_seq_nr;
92181
92182 void __init autogroup_init(struct task_struct *init_task)
92183 {
92184 @@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
92185
92186 kref_init(&ag->kref);
92187 init_rwsem(&ag->lock);
92188 - ag->id = atomic_inc_return(&autogroup_seq_nr);
92189 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
92190 ag->tg = tg;
92191 #ifdef CONFIG_RT_GROUP_SCHED
92192 /*
92193 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
92194 index a63f4dc..349bbb0 100644
92195 --- a/kernel/sched/completion.c
92196 +++ b/kernel/sched/completion.c
92197 @@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
92198 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92199 * or number of jiffies left till timeout) if completed.
92200 */
92201 -long __sched
92202 +long __sched __intentional_overflow(-1)
92203 wait_for_completion_interruptible_timeout(struct completion *x,
92204 unsigned long timeout)
92205 {
92206 @@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
92207 *
92208 * Return: -ERESTARTSYS if interrupted, 0 if completed.
92209 */
92210 -int __sched wait_for_completion_killable(struct completion *x)
92211 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
92212 {
92213 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
92214 if (t == -ERESTARTSYS)
92215 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
92216 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92217 * or number of jiffies left till timeout) if completed.
92218 */
92219 -long __sched
92220 +long __sched __intentional_overflow(-1)
92221 wait_for_completion_killable_timeout(struct completion *x,
92222 unsigned long timeout)
92223 {
92224 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92225 index efdca2f..e361dfb 100644
92226 --- a/kernel/sched/core.c
92227 +++ b/kernel/sched/core.c
92228 @@ -1890,7 +1890,7 @@ void set_numabalancing_state(bool enabled)
92229 int sysctl_numa_balancing(struct ctl_table *table, int write,
92230 void __user *buffer, size_t *lenp, loff_t *ppos)
92231 {
92232 - struct ctl_table t;
92233 + ctl_table_no_const t;
92234 int err;
92235 int state = numabalancing_enabled;
92236
92237 @@ -2353,8 +2353,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92238 next->active_mm = oldmm;
92239 atomic_inc(&oldmm->mm_count);
92240 enter_lazy_tlb(oldmm, next);
92241 - } else
92242 + } else {
92243 switch_mm(oldmm, mm, next);
92244 + populate_stack();
92245 + }
92246
92247 if (!prev->mm) {
92248 prev->active_mm = NULL;
92249 @@ -3165,6 +3167,8 @@ int can_nice(const struct task_struct *p, const int nice)
92250 /* convert nice value [19,-20] to rlimit style value [1,40] */
92251 int nice_rlim = nice_to_rlimit(nice);
92252
92253 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92254 +
92255 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92256 capable(CAP_SYS_NICE));
92257 }
92258 @@ -3191,7 +3195,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92259 nice = task_nice(current) + increment;
92260
92261 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92262 - if (increment < 0 && !can_nice(current, nice))
92263 + if (increment < 0 && (!can_nice(current, nice) ||
92264 + gr_handle_chroot_nice()))
92265 return -EPERM;
92266
92267 retval = security_task_setnice(current, nice);
92268 @@ -3470,6 +3475,7 @@ recheck:
92269 if (policy != p->policy && !rlim_rtprio)
92270 return -EPERM;
92271
92272 + gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92273 /* can't increase priority */
92274 if (attr->sched_priority > p->rt_priority &&
92275 attr->sched_priority > rlim_rtprio)
92276 @@ -4890,6 +4896,7 @@ void idle_task_exit(void)
92277
92278 if (mm != &init_mm) {
92279 switch_mm(mm, &init_mm, current);
92280 + populate_stack();
92281 finish_arch_post_lock_switch();
92282 }
92283 mmdrop(mm);
92284 @@ -4985,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92285
92286 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92287
92288 -static struct ctl_table sd_ctl_dir[] = {
92289 +static ctl_table_no_const sd_ctl_dir[] __read_only = {
92290 {
92291 .procname = "sched_domain",
92292 .mode = 0555,
92293 @@ -5002,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = {
92294 {}
92295 };
92296
92297 -static struct ctl_table *sd_alloc_ctl_entry(int n)
92298 +static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92299 {
92300 - struct ctl_table *entry =
92301 + ctl_table_no_const *entry =
92302 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92303
92304 return entry;
92305 }
92306
92307 -static void sd_free_ctl_entry(struct ctl_table **tablep)
92308 +static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92309 {
92310 - struct ctl_table *entry;
92311 + ctl_table_no_const *entry;
92312
92313 /*
92314 * In the intermediate directories, both the child directory and
92315 @@ -5020,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92316 * will always be set. In the lowest directory the names are
92317 * static strings and all have proc handlers.
92318 */
92319 - for (entry = *tablep; entry->mode; entry++) {
92320 - if (entry->child)
92321 - sd_free_ctl_entry(&entry->child);
92322 + for (entry = tablep; entry->mode; entry++) {
92323 + if (entry->child) {
92324 + sd_free_ctl_entry(entry->child);
92325 + pax_open_kernel();
92326 + entry->child = NULL;
92327 + pax_close_kernel();
92328 + }
92329 if (entry->proc_handler == NULL)
92330 kfree(entry->procname);
92331 }
92332
92333 - kfree(*tablep);
92334 - *tablep = NULL;
92335 + kfree(tablep);
92336 }
92337
92338 static int min_load_idx = 0;
92339 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92340
92341 static void
92342 -set_table_entry(struct ctl_table *entry,
92343 +set_table_entry(ctl_table_no_const *entry,
92344 const char *procname, void *data, int maxlen,
92345 umode_t mode, proc_handler *proc_handler,
92346 bool load_idx)
92347 @@ -5055,7 +5065,7 @@ set_table_entry(struct ctl_table *entry,
92348 static struct ctl_table *
92349 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92350 {
92351 - struct ctl_table *table = sd_alloc_ctl_entry(14);
92352 + ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92353
92354 if (table == NULL)
92355 return NULL;
92356 @@ -5093,9 +5103,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92357 return table;
92358 }
92359
92360 -static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92361 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92362 {
92363 - struct ctl_table *entry, *table;
92364 + ctl_table_no_const *entry, *table;
92365 struct sched_domain *sd;
92366 int domain_num = 0, i;
92367 char buf[32];
92368 @@ -5122,11 +5132,13 @@ static struct ctl_table_header *sd_sysctl_header;
92369 static void register_sched_domain_sysctl(void)
92370 {
92371 int i, cpu_num = num_possible_cpus();
92372 - struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92373 + ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92374 char buf[32];
92375
92376 WARN_ON(sd_ctl_dir[0].child);
92377 + pax_open_kernel();
92378 sd_ctl_dir[0].child = entry;
92379 + pax_close_kernel();
92380
92381 if (entry == NULL)
92382 return;
92383 @@ -5149,8 +5161,12 @@ static void unregister_sched_domain_sysctl(void)
92384 if (sd_sysctl_header)
92385 unregister_sysctl_table(sd_sysctl_header);
92386 sd_sysctl_header = NULL;
92387 - if (sd_ctl_dir[0].child)
92388 - sd_free_ctl_entry(&sd_ctl_dir[0].child);
92389 + if (sd_ctl_dir[0].child) {
92390 + sd_free_ctl_entry(sd_ctl_dir[0].child);
92391 + pax_open_kernel();
92392 + sd_ctl_dir[0].child = NULL;
92393 + pax_close_kernel();
92394 + }
92395 }
92396 #else
92397 static void register_sched_domain_sysctl(void)
92398 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92399 index ef2b104..69961f6 100644
92400 --- a/kernel/sched/fair.c
92401 +++ b/kernel/sched/fair.c
92402 @@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92403
92404 static void reset_ptenuma_scan(struct task_struct *p)
92405 {
92406 - ACCESS_ONCE(p->mm->numa_scan_seq)++;
92407 + ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92408 p->mm->numa_scan_offset = 0;
92409 }
92410
92411 @@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92412 * run_rebalance_domains is triggered when needed from the scheduler tick.
92413 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92414 */
92415 -static void run_rebalance_domains(struct softirq_action *h)
92416 +static __latent_entropy void run_rebalance_domains(void)
92417 {
92418 struct rq *this_rq = this_rq();
92419 enum cpu_idle_type idle = this_rq->idle_balance ?
92420 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92421 index 2df8ef0..aae070f 100644
92422 --- a/kernel/sched/sched.h
92423 +++ b/kernel/sched/sched.h
92424 @@ -1140,7 +1140,7 @@ struct sched_class {
92425 #ifdef CONFIG_FAIR_GROUP_SCHED
92426 void (*task_move_group) (struct task_struct *p, int on_rq);
92427 #endif
92428 -};
92429 +} __do_const;
92430
92431 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92432 {
92433 diff --git a/kernel/signal.c b/kernel/signal.c
92434 index 8f0876f..1153a5a 100644
92435 --- a/kernel/signal.c
92436 +++ b/kernel/signal.c
92437 @@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92438
92439 int print_fatal_signals __read_mostly;
92440
92441 -static void __user *sig_handler(struct task_struct *t, int sig)
92442 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
92443 {
92444 return t->sighand->action[sig - 1].sa.sa_handler;
92445 }
92446
92447 -static int sig_handler_ignored(void __user *handler, int sig)
92448 +static int sig_handler_ignored(__sighandler_t handler, int sig)
92449 {
92450 /* Is it explicitly or implicitly ignored? */
92451 return handler == SIG_IGN ||
92452 @@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92453
92454 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92455 {
92456 - void __user *handler;
92457 + __sighandler_t handler;
92458
92459 handler = sig_handler(t, sig);
92460
92461 @@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92462 atomic_inc(&user->sigpending);
92463 rcu_read_unlock();
92464
92465 + if (!override_rlimit)
92466 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92467 +
92468 if (override_rlimit ||
92469 atomic_read(&user->sigpending) <=
92470 task_rlimit(t, RLIMIT_SIGPENDING)) {
92471 @@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92472
92473 int unhandled_signal(struct task_struct *tsk, int sig)
92474 {
92475 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92476 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92477 if (is_global_init(tsk))
92478 return 1;
92479 if (handler != SIG_IGN && handler != SIG_DFL)
92480 @@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92481 }
92482 }
92483
92484 + /* allow glibc communication via tgkill to other threads in our
92485 + thread group */
92486 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92487 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92488 + && gr_handle_signal(t, sig))
92489 + return -EPERM;
92490 +
92491 return security_task_kill(t, info, sig, 0);
92492 }
92493
92494 @@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92495 return send_signal(sig, info, p, 1);
92496 }
92497
92498 -static int
92499 +int
92500 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92501 {
92502 return send_signal(sig, info, t, 0);
92503 @@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92504 unsigned long int flags;
92505 int ret, blocked, ignored;
92506 struct k_sigaction *action;
92507 + int is_unhandled = 0;
92508
92509 spin_lock_irqsave(&t->sighand->siglock, flags);
92510 action = &t->sighand->action[sig-1];
92511 @@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92512 }
92513 if (action->sa.sa_handler == SIG_DFL)
92514 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92515 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92516 + is_unhandled = 1;
92517 ret = specific_send_sig_info(sig, info, t);
92518 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92519
92520 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
92521 + normal operation */
92522 + if (is_unhandled) {
92523 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92524 + gr_handle_crash(t, sig);
92525 + }
92526 +
92527 return ret;
92528 }
92529
92530 @@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92531 ret = check_kill_permission(sig, info, p);
92532 rcu_read_unlock();
92533
92534 - if (!ret && sig)
92535 + if (!ret && sig) {
92536 ret = do_send_sig_info(sig, info, p, true);
92537 + if (!ret)
92538 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92539 + }
92540
92541 return ret;
92542 }
92543 @@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92544 int error = -ESRCH;
92545
92546 rcu_read_lock();
92547 - p = find_task_by_vpid(pid);
92548 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92549 + /* allow glibc communication via tgkill to other threads in our
92550 + thread group */
92551 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92552 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
92553 + p = find_task_by_vpid_unrestricted(pid);
92554 + else
92555 +#endif
92556 + p = find_task_by_vpid(pid);
92557 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92558 error = check_kill_permission(sig, info, p);
92559 /*
92560 @@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92561 }
92562 seg = get_fs();
92563 set_fs(KERNEL_DS);
92564 - ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92565 - (stack_t __force __user *) &uoss,
92566 + ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92567 + (stack_t __force_user *) &uoss,
92568 compat_user_stack_pointer());
92569 set_fs(seg);
92570 if (ret >= 0 && uoss_ptr) {
92571 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92572 index eb89e18..a4e6792 100644
92573 --- a/kernel/smpboot.c
92574 +++ b/kernel/smpboot.c
92575 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92576 }
92577 smpboot_unpark_thread(plug_thread, cpu);
92578 }
92579 - list_add(&plug_thread->list, &hotplug_threads);
92580 + pax_list_add(&plug_thread->list, &hotplug_threads);
92581 out:
92582 mutex_unlock(&smpboot_threads_lock);
92583 return ret;
92584 @@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92585 {
92586 get_online_cpus();
92587 mutex_lock(&smpboot_threads_lock);
92588 - list_del(&plug_thread->list);
92589 + pax_list_del(&plug_thread->list);
92590 smpboot_destroy_threads(plug_thread);
92591 mutex_unlock(&smpboot_threads_lock);
92592 put_online_cpus();
92593 diff --git a/kernel/softirq.c b/kernel/softirq.c
92594 index 0699add..d365ad8 100644
92595 --- a/kernel/softirq.c
92596 +++ b/kernel/softirq.c
92597 @@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92598 EXPORT_SYMBOL(irq_stat);
92599 #endif
92600
92601 -static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92602 +static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92603
92604 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92605
92606 @@ -266,7 +266,7 @@ restart:
92607 kstat_incr_softirqs_this_cpu(vec_nr);
92608
92609 trace_softirq_entry(vec_nr);
92610 - h->action(h);
92611 + h->action();
92612 trace_softirq_exit(vec_nr);
92613 if (unlikely(prev_count != preempt_count())) {
92614 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92615 @@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92616 or_softirq_pending(1UL << nr);
92617 }
92618
92619 -void open_softirq(int nr, void (*action)(struct softirq_action *))
92620 +void __init open_softirq(int nr, void (*action)(void))
92621 {
92622 softirq_vec[nr].action = action;
92623 }
92624 @@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92625 }
92626 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92627
92628 -static void tasklet_action(struct softirq_action *a)
92629 +static void tasklet_action(void)
92630 {
92631 struct tasklet_struct *list;
92632
92633 @@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92634 }
92635 }
92636
92637 -static void tasklet_hi_action(struct softirq_action *a)
92638 +static __latent_entropy void tasklet_hi_action(void)
92639 {
92640 struct tasklet_struct *list;
92641
92642 @@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92643 .notifier_call = cpu_callback
92644 };
92645
92646 -static struct smp_hotplug_thread softirq_threads = {
92647 +static struct smp_hotplug_thread softirq_threads __read_only = {
92648 .store = &ksoftirqd,
92649 .thread_should_run = ksoftirqd_should_run,
92650 .thread_fn = run_ksoftirqd,
92651 diff --git a/kernel/sys.c b/kernel/sys.c
92652 index 1eaa2f0..d80d27c 100644
92653 --- a/kernel/sys.c
92654 +++ b/kernel/sys.c
92655 @@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92656 error = -EACCES;
92657 goto out;
92658 }
92659 +
92660 + if (gr_handle_chroot_setpriority(p, niceval)) {
92661 + error = -EACCES;
92662 + goto out;
92663 + }
92664 +
92665 no_nice = security_task_setnice(p, niceval);
92666 if (no_nice) {
92667 error = no_nice;
92668 @@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92669 goto error;
92670 }
92671
92672 + if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92673 + goto error;
92674 +
92675 + if (!gid_eq(new->gid, old->gid)) {
92676 + /* make sure we generate a learn log for what will
92677 + end up being a role transition after a full-learning
92678 + policy is generated
92679 + CAP_SETGID is required to perform a transition
92680 + we may not log a CAP_SETGID check above, e.g.
92681 + in the case where new rgid = old egid
92682 + */
92683 + gr_learn_cap(current, new, CAP_SETGID);
92684 + }
92685 +
92686 if (rgid != (gid_t) -1 ||
92687 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92688 new->sgid = new->egid;
92689 @@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92690 old = current_cred();
92691
92692 retval = -EPERM;
92693 +
92694 + if (gr_check_group_change(kgid, kgid, kgid))
92695 + goto error;
92696 +
92697 if (ns_capable(old->user_ns, CAP_SETGID))
92698 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92699 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92700 @@ -405,7 +429,7 @@ error:
92701 /*
92702 * change the user struct in a credentials set to match the new UID
92703 */
92704 -static int set_user(struct cred *new)
92705 +int set_user(struct cred *new)
92706 {
92707 struct user_struct *new_user;
92708
92709 @@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92710 goto error;
92711 }
92712
92713 + if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92714 + goto error;
92715 +
92716 if (!uid_eq(new->uid, old->uid)) {
92717 + /* make sure we generate a learn log for what will
92718 + end up being a role transition after a full-learning
92719 + policy is generated
92720 + CAP_SETUID is required to perform a transition
92721 + we may not log a CAP_SETUID check above, e.g.
92722 + in the case where new ruid = old euid
92723 + */
92724 + gr_learn_cap(current, new, CAP_SETUID);
92725 retval = set_user(new);
92726 if (retval < 0)
92727 goto error;
92728 @@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92729 old = current_cred();
92730
92731 retval = -EPERM;
92732 +
92733 + if (gr_check_crash_uid(kuid))
92734 + goto error;
92735 + if (gr_check_user_change(kuid, kuid, kuid))
92736 + goto error;
92737 +
92738 if (ns_capable(old->user_ns, CAP_SETUID)) {
92739 new->suid = new->uid = kuid;
92740 if (!uid_eq(kuid, old->uid)) {
92741 @@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
92742 goto error;
92743 }
92744
92745 + if (gr_check_user_change(kruid, keuid, INVALID_UID))
92746 + goto error;
92747 +
92748 if (ruid != (uid_t) -1) {
92749 new->uid = kruid;
92750 if (!uid_eq(kruid, old->uid)) {
92751 @@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
92752 goto error;
92753 }
92754
92755 + if (gr_check_group_change(krgid, kegid, INVALID_GID))
92756 + goto error;
92757 +
92758 if (rgid != (gid_t) -1)
92759 new->gid = krgid;
92760 if (egid != (gid_t) -1)
92761 @@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
92762 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
92763 ns_capable(old->user_ns, CAP_SETUID)) {
92764 if (!uid_eq(kuid, old->fsuid)) {
92765 + if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
92766 + goto error;
92767 +
92768 new->fsuid = kuid;
92769 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
92770 goto change_okay;
92771 }
92772 }
92773
92774 +error:
92775 abort_creds(new);
92776 return old_fsuid;
92777
92778 @@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
92779 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
92780 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
92781 ns_capable(old->user_ns, CAP_SETGID)) {
92782 + if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
92783 + goto error;
92784 +
92785 if (!gid_eq(kgid, old->fsgid)) {
92786 new->fsgid = kgid;
92787 goto change_okay;
92788 }
92789 }
92790
92791 +error:
92792 abort_creds(new);
92793 return old_fsgid;
92794
92795 @@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
92796 return -EFAULT;
92797
92798 down_read(&uts_sem);
92799 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
92800 + error = __copy_to_user(name->sysname, &utsname()->sysname,
92801 __OLD_UTS_LEN);
92802 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
92803 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
92804 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
92805 __OLD_UTS_LEN);
92806 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
92807 - error |= __copy_to_user(&name->release, &utsname()->release,
92808 + error |= __copy_to_user(name->release, &utsname()->release,
92809 __OLD_UTS_LEN);
92810 error |= __put_user(0, name->release + __OLD_UTS_LEN);
92811 - error |= __copy_to_user(&name->version, &utsname()->version,
92812 + error |= __copy_to_user(name->version, &utsname()->version,
92813 __OLD_UTS_LEN);
92814 error |= __put_user(0, name->version + __OLD_UTS_LEN);
92815 - error |= __copy_to_user(&name->machine, &utsname()->machine,
92816 + error |= __copy_to_user(name->machine, &utsname()->machine,
92817 __OLD_UTS_LEN);
92818 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
92819 up_read(&uts_sem);
92820 @@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
92821 */
92822 new_rlim->rlim_cur = 1;
92823 }
92824 + /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
92825 + is changed to a lower value. Since tasks can be created by the same
92826 + user in between this limit change and an execve by this task, force
92827 + a recheck only for this task by setting PF_NPROC_EXCEEDED
92828 + */
92829 + if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
92830 + tsk->flags |= PF_NPROC_EXCEEDED;
92831 }
92832 if (!retval) {
92833 if (old_rlim)
92834 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
92835 index 15f2511..181b356 100644
92836 --- a/kernel/sysctl.c
92837 +++ b/kernel/sysctl.c
92838 @@ -94,7 +94,6 @@
92839
92840
92841 #if defined(CONFIG_SYSCTL)
92842 -
92843 /* External variables not in a header file. */
92844 extern int max_threads;
92845 extern int suid_dumpable;
92846 @@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
92847
92848 /* Constants used for minimum and maximum */
92849 #ifdef CONFIG_LOCKUP_DETECTOR
92850 -static int sixty = 60;
92851 +static int sixty __read_only = 60;
92852 #endif
92853
92854 -static int __maybe_unused neg_one = -1;
92855 +static int __maybe_unused neg_one __read_only = -1;
92856
92857 -static int zero;
92858 -static int __maybe_unused one = 1;
92859 -static int __maybe_unused two = 2;
92860 -static int __maybe_unused four = 4;
92861 -static unsigned long one_ul = 1;
92862 -static int one_hundred = 100;
92863 +static int zero __read_only = 0;
92864 +static int __maybe_unused one __read_only = 1;
92865 +static int __maybe_unused two __read_only = 2;
92866 +static int __maybe_unused three __read_only = 3;
92867 +static int __maybe_unused four __read_only = 4;
92868 +static unsigned long one_ul __read_only = 1;
92869 +static int one_hundred __read_only = 100;
92870 #ifdef CONFIG_PRINTK
92871 -static int ten_thousand = 10000;
92872 +static int ten_thousand __read_only = 10000;
92873 #endif
92874
92875 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
92876 @@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
92877 void __user *buffer, size_t *lenp, loff_t *ppos);
92878 #endif
92879
92880 -#ifdef CONFIG_PRINTK
92881 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92882 void __user *buffer, size_t *lenp, loff_t *ppos);
92883 -#endif
92884
92885 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
92886 void __user *buffer, size_t *lenp, loff_t *ppos);
92887 @@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
92888
92889 #endif
92890
92891 +extern struct ctl_table grsecurity_table[];
92892 +
92893 static struct ctl_table kern_table[];
92894 static struct ctl_table vm_table[];
92895 static struct ctl_table fs_table[];
92896 @@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
92897 int sysctl_legacy_va_layout;
92898 #endif
92899
92900 +#ifdef CONFIG_PAX_SOFTMODE
92901 +static struct ctl_table pax_table[] = {
92902 + {
92903 + .procname = "softmode",
92904 + .data = &pax_softmode,
92905 + .maxlen = sizeof(unsigned int),
92906 + .mode = 0600,
92907 + .proc_handler = &proc_dointvec,
92908 + },
92909 +
92910 + { }
92911 +};
92912 +#endif
92913 +
92914 /* The default sysctl tables: */
92915
92916 static struct ctl_table sysctl_base_table[] = {
92917 @@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
92918 #endif
92919
92920 static struct ctl_table kern_table[] = {
92921 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
92922 + {
92923 + .procname = "grsecurity",
92924 + .mode = 0500,
92925 + .child = grsecurity_table,
92926 + },
92927 +#endif
92928 +
92929 +#ifdef CONFIG_PAX_SOFTMODE
92930 + {
92931 + .procname = "pax",
92932 + .mode = 0500,
92933 + .child = pax_table,
92934 + },
92935 +#endif
92936 +
92937 {
92938 .procname = "sched_child_runs_first",
92939 .data = &sysctl_sched_child_runs_first,
92940 @@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
92941 .data = &modprobe_path,
92942 .maxlen = KMOD_PATH_LEN,
92943 .mode = 0644,
92944 - .proc_handler = proc_dostring,
92945 + .proc_handler = proc_dostring_modpriv,
92946 },
92947 {
92948 .procname = "modules_disabled",
92949 @@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
92950 .extra1 = &zero,
92951 .extra2 = &one,
92952 },
92953 +#endif
92954 {
92955 .procname = "kptr_restrict",
92956 .data = &kptr_restrict,
92957 .maxlen = sizeof(int),
92958 .mode = 0644,
92959 .proc_handler = proc_dointvec_minmax_sysadmin,
92960 +#ifdef CONFIG_GRKERNSEC_HIDESYM
92961 + .extra1 = &two,
92962 +#else
92963 .extra1 = &zero,
92964 +#endif
92965 .extra2 = &two,
92966 },
92967 -#endif
92968 {
92969 .procname = "ngroups_max",
92970 .data = &ngroups_max,
92971 @@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
92972 */
92973 {
92974 .procname = "perf_event_paranoid",
92975 - .data = &sysctl_perf_event_paranoid,
92976 - .maxlen = sizeof(sysctl_perf_event_paranoid),
92977 + .data = &sysctl_perf_event_legitimately_concerned,
92978 + .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
92979 .mode = 0644,
92980 - .proc_handler = proc_dointvec,
92981 + /* go ahead, be a hero */
92982 + .proc_handler = proc_dointvec_minmax_sysadmin,
92983 + .extra1 = &neg_one,
92984 +#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
92985 + .extra2 = &three,
92986 +#else
92987 + .extra2 = &two,
92988 +#endif
92989 },
92990 {
92991 .procname = "perf_event_mlock_kb",
92992 @@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
92993 .proc_handler = proc_dointvec_minmax,
92994 .extra1 = &zero,
92995 },
92996 + {
92997 + .procname = "heap_stack_gap",
92998 + .data = &sysctl_heap_stack_gap,
92999 + .maxlen = sizeof(sysctl_heap_stack_gap),
93000 + .mode = 0644,
93001 + .proc_handler = proc_doulongvec_minmax,
93002 + },
93003 #else
93004 {
93005 .procname = "nr_trim_pages",
93006 @@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
93007 (char __user *)buffer, lenp, ppos);
93008 }
93009
93010 +int proc_dostring_modpriv(struct ctl_table *table, int write,
93011 + void __user *buffer, size_t *lenp, loff_t *ppos)
93012 +{
93013 + if (write && !capable(CAP_SYS_MODULE))
93014 + return -EPERM;
93015 +
93016 + return _proc_do_string(table->data, table->maxlen, write,
93017 + buffer, lenp, ppos);
93018 +}
93019 +
93020 static size_t proc_skip_spaces(char **buf)
93021 {
93022 size_t ret;
93023 @@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
93024 len = strlen(tmp);
93025 if (len > *size)
93026 len = *size;
93027 + if (len > sizeof(tmp))
93028 + len = sizeof(tmp);
93029 if (copy_to_user(*buf, tmp, len))
93030 return -EFAULT;
93031 *size -= len;
93032 @@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
93033 static int proc_taint(struct ctl_table *table, int write,
93034 void __user *buffer, size_t *lenp, loff_t *ppos)
93035 {
93036 - struct ctl_table t;
93037 + ctl_table_no_const t;
93038 unsigned long tmptaint = get_taint();
93039 int err;
93040
93041 @@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
93042 return err;
93043 }
93044
93045 -#ifdef CONFIG_PRINTK
93046 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93047 void __user *buffer, size_t *lenp, loff_t *ppos)
93048 {
93049 @@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
93050
93051 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
93052 }
93053 -#endif
93054
93055 struct do_proc_dointvec_minmax_conv_param {
93056 int *min;
93057 @@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
93058 return -ENOSYS;
93059 }
93060
93061 +int proc_dostring_modpriv(struct ctl_table *table, int write,
93062 + void __user *buffer, size_t *lenp, loff_t *ppos)
93063 +{
93064 + return -ENOSYS;
93065 +}
93066 +
93067 int proc_dointvec(struct ctl_table *table, int write,
93068 void __user *buffer, size_t *lenp, loff_t *ppos)
93069 {
93070 @@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
93071 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
93072 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
93073 EXPORT_SYMBOL(proc_dostring);
93074 +EXPORT_SYMBOL(proc_dostring_modpriv);
93075 EXPORT_SYMBOL(proc_doulongvec_minmax);
93076 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
93077 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
93078 index b312fcc7..753d72d 100644
93079 --- a/kernel/taskstats.c
93080 +++ b/kernel/taskstats.c
93081 @@ -28,9 +28,12 @@
93082 #include <linux/fs.h>
93083 #include <linux/file.h>
93084 #include <linux/pid_namespace.h>
93085 +#include <linux/grsecurity.h>
93086 #include <net/genetlink.h>
93087 #include <linux/atomic.h>
93088
93089 +extern int gr_is_taskstats_denied(int pid);
93090 +
93091 /*
93092 * Maximum length of a cpumask that can be specified in
93093 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
93094 @@ -576,6 +579,9 @@ err:
93095
93096 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
93097 {
93098 + if (gr_is_taskstats_denied(current->pid))
93099 + return -EACCES;
93100 +
93101 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
93102 return cmd_attr_register_cpumask(info);
93103 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
93104 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
93105 index a7077d3..dd48a49 100644
93106 --- a/kernel/time/alarmtimer.c
93107 +++ b/kernel/time/alarmtimer.c
93108 @@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
93109 struct platform_device *pdev;
93110 int error = 0;
93111 int i;
93112 - struct k_clock alarm_clock = {
93113 + static struct k_clock alarm_clock = {
93114 .clock_getres = alarm_clock_getres,
93115 .clock_get = alarm_clock_get,
93116 .timer_create = alarm_timer_create,
93117 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
93118 index 37e50aa..57a9501 100644
93119 --- a/kernel/time/hrtimer.c
93120 +++ b/kernel/time/hrtimer.c
93121 @@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
93122 local_irq_restore(flags);
93123 }
93124
93125 -static void run_hrtimer_softirq(struct softirq_action *h)
93126 +static __latent_entropy void run_hrtimer_softirq(void)
93127 {
93128 hrtimer_peek_ahead_timers();
93129 }
93130 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
93131 index a16b678..8c5bd9d 100644
93132 --- a/kernel/time/posix-cpu-timers.c
93133 +++ b/kernel/time/posix-cpu-timers.c
93134 @@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
93135
93136 static __init int init_posix_cpu_timers(void)
93137 {
93138 - struct k_clock process = {
93139 + static struct k_clock process = {
93140 .clock_getres = process_cpu_clock_getres,
93141 .clock_get = process_cpu_clock_get,
93142 .timer_create = process_cpu_timer_create,
93143 .nsleep = process_cpu_nsleep,
93144 .nsleep_restart = process_cpu_nsleep_restart,
93145 };
93146 - struct k_clock thread = {
93147 + static struct k_clock thread = {
93148 .clock_getres = thread_cpu_clock_getres,
93149 .clock_get = thread_cpu_clock_get,
93150 .timer_create = thread_cpu_timer_create,
93151 diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
93152 index 31ea01f..7fc61ef 100644
93153 --- a/kernel/time/posix-timers.c
93154 +++ b/kernel/time/posix-timers.c
93155 @@ -43,6 +43,7 @@
93156 #include <linux/hash.h>
93157 #include <linux/posix-clock.h>
93158 #include <linux/posix-timers.h>
93159 +#include <linux/grsecurity.h>
93160 #include <linux/syscalls.h>
93161 #include <linux/wait.h>
93162 #include <linux/workqueue.h>
93163 @@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
93164 * which we beg off on and pass to do_sys_settimeofday().
93165 */
93166
93167 -static struct k_clock posix_clocks[MAX_CLOCKS];
93168 +static struct k_clock *posix_clocks[MAX_CLOCKS];
93169
93170 /*
93171 * These ones are defined below.
93172 @@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
93173 */
93174 static __init int init_posix_timers(void)
93175 {
93176 - struct k_clock clock_realtime = {
93177 + static struct k_clock clock_realtime = {
93178 .clock_getres = hrtimer_get_res,
93179 .clock_get = posix_clock_realtime_get,
93180 .clock_set = posix_clock_realtime_set,
93181 @@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
93182 .timer_get = common_timer_get,
93183 .timer_del = common_timer_del,
93184 };
93185 - struct k_clock clock_monotonic = {
93186 + static struct k_clock clock_monotonic = {
93187 .clock_getres = hrtimer_get_res,
93188 .clock_get = posix_ktime_get_ts,
93189 .nsleep = common_nsleep,
93190 @@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
93191 .timer_get = common_timer_get,
93192 .timer_del = common_timer_del,
93193 };
93194 - struct k_clock clock_monotonic_raw = {
93195 + static struct k_clock clock_monotonic_raw = {
93196 .clock_getres = hrtimer_get_res,
93197 .clock_get = posix_get_monotonic_raw,
93198 };
93199 - struct k_clock clock_realtime_coarse = {
93200 + static struct k_clock clock_realtime_coarse = {
93201 .clock_getres = posix_get_coarse_res,
93202 .clock_get = posix_get_realtime_coarse,
93203 };
93204 - struct k_clock clock_monotonic_coarse = {
93205 + static struct k_clock clock_monotonic_coarse = {
93206 .clock_getres = posix_get_coarse_res,
93207 .clock_get = posix_get_monotonic_coarse,
93208 };
93209 - struct k_clock clock_tai = {
93210 + static struct k_clock clock_tai = {
93211 .clock_getres = hrtimer_get_res,
93212 .clock_get = posix_get_tai,
93213 .nsleep = common_nsleep,
93214 @@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
93215 .timer_get = common_timer_get,
93216 .timer_del = common_timer_del,
93217 };
93218 - struct k_clock clock_boottime = {
93219 + static struct k_clock clock_boottime = {
93220 .clock_getres = hrtimer_get_res,
93221 .clock_get = posix_get_boottime,
93222 .nsleep = common_nsleep,
93223 @@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93224 return;
93225 }
93226
93227 - posix_clocks[clock_id] = *new_clock;
93228 + posix_clocks[clock_id] = new_clock;
93229 }
93230 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93231
93232 @@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93233 return (id & CLOCKFD_MASK) == CLOCKFD ?
93234 &clock_posix_dynamic : &clock_posix_cpu;
93235
93236 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93237 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93238 return NULL;
93239 - return &posix_clocks[id];
93240 + return posix_clocks[id];
93241 }
93242
93243 static int common_timer_create(struct k_itimer *new_timer)
93244 @@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93245 struct k_clock *kc = clockid_to_kclock(which_clock);
93246 struct k_itimer *new_timer;
93247 int error, new_timer_id;
93248 - sigevent_t event;
93249 + sigevent_t event = { };
93250 int it_id_set = IT_ID_NOT_SET;
93251
93252 if (!kc)
93253 @@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93254 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93255 return -EFAULT;
93256
93257 + /* only the CLOCK_REALTIME clock can be set, all other clocks
93258 + have their clock_set fptr set to a nosettime dummy function
93259 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93260 + call common_clock_set, which calls do_sys_settimeofday, which
93261 + we hook
93262 + */
93263 +
93264 return kc->clock_set(which_clock, &new_tp);
93265 }
93266
93267 diff --git a/kernel/time/time.c b/kernel/time/time.c
93268 index a9ae20f..d3fbde7 100644
93269 --- a/kernel/time/time.c
93270 +++ b/kernel/time/time.c
93271 @@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93272 return error;
93273
93274 if (tz) {
93275 + /* we log in do_settimeofday called below, so don't log twice
93276 + */
93277 + if (!tv)
93278 + gr_log_timechange();
93279 +
93280 sys_tz = *tz;
93281 update_vsyscall_tz();
93282 if (firsttime) {
93283 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93284 index ec1791f..6a086cd 100644
93285 --- a/kernel/time/timekeeping.c
93286 +++ b/kernel/time/timekeeping.c
93287 @@ -15,6 +15,7 @@
93288 #include <linux/init.h>
93289 #include <linux/mm.h>
93290 #include <linux/sched.h>
93291 +#include <linux/grsecurity.h>
93292 #include <linux/syscore_ops.h>
93293 #include <linux/clocksource.h>
93294 #include <linux/jiffies.h>
93295 @@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93296 if (!timespec_valid_strict(tv))
93297 return -EINVAL;
93298
93299 + gr_log_timechange();
93300 +
93301 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93302 write_seqcount_begin(&tk_core.seq);
93303
93304 diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93305 index 3260ffd..c93cd5e 100644
93306 --- a/kernel/time/timer.c
93307 +++ b/kernel/time/timer.c
93308 @@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93309 /*
93310 * This function runs timers and the timer-tq in bottom half context.
93311 */
93312 -static void run_timer_softirq(struct softirq_action *h)
93313 +static __latent_entropy void run_timer_softirq(void)
93314 {
93315 struct tvec_base *base = __this_cpu_read(tvec_bases);
93316
93317 @@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93318 *
93319 * In all cases the return value is guaranteed to be non-negative.
93320 */
93321 -signed long __sched schedule_timeout(signed long timeout)
93322 +signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93323 {
93324 struct timer_list timer;
93325 unsigned long expire;
93326 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93327 index 61ed862..3b52c65 100644
93328 --- a/kernel/time/timer_list.c
93329 +++ b/kernel/time/timer_list.c
93330 @@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93331
93332 static void print_name_offset(struct seq_file *m, void *sym)
93333 {
93334 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93335 + SEQ_printf(m, "<%p>", NULL);
93336 +#else
93337 char symname[KSYM_NAME_LEN];
93338
93339 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93340 SEQ_printf(m, "<%pK>", sym);
93341 else
93342 SEQ_printf(m, "%s", symname);
93343 +#endif
93344 }
93345
93346 static void
93347 @@ -119,7 +123,11 @@ next_one:
93348 static void
93349 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93350 {
93351 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93352 + SEQ_printf(m, " .base: %p\n", NULL);
93353 +#else
93354 SEQ_printf(m, " .base: %pK\n", base);
93355 +#endif
93356 SEQ_printf(m, " .index: %d\n",
93357 base->index);
93358 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93359 @@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93360 {
93361 struct proc_dir_entry *pe;
93362
93363 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93364 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93365 +#else
93366 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93367 +#endif
93368 if (!pe)
93369 return -ENOMEM;
93370 return 0;
93371 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93372 index 1fb08f2..ca4bb1e 100644
93373 --- a/kernel/time/timer_stats.c
93374 +++ b/kernel/time/timer_stats.c
93375 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93376 static unsigned long nr_entries;
93377 static struct entry entries[MAX_ENTRIES];
93378
93379 -static atomic_t overflow_count;
93380 +static atomic_unchecked_t overflow_count;
93381
93382 /*
93383 * The entries are in a hash-table, for fast lookup:
93384 @@ -140,7 +140,7 @@ static void reset_entries(void)
93385 nr_entries = 0;
93386 memset(entries, 0, sizeof(entries));
93387 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93388 - atomic_set(&overflow_count, 0);
93389 + atomic_set_unchecked(&overflow_count, 0);
93390 }
93391
93392 static struct entry *alloc_entry(void)
93393 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93394 if (likely(entry))
93395 entry->count++;
93396 else
93397 - atomic_inc(&overflow_count);
93398 + atomic_inc_unchecked(&overflow_count);
93399
93400 out_unlock:
93401 raw_spin_unlock_irqrestore(lock, flags);
93402 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93403
93404 static void print_name_offset(struct seq_file *m, unsigned long addr)
93405 {
93406 +#ifdef CONFIG_GRKERNSEC_HIDESYM
93407 + seq_printf(m, "<%p>", NULL);
93408 +#else
93409 char symname[KSYM_NAME_LEN];
93410
93411 if (lookup_symbol_name(addr, symname) < 0)
93412 - seq_printf(m, "<%p>", (void *)addr);
93413 + seq_printf(m, "<%pK>", (void *)addr);
93414 else
93415 seq_printf(m, "%s", symname);
93416 +#endif
93417 }
93418
93419 static int tstats_show(struct seq_file *m, void *v)
93420 @@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93421
93422 seq_puts(m, "Timer Stats Version: v0.3\n");
93423 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93424 - if (atomic_read(&overflow_count))
93425 - seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93426 + if (atomic_read_unchecked(&overflow_count))
93427 + seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93428 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93429
93430 for (i = 0; i < nr_entries; i++) {
93431 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93432 {
93433 struct proc_dir_entry *pe;
93434
93435 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
93436 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93437 +#else
93438 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93439 +#endif
93440 if (!pe)
93441 return -ENOMEM;
93442 return 0;
93443 diff --git a/kernel/torture.c b/kernel/torture.c
93444 index dd70993..0bf694b 100644
93445 --- a/kernel/torture.c
93446 +++ b/kernel/torture.c
93447 @@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93448 mutex_lock(&fullstop_mutex);
93449 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93450 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93451 - ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93452 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93453 } else {
93454 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93455 }
93456 @@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93457 if (!torture_must_stop()) {
93458 if (stutter > 1) {
93459 schedule_timeout_interruptible(stutter - 1);
93460 - ACCESS_ONCE(stutter_pause_test) = 2;
93461 + ACCESS_ONCE_RW(stutter_pause_test) = 2;
93462 }
93463 schedule_timeout_interruptible(1);
93464 - ACCESS_ONCE(stutter_pause_test) = 1;
93465 + ACCESS_ONCE_RW(stutter_pause_test) = 1;
93466 }
93467 if (!torture_must_stop())
93468 schedule_timeout_interruptible(stutter);
93469 - ACCESS_ONCE(stutter_pause_test) = 0;
93470 + ACCESS_ONCE_RW(stutter_pause_test) = 0;
93471 torture_shutdown_absorb("torture_stutter");
93472 } while (!torture_must_stop());
93473 torture_kthread_stopping("torture_stutter");
93474 @@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93475 schedule_timeout_uninterruptible(10);
93476 return true;
93477 }
93478 - ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93479 + ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93480 mutex_unlock(&fullstop_mutex);
93481 torture_shutdown_cleanup();
93482 torture_shuffle_cleanup();
93483 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93484 index c1bd4ad..4b861dc 100644
93485 --- a/kernel/trace/blktrace.c
93486 +++ b/kernel/trace/blktrace.c
93487 @@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93488 struct blk_trace *bt = filp->private_data;
93489 char buf[16];
93490
93491 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93492 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93493
93494 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93495 }
93496 @@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93497 return 1;
93498
93499 bt = buf->chan->private_data;
93500 - atomic_inc(&bt->dropped);
93501 + atomic_inc_unchecked(&bt->dropped);
93502 return 0;
93503 }
93504
93505 @@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93506
93507 bt->dir = dir;
93508 bt->dev = dev;
93509 - atomic_set(&bt->dropped, 0);
93510 + atomic_set_unchecked(&bt->dropped, 0);
93511 INIT_LIST_HEAD(&bt->running_list);
93512
93513 ret = -EIO;
93514 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93515 index 31c90fe..051ce98 100644
93516 --- a/kernel/trace/ftrace.c
93517 +++ b/kernel/trace/ftrace.c
93518 @@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93519 if (unlikely(ftrace_disabled))
93520 return 0;
93521
93522 + ret = ftrace_arch_code_modify_prepare();
93523 + FTRACE_WARN_ON(ret);
93524 + if (ret)
93525 + return 0;
93526 +
93527 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93528 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93529 if (ret) {
93530 ftrace_bug(ret, ip);
93531 - return 0;
93532 }
93533 - return 1;
93534 + return ret ? 0 : 1;
93535 }
93536
93537 /*
93538 @@ -4492,8 +4497,10 @@ static int ftrace_process_locs(struct module *mod,
93539 if (!count)
93540 return 0;
93541
93542 + pax_open_kernel();
93543 sort(start, count, sizeof(*start),
93544 ftrace_cmp_ips, ftrace_swap_ips);
93545 + pax_close_kernel();
93546
93547 start_pg = ftrace_allocate_pages(count);
93548 if (!start_pg)
93549 @@ -5340,7 +5347,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93550
93551 if (t->ret_stack == NULL) {
93552 atomic_set(&t->tracing_graph_pause, 0);
93553 - atomic_set(&t->trace_overrun, 0);
93554 + atomic_set_unchecked(&t->trace_overrun, 0);
93555 t->curr_ret_stack = -1;
93556 /* Make sure the tasks see the -1 first: */
93557 smp_wmb();
93558 @@ -5553,7 +5560,7 @@ static void
93559 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93560 {
93561 atomic_set(&t->tracing_graph_pause, 0);
93562 - atomic_set(&t->trace_overrun, 0);
93563 + atomic_set_unchecked(&t->trace_overrun, 0);
93564 t->ftrace_timestamp = 0;
93565 /* make curr_ret_stack visible before we add the ret_stack */
93566 smp_wmb();
93567 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93568 index a56e07c..d46f0ba 100644
93569 --- a/kernel/trace/ring_buffer.c
93570 +++ b/kernel/trace/ring_buffer.c
93571 @@ -352,9 +352,9 @@ struct buffer_data_page {
93572 */
93573 struct buffer_page {
93574 struct list_head list; /* list of buffer pages */
93575 - local_t write; /* index for next write */
93576 + local_unchecked_t write; /* index for next write */
93577 unsigned read; /* index for next read */
93578 - local_t entries; /* entries on this page */
93579 + local_unchecked_t entries; /* entries on this page */
93580 unsigned long real_end; /* real end of data */
93581 struct buffer_data_page *page; /* Actual data page */
93582 };
93583 @@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93584 unsigned long last_overrun;
93585 local_t entries_bytes;
93586 local_t entries;
93587 - local_t overrun;
93588 - local_t commit_overrun;
93589 + local_unchecked_t overrun;
93590 + local_unchecked_t commit_overrun;
93591 local_t dropped_events;
93592 local_t committing;
93593 local_t commits;
93594 @@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93595 *
93596 * We add a counter to the write field to denote this.
93597 */
93598 - old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93599 - old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93600 + old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93601 + old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93602
93603 /*
93604 * Just make sure we have seen our old_write and synchronize
93605 @@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93606 * cmpxchg to only update if an interrupt did not already
93607 * do it for us. If the cmpxchg fails, we don't care.
93608 */
93609 - (void)local_cmpxchg(&next_page->write, old_write, val);
93610 - (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93611 + (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93612 + (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93613
93614 /*
93615 * No need to worry about races with clearing out the commit.
93616 @@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93617
93618 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93619 {
93620 - return local_read(&bpage->entries) & RB_WRITE_MASK;
93621 + return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93622 }
93623
93624 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93625 {
93626 - return local_read(&bpage->write) & RB_WRITE_MASK;
93627 + return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93628 }
93629
93630 static int
93631 @@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93632 * bytes consumed in ring buffer from here.
93633 * Increment overrun to account for the lost events.
93634 */
93635 - local_add(page_entries, &cpu_buffer->overrun);
93636 + local_add_unchecked(page_entries, &cpu_buffer->overrun);
93637 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93638 }
93639
93640 @@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93641 * it is our responsibility to update
93642 * the counters.
93643 */
93644 - local_add(entries, &cpu_buffer->overrun);
93645 + local_add_unchecked(entries, &cpu_buffer->overrun);
93646 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93647
93648 /*
93649 @@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93650 if (tail == BUF_PAGE_SIZE)
93651 tail_page->real_end = 0;
93652
93653 - local_sub(length, &tail_page->write);
93654 + local_sub_unchecked(length, &tail_page->write);
93655 return;
93656 }
93657
93658 @@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93659 rb_event_set_padding(event);
93660
93661 /* Set the write back to the previous setting */
93662 - local_sub(length, &tail_page->write);
93663 + local_sub_unchecked(length, &tail_page->write);
93664 return;
93665 }
93666
93667 @@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93668
93669 /* Set write to end of buffer */
93670 length = (tail + length) - BUF_PAGE_SIZE;
93671 - local_sub(length, &tail_page->write);
93672 + local_sub_unchecked(length, &tail_page->write);
93673 }
93674
93675 /*
93676 @@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93677 * about it.
93678 */
93679 if (unlikely(next_page == commit_page)) {
93680 - local_inc(&cpu_buffer->commit_overrun);
93681 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93682 goto out_reset;
93683 }
93684
93685 @@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93686 cpu_buffer->tail_page) &&
93687 (cpu_buffer->commit_page ==
93688 cpu_buffer->reader_page))) {
93689 - local_inc(&cpu_buffer->commit_overrun);
93690 + local_inc_unchecked(&cpu_buffer->commit_overrun);
93691 goto out_reset;
93692 }
93693 }
93694 @@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93695 length += RB_LEN_TIME_EXTEND;
93696
93697 tail_page = cpu_buffer->tail_page;
93698 - write = local_add_return(length, &tail_page->write);
93699 + write = local_add_return_unchecked(length, &tail_page->write);
93700
93701 /* set write to only the index of the write */
93702 write &= RB_WRITE_MASK;
93703 @@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93704 kmemcheck_annotate_bitfield(event, bitfield);
93705 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93706
93707 - local_inc(&tail_page->entries);
93708 + local_inc_unchecked(&tail_page->entries);
93709
93710 /*
93711 * If this is the first commit on the page, then update
93712 @@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93713
93714 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93715 unsigned long write_mask =
93716 - local_read(&bpage->write) & ~RB_WRITE_MASK;
93717 + local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93718 unsigned long event_length = rb_event_length(event);
93719 /*
93720 * This is on the tail page. It is possible that
93721 @@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93722 */
93723 old_index += write_mask;
93724 new_index += write_mask;
93725 - index = local_cmpxchg(&bpage->write, old_index, new_index);
93726 + index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93727 if (index == old_index) {
93728 /* update counters */
93729 local_sub(event_length, &cpu_buffer->entries_bytes);
93730 @@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93731
93732 /* Do the likely case first */
93733 if (likely(bpage->page == (void *)addr)) {
93734 - local_dec(&bpage->entries);
93735 + local_dec_unchecked(&bpage->entries);
93736 return;
93737 }
93738
93739 @@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93740 start = bpage;
93741 do {
93742 if (bpage->page == (void *)addr) {
93743 - local_dec(&bpage->entries);
93744 + local_dec_unchecked(&bpage->entries);
93745 return;
93746 }
93747 rb_inc_page(cpu_buffer, &bpage);
93748 @@ -3173,7 +3173,7 @@ static inline unsigned long
93749 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
93750 {
93751 return local_read(&cpu_buffer->entries) -
93752 - (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
93753 + (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
93754 }
93755
93756 /**
93757 @@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
93758 return 0;
93759
93760 cpu_buffer = buffer->buffers[cpu];
93761 - ret = local_read(&cpu_buffer->overrun);
93762 + ret = local_read_unchecked(&cpu_buffer->overrun);
93763
93764 return ret;
93765 }
93766 @@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
93767 return 0;
93768
93769 cpu_buffer = buffer->buffers[cpu];
93770 - ret = local_read(&cpu_buffer->commit_overrun);
93771 + ret = local_read_unchecked(&cpu_buffer->commit_overrun);
93772
93773 return ret;
93774 }
93775 @@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
93776 /* if you care about this being correct, lock the buffer */
93777 for_each_buffer_cpu(buffer, cpu) {
93778 cpu_buffer = buffer->buffers[cpu];
93779 - overruns += local_read(&cpu_buffer->overrun);
93780 + overruns += local_read_unchecked(&cpu_buffer->overrun);
93781 }
93782
93783 return overruns;
93784 @@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93785 /*
93786 * Reset the reader page to size zero.
93787 */
93788 - local_set(&cpu_buffer->reader_page->write, 0);
93789 - local_set(&cpu_buffer->reader_page->entries, 0);
93790 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93791 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93792 local_set(&cpu_buffer->reader_page->page->commit, 0);
93793 cpu_buffer->reader_page->real_end = 0;
93794
93795 @@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93796 * want to compare with the last_overrun.
93797 */
93798 smp_mb();
93799 - overwrite = local_read(&(cpu_buffer->overrun));
93800 + overwrite = local_read_unchecked(&(cpu_buffer->overrun));
93801
93802 /*
93803 * Here's the tricky part.
93804 @@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93805
93806 cpu_buffer->head_page
93807 = list_entry(cpu_buffer->pages, struct buffer_page, list);
93808 - local_set(&cpu_buffer->head_page->write, 0);
93809 - local_set(&cpu_buffer->head_page->entries, 0);
93810 + local_set_unchecked(&cpu_buffer->head_page->write, 0);
93811 + local_set_unchecked(&cpu_buffer->head_page->entries, 0);
93812 local_set(&cpu_buffer->head_page->page->commit, 0);
93813
93814 cpu_buffer->head_page->read = 0;
93815 @@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93816
93817 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
93818 INIT_LIST_HEAD(&cpu_buffer->new_pages);
93819 - local_set(&cpu_buffer->reader_page->write, 0);
93820 - local_set(&cpu_buffer->reader_page->entries, 0);
93821 + local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93822 + local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93823 local_set(&cpu_buffer->reader_page->page->commit, 0);
93824 cpu_buffer->reader_page->read = 0;
93825
93826 local_set(&cpu_buffer->entries_bytes, 0);
93827 - local_set(&cpu_buffer->overrun, 0);
93828 - local_set(&cpu_buffer->commit_overrun, 0);
93829 + local_set_unchecked(&cpu_buffer->overrun, 0);
93830 + local_set_unchecked(&cpu_buffer->commit_overrun, 0);
93831 local_set(&cpu_buffer->dropped_events, 0);
93832 local_set(&cpu_buffer->entries, 0);
93833 local_set(&cpu_buffer->committing, 0);
93834 @@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
93835 rb_init_page(bpage);
93836 bpage = reader->page;
93837 reader->page = *data_page;
93838 - local_set(&reader->write, 0);
93839 - local_set(&reader->entries, 0);
93840 + local_set_unchecked(&reader->write, 0);
93841 + local_set_unchecked(&reader->entries, 0);
93842 reader->read = 0;
93843 *data_page = bpage;
93844
93845 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
93846 index 426962b..e8e2d9a 100644
93847 --- a/kernel/trace/trace.c
93848 +++ b/kernel/trace/trace.c
93849 @@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
93850 return 0;
93851 }
93852
93853 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
93854 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
93855 {
93856 /* do nothing if flag is already set */
93857 if (!!(trace_flags & mask) == !!enabled)
93858 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
93859 index 385391f..8d2250f 100644
93860 --- a/kernel/trace/trace.h
93861 +++ b/kernel/trace/trace.h
93862 @@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
93863 void trace_printk_init_buffers(void);
93864 void trace_printk_start_comm(void);
93865 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
93866 -int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
93867 +int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
93868
93869 /*
93870 * Normal trace_printk() and friends allocates special buffers
93871 diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
93872 index 57b67b1..66082a9 100644
93873 --- a/kernel/trace/trace_clock.c
93874 +++ b/kernel/trace/trace_clock.c
93875 @@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
93876 return now;
93877 }
93878
93879 -static atomic64_t trace_counter;
93880 +static atomic64_unchecked_t trace_counter;
93881
93882 /*
93883 * trace_clock_counter(): simply an atomic counter.
93884 @@ -133,5 +133,5 @@ static atomic64_t trace_counter;
93885 */
93886 u64 notrace trace_clock_counter(void)
93887 {
93888 - return atomic64_add_return(1, &trace_counter);
93889 + return atomic64_inc_return_unchecked(&trace_counter);
93890 }
93891 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
93892 index 1b0df1e..4ebb965 100644
93893 --- a/kernel/trace/trace_events.c
93894 +++ b/kernel/trace/trace_events.c
93895 @@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
93896 return 0;
93897 }
93898
93899 -struct ftrace_module_file_ops;
93900 static void __add_event_to_tracers(struct ftrace_event_call *call);
93901
93902 /* Add an additional event_call dynamically */
93903 diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
93904 index f0a0c98..3692dc8 100644
93905 --- a/kernel/trace/trace_functions_graph.c
93906 +++ b/kernel/trace/trace_functions_graph.c
93907 @@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
93908
93909 /* The return trace stack is full */
93910 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
93911 - atomic_inc(&current->trace_overrun);
93912 + atomic_inc_unchecked(&current->trace_overrun);
93913 return -EBUSY;
93914 }
93915
93916 @@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
93917 *ret = current->ret_stack[index].ret;
93918 trace->func = current->ret_stack[index].func;
93919 trace->calltime = current->ret_stack[index].calltime;
93920 - trace->overrun = atomic_read(&current->trace_overrun);
93921 + trace->overrun = atomic_read_unchecked(&current->trace_overrun);
93922 trace->depth = index;
93923 }
93924
93925 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
93926 index 0abd9b8..6a663a2 100644
93927 --- a/kernel/trace/trace_mmiotrace.c
93928 +++ b/kernel/trace/trace_mmiotrace.c
93929 @@ -24,7 +24,7 @@ struct header_iter {
93930 static struct trace_array *mmio_trace_array;
93931 static bool overrun_detected;
93932 static unsigned long prev_overruns;
93933 -static atomic_t dropped_count;
93934 +static atomic_unchecked_t dropped_count;
93935
93936 static void mmio_reset_data(struct trace_array *tr)
93937 {
93938 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
93939
93940 static unsigned long count_overruns(struct trace_iterator *iter)
93941 {
93942 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
93943 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
93944 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
93945
93946 if (over > prev_overruns)
93947 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
93948 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
93949 sizeof(*entry), 0, pc);
93950 if (!event) {
93951 - atomic_inc(&dropped_count);
93952 + atomic_inc_unchecked(&dropped_count);
93953 return;
93954 }
93955 entry = ring_buffer_event_data(event);
93956 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
93957 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
93958 sizeof(*entry), 0, pc);
93959 if (!event) {
93960 - atomic_inc(&dropped_count);
93961 + atomic_inc_unchecked(&dropped_count);
93962 return;
93963 }
93964 entry = ring_buffer_event_data(event);
93965 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
93966 index c6977d5..d243785 100644
93967 --- a/kernel/trace/trace_output.c
93968 +++ b/kernel/trace/trace_output.c
93969 @@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
93970 goto out;
93971 }
93972
93973 + pax_open_kernel();
93974 if (event->funcs->trace == NULL)
93975 - event->funcs->trace = trace_nop_print;
93976 + *(void **)&event->funcs->trace = trace_nop_print;
93977 if (event->funcs->raw == NULL)
93978 - event->funcs->raw = trace_nop_print;
93979 + *(void **)&event->funcs->raw = trace_nop_print;
93980 if (event->funcs->hex == NULL)
93981 - event->funcs->hex = trace_nop_print;
93982 + *(void **)&event->funcs->hex = trace_nop_print;
93983 if (event->funcs->binary == NULL)
93984 - event->funcs->binary = trace_nop_print;
93985 + *(void **)&event->funcs->binary = trace_nop_print;
93986 + pax_close_kernel();
93987
93988 key = event->type & (EVENT_HASHSIZE - 1);
93989
93990 diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
93991 index 1f24ed9..10407ec 100644
93992 --- a/kernel/trace/trace_seq.c
93993 +++ b/kernel/trace/trace_seq.c
93994 @@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
93995
93996 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
93997 if (!IS_ERR(p)) {
93998 - p = mangle_path(s->buffer + s->len, p, "\n");
93999 + p = mangle_path(s->buffer + s->len, p, "\n\\");
94000 if (p) {
94001 s->len = p - s->buffer;
94002 return 1;
94003 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
94004 index 16eddb3..758b308 100644
94005 --- a/kernel/trace/trace_stack.c
94006 +++ b/kernel/trace/trace_stack.c
94007 @@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
94008 return;
94009
94010 /* we do not handle interrupt stacks yet */
94011 - if (!object_is_on_stack(stack))
94012 + if (!object_starts_on_stack(stack))
94013 return;
94014
94015 local_irq_save(flags);
94016 diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
94017 index 29228c4..301bc8c 100644
94018 --- a/kernel/trace/trace_syscalls.c
94019 +++ b/kernel/trace/trace_syscalls.c
94020 @@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
94021 int num;
94022
94023 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94024 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94025 + return -EINVAL;
94026
94027 mutex_lock(&syscall_trace_lock);
94028 if (!sys_perf_refcount_enter)
94029 @@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
94030 int num;
94031
94032 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94033 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94034 + return;
94035
94036 mutex_lock(&syscall_trace_lock);
94037 sys_perf_refcount_enter--;
94038 @@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
94039 int num;
94040
94041 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94042 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94043 + return -EINVAL;
94044
94045 mutex_lock(&syscall_trace_lock);
94046 if (!sys_perf_refcount_exit)
94047 @@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
94048 int num;
94049
94050 num = ((struct syscall_metadata *)call->data)->syscall_nr;
94051 + if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
94052 + return;
94053
94054 mutex_lock(&syscall_trace_lock);
94055 sys_perf_refcount_exit--;
94056 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
94057 index a2e37c5..4fa859b 100644
94058 --- a/kernel/user_namespace.c
94059 +++ b/kernel/user_namespace.c
94060 @@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
94061 !kgid_has_mapping(parent_ns, group))
94062 return -EPERM;
94063
94064 +#ifdef CONFIG_GRKERNSEC
94065 + /*
94066 + * This doesn't really inspire confidence:
94067 + * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
94068 + * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
94069 + * Increases kernel attack surface in areas developers
94070 + * previously cared little about ("low importance due
94071 + * to requiring "root" capability")
94072 + * To be removed when this code receives *proper* review
94073 + */
94074 + if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
94075 + !capable(CAP_SETGID))
94076 + return -EPERM;
94077 +#endif
94078 +
94079 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
94080 if (!ns)
94081 return -ENOMEM;
94082 @@ -974,7 +989,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
94083 if (atomic_read(&current->mm->mm_users) > 1)
94084 return -EINVAL;
94085
94086 - if (current->fs->users != 1)
94087 + if (atomic_read(&current->fs->users) != 1)
94088 return -EINVAL;
94089
94090 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
94091 diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
94092 index c8eac43..4b5f08f 100644
94093 --- a/kernel/utsname_sysctl.c
94094 +++ b/kernel/utsname_sysctl.c
94095 @@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
94096 static int proc_do_uts_string(struct ctl_table *table, int write,
94097 void __user *buffer, size_t *lenp, loff_t *ppos)
94098 {
94099 - struct ctl_table uts_table;
94100 + ctl_table_no_const uts_table;
94101 int r;
94102 memcpy(&uts_table, table, sizeof(uts_table));
94103 uts_table.data = get_uts(table, write);
94104 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
94105 index 70bf118..4be3c37 100644
94106 --- a/kernel/watchdog.c
94107 +++ b/kernel/watchdog.c
94108 @@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
94109 static void watchdog_nmi_disable(unsigned int cpu) { return; }
94110 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
94111
94112 -static struct smp_hotplug_thread watchdog_threads = {
94113 +static struct smp_hotplug_thread watchdog_threads __read_only = {
94114 .store = &softlockup_watchdog,
94115 .thread_should_run = watchdog_should_run,
94116 .thread_fn = watchdog,
94117 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
94118 index 09b685d..d3565e3 100644
94119 --- a/kernel/workqueue.c
94120 +++ b/kernel/workqueue.c
94121 @@ -4508,7 +4508,7 @@ static void rebind_workers(struct worker_pool *pool)
94122 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
94123 worker_flags |= WORKER_REBOUND;
94124 worker_flags &= ~WORKER_UNBOUND;
94125 - ACCESS_ONCE(worker->flags) = worker_flags;
94126 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
94127 }
94128
94129 spin_unlock_irq(&pool->lock);
94130 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
94131 index 4e35a5d..8a1f3f0 100644
94132 --- a/lib/Kconfig.debug
94133 +++ b/lib/Kconfig.debug
94134 @@ -894,7 +894,7 @@ config DEBUG_MUTEXES
94135
94136 config DEBUG_WW_MUTEX_SLOWPATH
94137 bool "Wait/wound mutex debugging: Slowpath testing"
94138 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94139 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94140 select DEBUG_LOCK_ALLOC
94141 select DEBUG_SPINLOCK
94142 select DEBUG_MUTEXES
94143 @@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
94144
94145 config DEBUG_LOCK_ALLOC
94146 bool "Lock debugging: detect incorrect freeing of live locks"
94147 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94148 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94149 select DEBUG_SPINLOCK
94150 select DEBUG_MUTEXES
94151 select LOCKDEP
94152 @@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
94153
94154 config PROVE_LOCKING
94155 bool "Lock debugging: prove locking correctness"
94156 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94157 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94158 select LOCKDEP
94159 select DEBUG_SPINLOCK
94160 select DEBUG_MUTEXES
94161 @@ -976,7 +976,7 @@ config LOCKDEP
94162
94163 config LOCK_STAT
94164 bool "Lock usage statistics"
94165 - depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94166 + depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94167 select LOCKDEP
94168 select DEBUG_SPINLOCK
94169 select DEBUG_MUTEXES
94170 @@ -1449,6 +1449,7 @@ config LATENCYTOP
94171 depends on DEBUG_KERNEL
94172 depends on STACKTRACE_SUPPORT
94173 depends on PROC_FS
94174 + depends on !GRKERNSEC_HIDESYM
94175 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
94176 select KALLSYMS
94177 select KALLSYMS_ALL
94178 @@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94179 config DEBUG_STRICT_USER_COPY_CHECKS
94180 bool "Strict user copy size checks"
94181 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94182 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
94183 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
94184 help
94185 Enabling this option turns a certain set of sanity checks for user
94186 copy operations into compile time failures.
94187 @@ -1593,7 +1594,7 @@ endmenu # runtime tests
94188
94189 config PROVIDE_OHCI1394_DMA_INIT
94190 bool "Remote debugging over FireWire early on boot"
94191 - depends on PCI && X86
94192 + depends on PCI && X86 && !GRKERNSEC
94193 help
94194 If you want to debug problems which hang or crash the kernel early
94195 on boot and the crashing machine has a FireWire port, you can use
94196 diff --git a/lib/Makefile b/lib/Makefile
94197 index 0211d2b..93f5cc3 100644
94198 --- a/lib/Makefile
94199 +++ b/lib/Makefile
94200 @@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
94201 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
94202 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
94203 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
94204 -obj-$(CONFIG_DEBUG_LIST) += list_debug.o
94205 +obj-y += list_debug.o
94206 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
94207
94208 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
94209 diff --git a/lib/average.c b/lib/average.c
94210 index 114d1be..ab0350c 100644
94211 --- a/lib/average.c
94212 +++ b/lib/average.c
94213 @@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
94214 {
94215 unsigned long internal = ACCESS_ONCE(avg->internal);
94216
94217 - ACCESS_ONCE(avg->internal) = internal ?
94218 + ACCESS_ONCE_RW(avg->internal) = internal ?
94219 (((internal << avg->weight) - internal) +
94220 (val << avg->factor)) >> avg->weight :
94221 (val << avg->factor);
94222 diff --git a/lib/bitmap.c b/lib/bitmap.c
94223 index b499ab6..fbdb76c 100644
94224 --- a/lib/bitmap.c
94225 +++ b/lib/bitmap.c
94226 @@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94227 {
94228 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94229 u32 chunk;
94230 - const char __user __force *ubuf = (const char __user __force *)buf;
94231 + const char __user *ubuf = (const char __force_user *)buf;
94232
94233 bitmap_zero(maskp, nmaskbits);
94234
94235 @@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94236 {
94237 if (!access_ok(VERIFY_READ, ubuf, ulen))
94238 return -EFAULT;
94239 - return __bitmap_parse((const char __force *)ubuf,
94240 + return __bitmap_parse((const char __force_kernel *)ubuf,
94241 ulen, 1, maskp, nmaskbits);
94242
94243 }
94244 @@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94245 {
94246 unsigned a, b;
94247 int c, old_c, totaldigits;
94248 - const char __user __force *ubuf = (const char __user __force *)buf;
94249 + const char __user *ubuf = (const char __force_user *)buf;
94250 int exp_digit, in_range;
94251
94252 totaldigits = c = 0;
94253 @@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94254 {
94255 if (!access_ok(VERIFY_READ, ubuf, ulen))
94256 return -EFAULT;
94257 - return __bitmap_parselist((const char __force *)ubuf,
94258 + return __bitmap_parselist((const char __force_kernel *)ubuf,
94259 ulen, 1, maskp, nmaskbits);
94260 }
94261 EXPORT_SYMBOL(bitmap_parselist_user);
94262 diff --git a/lib/bug.c b/lib/bug.c
94263 index d1d7c78..b354235 100644
94264 --- a/lib/bug.c
94265 +++ b/lib/bug.c
94266 @@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94267 return BUG_TRAP_TYPE_NONE;
94268
94269 bug = find_bug(bugaddr);
94270 + if (!bug)
94271 + return BUG_TRAP_TYPE_NONE;
94272
94273 file = NULL;
94274 line = 0;
94275 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94276 index 547f7f9..a6d4ba0 100644
94277 --- a/lib/debugobjects.c
94278 +++ b/lib/debugobjects.c
94279 @@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94280 if (limit > 4)
94281 return;
94282
94283 - is_on_stack = object_is_on_stack(addr);
94284 + is_on_stack = object_starts_on_stack(addr);
94285 if (is_on_stack == onstack)
94286 return;
94287
94288 diff --git a/lib/div64.c b/lib/div64.c
94289 index 4382ad7..08aa558 100644
94290 --- a/lib/div64.c
94291 +++ b/lib/div64.c
94292 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94293 EXPORT_SYMBOL(__div64_32);
94294
94295 #ifndef div_s64_rem
94296 -s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94297 +s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94298 {
94299 u64 quotient;
94300
94301 @@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94302 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94303 */
94304 #ifndef div64_u64
94305 -u64 div64_u64(u64 dividend, u64 divisor)
94306 +u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94307 {
94308 u32 high = divisor >> 32;
94309 u64 quot;
94310 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94311 index add80cc..0d27550 100644
94312 --- a/lib/dma-debug.c
94313 +++ b/lib/dma-debug.c
94314 @@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94315
94316 void dma_debug_add_bus(struct bus_type *bus)
94317 {
94318 - struct notifier_block *nb;
94319 + notifier_block_no_const *nb;
94320
94321 if (global_disable)
94322 return;
94323 @@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94324
94325 static void check_for_stack(struct device *dev, void *addr)
94326 {
94327 - if (object_is_on_stack(addr))
94328 + if (object_starts_on_stack(addr))
94329 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94330 "stack [addr=%p]\n", addr);
94331 }
94332 diff --git a/lib/hash.c b/lib/hash.c
94333 index fea973f..386626f 100644
94334 --- a/lib/hash.c
94335 +++ b/lib/hash.c
94336 @@ -14,7 +14,7 @@
94337 #include <linux/hash.h>
94338 #include <linux/cache.h>
94339
94340 -static struct fast_hash_ops arch_hash_ops __read_mostly = {
94341 +static struct fast_hash_ops arch_hash_ops __read_only = {
94342 .hash = jhash,
94343 .hash2 = jhash2,
94344 };
94345 diff --git a/lib/inflate.c b/lib/inflate.c
94346 index 013a761..c28f3fc 100644
94347 --- a/lib/inflate.c
94348 +++ b/lib/inflate.c
94349 @@ -269,7 +269,7 @@ static void free(void *where)
94350 malloc_ptr = free_mem_ptr;
94351 }
94352 #else
94353 -#define malloc(a) kmalloc(a, GFP_KERNEL)
94354 +#define malloc(a) kmalloc((a), GFP_KERNEL)
94355 #define free(a) kfree(a)
94356 #endif
94357
94358 diff --git a/lib/ioremap.c b/lib/ioremap.c
94359 index 0c9216c..863bd89 100644
94360 --- a/lib/ioremap.c
94361 +++ b/lib/ioremap.c
94362 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94363 unsigned long next;
94364
94365 phys_addr -= addr;
94366 - pmd = pmd_alloc(&init_mm, pud, addr);
94367 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94368 if (!pmd)
94369 return -ENOMEM;
94370 do {
94371 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94372 unsigned long next;
94373
94374 phys_addr -= addr;
94375 - pud = pud_alloc(&init_mm, pgd, addr);
94376 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
94377 if (!pud)
94378 return -ENOMEM;
94379 do {
94380 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94381 index bd2bea9..6b3c95e 100644
94382 --- a/lib/is_single_threaded.c
94383 +++ b/lib/is_single_threaded.c
94384 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94385 struct task_struct *p, *t;
94386 bool ret;
94387
94388 + if (!mm)
94389 + return true;
94390 +
94391 if (atomic_read(&task->signal->live) != 1)
94392 return false;
94393
94394 diff --git a/lib/kobject.c b/lib/kobject.c
94395 index 58751bb..93a1853 100644
94396 --- a/lib/kobject.c
94397 +++ b/lib/kobject.c
94398 @@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94399
94400
94401 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94402 -static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94403 +static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94404
94405 -int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94406 +int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94407 {
94408 enum kobj_ns_type type = ops->type;
94409 int error;
94410 diff --git a/lib/list_debug.c b/lib/list_debug.c
94411 index c24c2f7..f0296f4 100644
94412 --- a/lib/list_debug.c
94413 +++ b/lib/list_debug.c
94414 @@ -11,7 +11,9 @@
94415 #include <linux/bug.h>
94416 #include <linux/kernel.h>
94417 #include <linux/rculist.h>
94418 +#include <linux/mm.h>
94419
94420 +#ifdef CONFIG_DEBUG_LIST
94421 /*
94422 * Insert a new entry between two known consecutive entries.
94423 *
94424 @@ -19,21 +21,40 @@
94425 * the prev/next entries already!
94426 */
94427
94428 +static bool __list_add_debug(struct list_head *new,
94429 + struct list_head *prev,
94430 + struct list_head *next)
94431 +{
94432 + if (unlikely(next->prev != prev)) {
94433 + printk(KERN_ERR "list_add corruption. next->prev should be "
94434 + "prev (%p), but was %p. (next=%p).\n",
94435 + prev, next->prev, next);
94436 + BUG();
94437 + return false;
94438 + }
94439 + if (unlikely(prev->next != next)) {
94440 + printk(KERN_ERR "list_add corruption. prev->next should be "
94441 + "next (%p), but was %p. (prev=%p).\n",
94442 + next, prev->next, prev);
94443 + BUG();
94444 + return false;
94445 + }
94446 + if (unlikely(new == prev || new == next)) {
94447 + printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94448 + new, prev, next);
94449 + BUG();
94450 + return false;
94451 + }
94452 + return true;
94453 +}
94454 +
94455 void __list_add(struct list_head *new,
94456 - struct list_head *prev,
94457 - struct list_head *next)
94458 + struct list_head *prev,
94459 + struct list_head *next)
94460 {
94461 - WARN(next->prev != prev,
94462 - "list_add corruption. next->prev should be "
94463 - "prev (%p), but was %p. (next=%p).\n",
94464 - prev, next->prev, next);
94465 - WARN(prev->next != next,
94466 - "list_add corruption. prev->next should be "
94467 - "next (%p), but was %p. (prev=%p).\n",
94468 - next, prev->next, prev);
94469 - WARN(new == prev || new == next,
94470 - "list_add double add: new=%p, prev=%p, next=%p.\n",
94471 - new, prev, next);
94472 + if (!__list_add_debug(new, prev, next))
94473 + return;
94474 +
94475 next->prev = new;
94476 new->next = next;
94477 new->prev = prev;
94478 @@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94479 }
94480 EXPORT_SYMBOL(__list_add);
94481
94482 -void __list_del_entry(struct list_head *entry)
94483 +static bool __list_del_entry_debug(struct list_head *entry)
94484 {
94485 struct list_head *prev, *next;
94486
94487 prev = entry->prev;
94488 next = entry->next;
94489
94490 - if (WARN(next == LIST_POISON1,
94491 - "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94492 - entry, LIST_POISON1) ||
94493 - WARN(prev == LIST_POISON2,
94494 - "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94495 - entry, LIST_POISON2) ||
94496 - WARN(prev->next != entry,
94497 - "list_del corruption. prev->next should be %p, "
94498 - "but was %p\n", entry, prev->next) ||
94499 - WARN(next->prev != entry,
94500 - "list_del corruption. next->prev should be %p, "
94501 - "but was %p\n", entry, next->prev))
94502 + if (unlikely(next == LIST_POISON1)) {
94503 + printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94504 + entry, LIST_POISON1);
94505 + BUG();
94506 + return false;
94507 + }
94508 + if (unlikely(prev == LIST_POISON2)) {
94509 + printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94510 + entry, LIST_POISON2);
94511 + BUG();
94512 + return false;
94513 + }
94514 + if (unlikely(entry->prev->next != entry)) {
94515 + printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94516 + "but was %p\n", entry, prev->next);
94517 + BUG();
94518 + return false;
94519 + }
94520 + if (unlikely(entry->next->prev != entry)) {
94521 + printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94522 + "but was %p\n", entry, next->prev);
94523 + BUG();
94524 + return false;
94525 + }
94526 + return true;
94527 +}
94528 +
94529 +void __list_del_entry(struct list_head *entry)
94530 +{
94531 + if (!__list_del_entry_debug(entry))
94532 return;
94533
94534 - __list_del(prev, next);
94535 + __list_del(entry->prev, entry->next);
94536 }
94537 EXPORT_SYMBOL(__list_del_entry);
94538
94539 @@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94540 void __list_add_rcu(struct list_head *new,
94541 struct list_head *prev, struct list_head *next)
94542 {
94543 - WARN(next->prev != prev,
94544 - "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94545 - prev, next->prev, next);
94546 - WARN(prev->next != next,
94547 - "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94548 - next, prev->next, prev);
94549 + if (!__list_add_debug(new, prev, next))
94550 + return;
94551 +
94552 new->next = next;
94553 new->prev = prev;
94554 rcu_assign_pointer(list_next_rcu(prev), new);
94555 next->prev = new;
94556 }
94557 EXPORT_SYMBOL(__list_add_rcu);
94558 +#endif
94559 +
94560 +void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94561 +{
94562 +#ifdef CONFIG_DEBUG_LIST
94563 + if (!__list_add_debug(new, prev, next))
94564 + return;
94565 +#endif
94566 +
94567 + pax_open_kernel();
94568 + next->prev = new;
94569 + new->next = next;
94570 + new->prev = prev;
94571 + prev->next = new;
94572 + pax_close_kernel();
94573 +}
94574 +EXPORT_SYMBOL(__pax_list_add);
94575 +
94576 +void pax_list_del(struct list_head *entry)
94577 +{
94578 +#ifdef CONFIG_DEBUG_LIST
94579 + if (!__list_del_entry_debug(entry))
94580 + return;
94581 +#endif
94582 +
94583 + pax_open_kernel();
94584 + __list_del(entry->prev, entry->next);
94585 + entry->next = LIST_POISON1;
94586 + entry->prev = LIST_POISON2;
94587 + pax_close_kernel();
94588 +}
94589 +EXPORT_SYMBOL(pax_list_del);
94590 +
94591 +void pax_list_del_init(struct list_head *entry)
94592 +{
94593 + pax_open_kernel();
94594 + __list_del(entry->prev, entry->next);
94595 + INIT_LIST_HEAD(entry);
94596 + pax_close_kernel();
94597 +}
94598 +EXPORT_SYMBOL(pax_list_del_init);
94599 +
94600 +void __pax_list_add_rcu(struct list_head *new,
94601 + struct list_head *prev, struct list_head *next)
94602 +{
94603 +#ifdef CONFIG_DEBUG_LIST
94604 + if (!__list_add_debug(new, prev, next))
94605 + return;
94606 +#endif
94607 +
94608 + pax_open_kernel();
94609 + new->next = next;
94610 + new->prev = prev;
94611 + rcu_assign_pointer(list_next_rcu(prev), new);
94612 + next->prev = new;
94613 + pax_close_kernel();
94614 +}
94615 +EXPORT_SYMBOL(__pax_list_add_rcu);
94616 +
94617 +void pax_list_del_rcu(struct list_head *entry)
94618 +{
94619 +#ifdef CONFIG_DEBUG_LIST
94620 + if (!__list_del_entry_debug(entry))
94621 + return;
94622 +#endif
94623 +
94624 + pax_open_kernel();
94625 + __list_del(entry->prev, entry->next);
94626 + entry->next = LIST_POISON1;
94627 + entry->prev = LIST_POISON2;
94628 + pax_close_kernel();
94629 +}
94630 +EXPORT_SYMBOL(pax_list_del_rcu);
94631 diff --git a/lib/lockref.c b/lib/lockref.c
94632 index d2233de..fa1a2f6 100644
94633 --- a/lib/lockref.c
94634 +++ b/lib/lockref.c
94635 @@ -48,13 +48,13 @@
94636 void lockref_get(struct lockref *lockref)
94637 {
94638 CMPXCHG_LOOP(
94639 - new.count++;
94640 + __lockref_inc(&new);
94641 ,
94642 return;
94643 );
94644
94645 spin_lock(&lockref->lock);
94646 - lockref->count++;
94647 + __lockref_inc(lockref);
94648 spin_unlock(&lockref->lock);
94649 }
94650 EXPORT_SYMBOL(lockref_get);
94651 @@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94652 int retval;
94653
94654 CMPXCHG_LOOP(
94655 - new.count++;
94656 + __lockref_inc(&new);
94657 if (!old.count)
94658 return 0;
94659 ,
94660 @@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94661 spin_lock(&lockref->lock);
94662 retval = 0;
94663 if (lockref->count) {
94664 - lockref->count++;
94665 + __lockref_inc(lockref);
94666 retval = 1;
94667 }
94668 spin_unlock(&lockref->lock);
94669 @@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94670 int lockref_get_or_lock(struct lockref *lockref)
94671 {
94672 CMPXCHG_LOOP(
94673 - new.count++;
94674 + __lockref_inc(&new);
94675 if (!old.count)
94676 break;
94677 ,
94678 @@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94679 spin_lock(&lockref->lock);
94680 if (!lockref->count)
94681 return 0;
94682 - lockref->count++;
94683 + __lockref_inc(lockref);
94684 spin_unlock(&lockref->lock);
94685 return 1;
94686 }
94687 @@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94688 int lockref_put_or_lock(struct lockref *lockref)
94689 {
94690 CMPXCHG_LOOP(
94691 - new.count--;
94692 + __lockref_dec(&new);
94693 if (old.count <= 1)
94694 break;
94695 ,
94696 @@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94697 spin_lock(&lockref->lock);
94698 if (lockref->count <= 1)
94699 return 0;
94700 - lockref->count--;
94701 + __lockref_dec(lockref);
94702 spin_unlock(&lockref->lock);
94703 return 1;
94704 }
94705 @@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94706 int retval;
94707
94708 CMPXCHG_LOOP(
94709 - new.count++;
94710 + __lockref_inc(&new);
94711 if ((int)old.count < 0)
94712 return 0;
94713 ,
94714 @@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94715 spin_lock(&lockref->lock);
94716 retval = 0;
94717 if ((int) lockref->count >= 0) {
94718 - lockref->count++;
94719 + __lockref_inc(lockref);
94720 retval = 1;
94721 }
94722 spin_unlock(&lockref->lock);
94723 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94724 index 6111bcb..02e816b 100644
94725 --- a/lib/percpu-refcount.c
94726 +++ b/lib/percpu-refcount.c
94727 @@ -31,7 +31,7 @@
94728 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94729 */
94730
94731 -#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
94732 +#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
94733
94734 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
94735
94736 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
94737 index 3291a8e..346a91e 100644
94738 --- a/lib/radix-tree.c
94739 +++ b/lib/radix-tree.c
94740 @@ -67,7 +67,7 @@ struct radix_tree_preload {
94741 int nr;
94742 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
94743 };
94744 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
94745 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
94746
94747 static inline void *ptr_to_indirect(void *ptr)
94748 {
94749 diff --git a/lib/random32.c b/lib/random32.c
94750 index 0bee183..526f12f 100644
94751 --- a/lib/random32.c
94752 +++ b/lib/random32.c
94753 @@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
94754 }
94755 #endif
94756
94757 -static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
94758 +static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
94759
94760 /**
94761 * prandom_u32_state - seeded pseudo-random number generator.
94762 diff --git a/lib/rbtree.c b/lib/rbtree.c
94763 index c16c81a..4dcbda1 100644
94764 --- a/lib/rbtree.c
94765 +++ b/lib/rbtree.c
94766 @@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
94767 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
94768
94769 static const struct rb_augment_callbacks dummy_callbacks = {
94770 - dummy_propagate, dummy_copy, dummy_rotate
94771 + .propagate = dummy_propagate,
94772 + .copy = dummy_copy,
94773 + .rotate = dummy_rotate
94774 };
94775
94776 void rb_insert_color(struct rb_node *node, struct rb_root *root)
94777 diff --git a/lib/show_mem.c b/lib/show_mem.c
94778 index 5e25627..3ed9d7f 100644
94779 --- a/lib/show_mem.c
94780 +++ b/lib/show_mem.c
94781 @@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
94782 quicklist_total_size());
94783 #endif
94784 #ifdef CONFIG_MEMORY_FAILURE
94785 - printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
94786 + printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
94787 #endif
94788 }
94789 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
94790 index bb2b201..46abaf9 100644
94791 --- a/lib/strncpy_from_user.c
94792 +++ b/lib/strncpy_from_user.c
94793 @@ -21,7 +21,7 @@
94794 */
94795 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
94796 {
94797 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94798 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94799 long res = 0;
94800
94801 /*
94802 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
94803 index a28df52..3d55877 100644
94804 --- a/lib/strnlen_user.c
94805 +++ b/lib/strnlen_user.c
94806 @@ -26,7 +26,7 @@
94807 */
94808 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
94809 {
94810 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94811 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94812 long align, res = 0;
94813 unsigned long c;
94814
94815 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
94816 index 4abda07..b9d3765 100644
94817 --- a/lib/swiotlb.c
94818 +++ b/lib/swiotlb.c
94819 @@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
94820
94821 void
94822 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
94823 - dma_addr_t dev_addr)
94824 + dma_addr_t dev_addr, struct dma_attrs *attrs)
94825 {
94826 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
94827
94828 diff --git a/lib/usercopy.c b/lib/usercopy.c
94829 index 4f5b1dd..7cab418 100644
94830 --- a/lib/usercopy.c
94831 +++ b/lib/usercopy.c
94832 @@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
94833 WARN(1, "Buffer overflow detected!\n");
94834 }
94835 EXPORT_SYMBOL(copy_from_user_overflow);
94836 +
94837 +void copy_to_user_overflow(void)
94838 +{
94839 + WARN(1, "Buffer overflow detected!\n");
94840 +}
94841 +EXPORT_SYMBOL(copy_to_user_overflow);
94842 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
94843 index ec337f6..8484eb2 100644
94844 --- a/lib/vsprintf.c
94845 +++ b/lib/vsprintf.c
94846 @@ -16,6 +16,9 @@
94847 * - scnprintf and vscnprintf
94848 */
94849
94850 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94851 +#define __INCLUDED_BY_HIDESYM 1
94852 +#endif
94853 #include <stdarg.h>
94854 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
94855 #include <linux/types.h>
94856 @@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
94857 #ifdef CONFIG_KALLSYMS
94858 if (*fmt == 'B')
94859 sprint_backtrace(sym, value);
94860 - else if (*fmt != 'f' && *fmt != 's')
94861 + else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
94862 sprint_symbol(sym, value);
94863 else
94864 sprint_symbol_no_offset(sym, value);
94865 @@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
94866 return number(buf, end, num, spec);
94867 }
94868
94869 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94870 +int kptr_restrict __read_mostly = 2;
94871 +#else
94872 int kptr_restrict __read_mostly;
94873 +#endif
94874
94875 /*
94876 * Show a '%p' thing. A kernel extension is that the '%p' is followed
94877 @@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
94878 *
94879 * - 'F' For symbolic function descriptor pointers with offset
94880 * - 'f' For simple symbolic function names without offset
94881 + * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
94882 * - 'S' For symbolic direct pointers with offset
94883 * - 's' For symbolic direct pointers without offset
94884 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
94885 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
94886 * - 'B' For backtraced symbolic direct pointers with offset
94887 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
94888 @@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94889
94890 if (!ptr && *fmt != 'K') {
94891 /*
94892 - * Print (null) with the same width as a pointer so it makes
94893 + * Print (nil) with the same width as a pointer so it makes
94894 * tabular output look nice.
94895 */
94896 if (spec.field_width == -1)
94897 spec.field_width = default_width;
94898 - return string(buf, end, "(null)", spec);
94899 + return string(buf, end, "(nil)", spec);
94900 }
94901
94902 switch (*fmt) {
94903 @@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94904 /* Fallthrough */
94905 case 'S':
94906 case 's':
94907 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94908 + break;
94909 +#else
94910 + return symbol_string(buf, end, ptr, spec, fmt);
94911 +#endif
94912 + case 'X':
94913 + ptr = dereference_function_descriptor(ptr);
94914 + case 'A':
94915 case 'B':
94916 return symbol_string(buf, end, ptr, spec, fmt);
94917 case 'R':
94918 @@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94919 va_end(va);
94920 return buf;
94921 }
94922 + case 'P':
94923 + break;
94924 case 'K':
94925 /*
94926 * %pK cannot be used in IRQ context because its test
94927 @@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94928 ((const struct file *)ptr)->f_path.dentry,
94929 spec, fmt);
94930 }
94931 +
94932 +#ifdef CONFIG_GRKERNSEC_HIDESYM
94933 + /* 'P' = approved pointers to copy to userland,
94934 + as in the /proc/kallsyms case, as we make it display nothing
94935 + for non-root users, and the real contents for root users
94936 + 'X' = approved simple symbols
94937 + Also ignore 'K' pointers, since we force their NULLing for non-root users
94938 + above
94939 + */
94940 + if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
94941 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
94942 + dump_stack();
94943 + ptr = NULL;
94944 + }
94945 +#endif
94946 +
94947 spec.flags |= SMALL;
94948 if (spec.field_width == -1) {
94949 spec.field_width = default_width;
94950 @@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94951 typeof(type) value; \
94952 if (sizeof(type) == 8) { \
94953 args = PTR_ALIGN(args, sizeof(u32)); \
94954 - *(u32 *)&value = *(u32 *)args; \
94955 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
94956 + *(u32 *)&value = *(const u32 *)args; \
94957 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
94958 } else { \
94959 args = PTR_ALIGN(args, sizeof(type)); \
94960 - value = *(typeof(type) *)args; \
94961 + value = *(const typeof(type) *)args; \
94962 } \
94963 args += sizeof(type); \
94964 value; \
94965 @@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94966 case FORMAT_TYPE_STR: {
94967 const char *str_arg = args;
94968 args += strlen(str_arg) + 1;
94969 - str = string(str, end, (char *)str_arg, spec);
94970 + str = string(str, end, str_arg, spec);
94971 break;
94972 }
94973
94974 diff --git a/localversion-grsec b/localversion-grsec
94975 new file mode 100644
94976 index 0000000..7cd6065
94977 --- /dev/null
94978 +++ b/localversion-grsec
94979 @@ -0,0 +1 @@
94980 +-grsec
94981 diff --git a/mm/Kconfig b/mm/Kconfig
94982 index 1d1ae6b..0f05885 100644
94983 --- a/mm/Kconfig
94984 +++ b/mm/Kconfig
94985 @@ -341,10 +341,11 @@ config KSM
94986 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
94987
94988 config DEFAULT_MMAP_MIN_ADDR
94989 - int "Low address space to protect from user allocation"
94990 + int "Low address space to protect from user allocation"
94991 depends on MMU
94992 - default 4096
94993 - help
94994 + default 32768 if ALPHA || ARM || PARISC || SPARC32
94995 + default 65536
94996 + help
94997 This is the portion of low virtual memory which should be protected
94998 from userspace allocation. Keeping a user from writing to low pages
94999 can help reduce the impact of kernel NULL pointer bugs.
95000 @@ -375,7 +376,7 @@ config MEMORY_FAILURE
95001
95002 config HWPOISON_INJECT
95003 tristate "HWPoison pages injector"
95004 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
95005 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
95006 select PROC_PAGE_MONITOR
95007
95008 config NOMMU_INITIAL_TRIM_EXCESS
95009 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
95010 index 0ae0df5..82ac56b 100644
95011 --- a/mm/backing-dev.c
95012 +++ b/mm/backing-dev.c
95013 @@ -12,7 +12,7 @@
95014 #include <linux/device.h>
95015 #include <trace/events/writeback.h>
95016
95017 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
95018 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
95019
95020 struct backing_dev_info default_backing_dev_info = {
95021 .name = "default",
95022 @@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
95023 return err;
95024
95025 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
95026 - atomic_long_inc_return(&bdi_seq));
95027 + atomic_long_inc_return_unchecked(&bdi_seq));
95028 if (err) {
95029 bdi_destroy(bdi);
95030 return err;
95031 diff --git a/mm/filemap.c b/mm/filemap.c
95032 index 14b4642..d71ba82 100644
95033 --- a/mm/filemap.c
95034 +++ b/mm/filemap.c
95035 @@ -2101,7 +2101,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
95036 struct address_space *mapping = file->f_mapping;
95037
95038 if (!mapping->a_ops->readpage)
95039 - return -ENOEXEC;
95040 + return -ENODEV;
95041 file_accessed(file);
95042 vma->vm_ops = &generic_file_vm_ops;
95043 return 0;
95044 @@ -2279,6 +2279,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
95045 *pos = i_size_read(inode);
95046
95047 if (limit != RLIM_INFINITY) {
95048 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
95049 if (*pos >= limit) {
95050 send_sig(SIGXFSZ, current, 0);
95051 return -EFBIG;
95052 diff --git a/mm/fremap.c b/mm/fremap.c
95053 index 72b8fa3..c5b39f1 100644
95054 --- a/mm/fremap.c
95055 +++ b/mm/fremap.c
95056 @@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
95057 retry:
95058 vma = find_vma(mm, start);
95059
95060 +#ifdef CONFIG_PAX_SEGMEXEC
95061 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
95062 + goto out;
95063 +#endif
95064 +
95065 /*
95066 * Make sure the vma is shared, that it supports prefaulting,
95067 * and that the remapped range is valid and fully within
95068 diff --git a/mm/gup.c b/mm/gup.c
95069 index cd62c8c..3bb2053 100644
95070 --- a/mm/gup.c
95071 +++ b/mm/gup.c
95072 @@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
95073 unsigned int fault_flags = 0;
95074 int ret;
95075
95076 - /* For mlock, just skip the stack guard page. */
95077 - if ((*flags & FOLL_MLOCK) &&
95078 - (stack_guard_page_start(vma, address) ||
95079 - stack_guard_page_end(vma, address + PAGE_SIZE)))
95080 - return -ENOENT;
95081 if (*flags & FOLL_WRITE)
95082 fault_flags |= FAULT_FLAG_WRITE;
95083 if (nonblocking)
95084 @@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
95085 if (!(gup_flags & FOLL_FORCE))
95086 gup_flags |= FOLL_NUMA;
95087
95088 - do {
95089 + while (nr_pages) {
95090 struct page *page;
95091 unsigned int foll_flags = gup_flags;
95092 unsigned int page_increm;
95093
95094 /* first iteration or cross vma bound */
95095 if (!vma || start >= vma->vm_end) {
95096 - vma = find_extend_vma(mm, start);
95097 + vma = find_vma(mm, start);
95098 if (!vma && in_gate_area(mm, start)) {
95099 int ret;
95100 ret = get_gate_page(mm, start & PAGE_MASK,
95101 @@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
95102 goto next_page;
95103 }
95104
95105 - if (!vma || check_vma_flags(vma, gup_flags))
95106 + if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
95107 return i ? : -EFAULT;
95108 if (is_vm_hugetlb_page(vma)) {
95109 i = follow_hugetlb_page(mm, vma, pages, vmas,
95110 @@ -518,7 +513,7 @@ next_page:
95111 i += page_increm;
95112 start += page_increm * PAGE_SIZE;
95113 nr_pages -= page_increm;
95114 - } while (nr_pages);
95115 + }
95116 return i;
95117 }
95118 EXPORT_SYMBOL(__get_user_pages);
95119 diff --git a/mm/highmem.c b/mm/highmem.c
95120 index 123bcd3..0de52ba 100644
95121 --- a/mm/highmem.c
95122 +++ b/mm/highmem.c
95123 @@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
95124 * So no dangers, even with speculative execution.
95125 */
95126 page = pte_page(pkmap_page_table[i]);
95127 + pax_open_kernel();
95128 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
95129 -
95130 + pax_close_kernel();
95131 set_page_address(page, NULL);
95132 need_flush = 1;
95133 }
95134 @@ -259,9 +260,11 @@ start:
95135 }
95136 }
95137 vaddr = PKMAP_ADDR(last_pkmap_nr);
95138 +
95139 + pax_open_kernel();
95140 set_pte_at(&init_mm, vaddr,
95141 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
95142 -
95143 + pax_close_kernel();
95144 pkmap_count[last_pkmap_nr] = 1;
95145 set_page_address(page, (void *)vaddr);
95146
95147 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
95148 index 9fd7227..5628939 100644
95149 --- a/mm/hugetlb.c
95150 +++ b/mm/hugetlb.c
95151 @@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95152 struct ctl_table *table, int write,
95153 void __user *buffer, size_t *length, loff_t *ppos)
95154 {
95155 + ctl_table_no_const t;
95156 struct hstate *h = &default_hstate;
95157 unsigned long tmp = h->max_huge_pages;
95158 int ret;
95159 @@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95160 if (!hugepages_supported())
95161 return -ENOTSUPP;
95162
95163 - table->data = &tmp;
95164 - table->maxlen = sizeof(unsigned long);
95165 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95166 + t = *table;
95167 + t.data = &tmp;
95168 + t.maxlen = sizeof(unsigned long);
95169 + ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
95170 if (ret)
95171 goto out;
95172
95173 @@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95174 struct hstate *h = &default_hstate;
95175 unsigned long tmp;
95176 int ret;
95177 + ctl_table_no_const hugetlb_table;
95178
95179 if (!hugepages_supported())
95180 return -ENOTSUPP;
95181 @@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95182 if (write && hstate_is_gigantic(h))
95183 return -EINVAL;
95184
95185 - table->data = &tmp;
95186 - table->maxlen = sizeof(unsigned long);
95187 - ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95188 + hugetlb_table = *table;
95189 + hugetlb_table.data = &tmp;
95190 + hugetlb_table.maxlen = sizeof(unsigned long);
95191 + ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
95192 if (ret)
95193 goto out;
95194
95195 @@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
95196 mutex_unlock(&mapping->i_mmap_mutex);
95197 }
95198
95199 +#ifdef CONFIG_PAX_SEGMEXEC
95200 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
95201 +{
95202 + struct mm_struct *mm = vma->vm_mm;
95203 + struct vm_area_struct *vma_m;
95204 + unsigned long address_m;
95205 + pte_t *ptep_m;
95206 +
95207 + vma_m = pax_find_mirror_vma(vma);
95208 + if (!vma_m)
95209 + return;
95210 +
95211 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95212 + address_m = address + SEGMEXEC_TASK_SIZE;
95213 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
95214 + get_page(page_m);
95215 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
95216 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
95217 +}
95218 +#endif
95219 +
95220 /*
95221 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95222 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95223 @@ -2903,6 +2928,11 @@ retry_avoidcopy:
95224 make_huge_pte(vma, new_page, 1));
95225 page_remove_rmap(old_page);
95226 hugepage_add_new_anon_rmap(new_page, vma, address);
95227 +
95228 +#ifdef CONFIG_PAX_SEGMEXEC
95229 + pax_mirror_huge_pte(vma, address, new_page);
95230 +#endif
95231 +
95232 /* Make the old page be freed below */
95233 new_page = old_page;
95234 }
95235 @@ -3063,6 +3093,10 @@ retry:
95236 && (vma->vm_flags & VM_SHARED)));
95237 set_huge_pte_at(mm, address, ptep, new_pte);
95238
95239 +#ifdef CONFIG_PAX_SEGMEXEC
95240 + pax_mirror_huge_pte(vma, address, page);
95241 +#endif
95242 +
95243 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95244 /* Optimization, do the COW without a second fault */
95245 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95246 @@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95247 struct hstate *h = hstate_vma(vma);
95248 struct address_space *mapping;
95249
95250 +#ifdef CONFIG_PAX_SEGMEXEC
95251 + struct vm_area_struct *vma_m;
95252 +#endif
95253 +
95254 address &= huge_page_mask(h);
95255
95256 ptep = huge_pte_offset(mm, address);
95257 @@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95258 VM_FAULT_SET_HINDEX(hstate_index(h));
95259 }
95260
95261 +#ifdef CONFIG_PAX_SEGMEXEC
95262 + vma_m = pax_find_mirror_vma(vma);
95263 + if (vma_m) {
95264 + unsigned long address_m;
95265 +
95266 + if (vma->vm_start > vma_m->vm_start) {
95267 + address_m = address;
95268 + address -= SEGMEXEC_TASK_SIZE;
95269 + vma = vma_m;
95270 + h = hstate_vma(vma);
95271 + } else
95272 + address_m = address + SEGMEXEC_TASK_SIZE;
95273 +
95274 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95275 + return VM_FAULT_OOM;
95276 + address_m &= HPAGE_MASK;
95277 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95278 + }
95279 +#endif
95280 +
95281 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95282 if (!ptep)
95283 return VM_FAULT_OOM;
95284 diff --git a/mm/internal.h b/mm/internal.h
95285 index a4f90ba..fbdc32b 100644
95286 --- a/mm/internal.h
95287 +++ b/mm/internal.h
95288 @@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95289
95290 extern int __isolate_free_page(struct page *page, unsigned int order);
95291 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95292 +extern void free_compound_page(struct page *page);
95293 extern void prep_compound_page(struct page *page, unsigned long order);
95294 #ifdef CONFIG_MEMORY_FAILURE
95295 extern bool is_free_buddy_page(struct page *page);
95296 @@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95297
95298 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95299 unsigned long, unsigned long,
95300 - unsigned long, unsigned long);
95301 + unsigned long, unsigned long) __intentional_overflow(-1);
95302
95303 extern void set_pageblock_order(void);
95304 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95305 diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95306 index e34a3cb..a810efe 100644
95307 --- a/mm/iov_iter.c
95308 +++ b/mm/iov_iter.c
95309 @@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95310
95311 while (bytes) {
95312 char __user *buf = iov->iov_base + base;
95313 - int copy = min(bytes, iov->iov_len - base);
95314 + size_t copy = min(bytes, iov->iov_len - base);
95315
95316 base = 0;
95317 left = __copy_from_user_inatomic(vaddr, buf, copy);
95318 @@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95319
95320 kaddr = kmap_atomic(page);
95321 if (likely(i->nr_segs == 1)) {
95322 - int left;
95323 + size_t left;
95324 char __user *buf = i->iov->iov_base + i->iov_offset;
95325 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95326 copied = bytes - left;
95327 @@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95328 * zero-length segments (without overruning the iovec).
95329 */
95330 while (bytes || unlikely(i->count && !iov->iov_len)) {
95331 - int copy;
95332 + size_t copy;
95333
95334 copy = min(bytes, iov->iov_len - base);
95335 BUG_ON(!i->count || i->count < copy);
95336 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95337 index 3cda50c..032ba634 100644
95338 --- a/mm/kmemleak.c
95339 +++ b/mm/kmemleak.c
95340 @@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95341
95342 for (i = 0; i < object->trace_len; i++) {
95343 void *ptr = (void *)object->trace[i];
95344 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95345 + seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95346 }
95347 }
95348
95349 @@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95350 return -ENOMEM;
95351 }
95352
95353 - dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95354 + dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95355 &kmemleak_fops);
95356 if (!dentry)
95357 pr_warning("Failed to create the debugfs kmemleak file\n");
95358 diff --git a/mm/maccess.c b/mm/maccess.c
95359 index d53adf9..03a24bf 100644
95360 --- a/mm/maccess.c
95361 +++ b/mm/maccess.c
95362 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95363 set_fs(KERNEL_DS);
95364 pagefault_disable();
95365 ret = __copy_from_user_inatomic(dst,
95366 - (__force const void __user *)src, size);
95367 + (const void __force_user *)src, size);
95368 pagefault_enable();
95369 set_fs(old_fs);
95370
95371 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95372
95373 set_fs(KERNEL_DS);
95374 pagefault_disable();
95375 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95376 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95377 pagefault_enable();
95378 set_fs(old_fs);
95379
95380 diff --git a/mm/madvise.c b/mm/madvise.c
95381 index 0938b30..199abe8 100644
95382 --- a/mm/madvise.c
95383 +++ b/mm/madvise.c
95384 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95385 pgoff_t pgoff;
95386 unsigned long new_flags = vma->vm_flags;
95387
95388 +#ifdef CONFIG_PAX_SEGMEXEC
95389 + struct vm_area_struct *vma_m;
95390 +#endif
95391 +
95392 switch (behavior) {
95393 case MADV_NORMAL:
95394 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95395 @@ -126,6 +130,13 @@ success:
95396 /*
95397 * vm_flags is protected by the mmap_sem held in write mode.
95398 */
95399 +
95400 +#ifdef CONFIG_PAX_SEGMEXEC
95401 + vma_m = pax_find_mirror_vma(vma);
95402 + if (vma_m)
95403 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95404 +#endif
95405 +
95406 vma->vm_flags = new_flags;
95407
95408 out:
95409 @@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95410 struct vm_area_struct **prev,
95411 unsigned long start, unsigned long end)
95412 {
95413 +
95414 +#ifdef CONFIG_PAX_SEGMEXEC
95415 + struct vm_area_struct *vma_m;
95416 +#endif
95417 +
95418 *prev = vma;
95419 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95420 return -EINVAL;
95421 @@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95422 zap_page_range(vma, start, end - start, &details);
95423 } else
95424 zap_page_range(vma, start, end - start, NULL);
95425 +
95426 +#ifdef CONFIG_PAX_SEGMEXEC
95427 + vma_m = pax_find_mirror_vma(vma);
95428 + if (vma_m) {
95429 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95430 + struct zap_details details = {
95431 + .nonlinear_vma = vma_m,
95432 + .last_index = ULONG_MAX,
95433 + };
95434 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95435 + } else
95436 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95437 + }
95438 +#endif
95439 +
95440 return 0;
95441 }
95442
95443 @@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95444 if (end < start)
95445 return error;
95446
95447 +#ifdef CONFIG_PAX_SEGMEXEC
95448 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95449 + if (end > SEGMEXEC_TASK_SIZE)
95450 + return error;
95451 + } else
95452 +#endif
95453 +
95454 + if (end > TASK_SIZE)
95455 + return error;
95456 +
95457 error = 0;
95458 if (end == start)
95459 return error;
95460 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95461 index 8639f6b..b623882a 100644
95462 --- a/mm/memory-failure.c
95463 +++ b/mm/memory-failure.c
95464 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95465
95466 int sysctl_memory_failure_recovery __read_mostly = 1;
95467
95468 -atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95469 +atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95470
95471 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95472
95473 @@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95474 pfn, t->comm, t->pid);
95475 si.si_signo = SIGBUS;
95476 si.si_errno = 0;
95477 - si.si_addr = (void *)addr;
95478 + si.si_addr = (void __user *)addr;
95479 #ifdef __ARCH_SI_TRAPNO
95480 si.si_trapno = trapno;
95481 #endif
95482 @@ -791,7 +791,7 @@ static struct page_state {
95483 unsigned long res;
95484 char *msg;
95485 int (*action)(struct page *p, unsigned long pfn);
95486 -} error_states[] = {
95487 +} __do_const error_states[] = {
95488 { reserved, reserved, "reserved kernel", me_kernel },
95489 /*
95490 * free pages are specially detected outside this table:
95491 @@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95492 nr_pages = 1 << compound_order(hpage);
95493 else /* normal page or thp */
95494 nr_pages = 1;
95495 - atomic_long_add(nr_pages, &num_poisoned_pages);
95496 + atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95497
95498 /*
95499 * We need/can do nothing about count=0 pages.
95500 @@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95501 if (PageHWPoison(hpage)) {
95502 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95503 || (p != hpage && TestSetPageHWPoison(hpage))) {
95504 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95505 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95506 unlock_page(hpage);
95507 return 0;
95508 }
95509 @@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95510 */
95511 if (!PageHWPoison(p)) {
95512 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95513 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95514 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95515 put_page(hpage);
95516 res = 0;
95517 goto out;
95518 }
95519 if (hwpoison_filter(p)) {
95520 if (TestClearPageHWPoison(p))
95521 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95522 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95523 unlock_page(hpage);
95524 put_page(hpage);
95525 return 0;
95526 @@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95527 return 0;
95528 }
95529 if (TestClearPageHWPoison(p))
95530 - atomic_long_dec(&num_poisoned_pages);
95531 + atomic_long_dec_unchecked(&num_poisoned_pages);
95532 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95533 return 0;
95534 }
95535 @@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95536 */
95537 if (TestClearPageHWPoison(page)) {
95538 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95539 - atomic_long_sub(nr_pages, &num_poisoned_pages);
95540 + atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95541 freeit = 1;
95542 if (PageHuge(page))
95543 clear_page_hwpoison_huge_page(page);
95544 @@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95545 if (PageHuge(page)) {
95546 set_page_hwpoison_huge_page(hpage);
95547 dequeue_hwpoisoned_huge_page(hpage);
95548 - atomic_long_add(1 << compound_order(hpage),
95549 + atomic_long_add_unchecked(1 << compound_order(hpage),
95550 &num_poisoned_pages);
95551 } else {
95552 SetPageHWPoison(page);
95553 - atomic_long_inc(&num_poisoned_pages);
95554 + atomic_long_inc_unchecked(&num_poisoned_pages);
95555 }
95556 }
95557 return ret;
95558 @@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95559 put_page(page);
95560 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95561 SetPageHWPoison(page);
95562 - atomic_long_inc(&num_poisoned_pages);
95563 + atomic_long_inc_unchecked(&num_poisoned_pages);
95564 return 0;
95565 }
95566
95567 @@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95568 if (!is_free_buddy_page(page))
95569 pr_info("soft offline: %#lx: page leaked\n",
95570 pfn);
95571 - atomic_long_inc(&num_poisoned_pages);
95572 + atomic_long_inc_unchecked(&num_poisoned_pages);
95573 }
95574 } else {
95575 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95576 @@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95577 if (PageHuge(page)) {
95578 set_page_hwpoison_huge_page(hpage);
95579 dequeue_hwpoisoned_huge_page(hpage);
95580 - atomic_long_add(1 << compound_order(hpage),
95581 + atomic_long_add_unchecked(1 << compound_order(hpage),
95582 &num_poisoned_pages);
95583 } else {
95584 SetPageHWPoison(page);
95585 - atomic_long_inc(&num_poisoned_pages);
95586 + atomic_long_inc_unchecked(&num_poisoned_pages);
95587 }
95588 }
95589 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95590 diff --git a/mm/memory.c b/mm/memory.c
95591 index 7f86cf6..0600e22 100644
95592 --- a/mm/memory.c
95593 +++ b/mm/memory.c
95594 @@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95595 free_pte_range(tlb, pmd, addr);
95596 } while (pmd++, addr = next, addr != end);
95597
95598 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95599 start &= PUD_MASK;
95600 if (start < floor)
95601 return;
95602 @@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95603 pmd = pmd_offset(pud, start);
95604 pud_clear(pud);
95605 pmd_free_tlb(tlb, pmd, start);
95606 +#endif
95607 +
95608 }
95609
95610 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95611 @@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95612 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95613 } while (pud++, addr = next, addr != end);
95614
95615 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95616 start &= PGDIR_MASK;
95617 if (start < floor)
95618 return;
95619 @@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95620 pud = pud_offset(pgd, start);
95621 pgd_clear(pgd);
95622 pud_free_tlb(tlb, pud, start);
95623 +#endif
95624 +
95625 }
95626
95627 /*
95628 @@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95629 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95630 */
95631 if (vma->vm_ops)
95632 - printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95633 + printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95634 vma->vm_ops->fault);
95635 if (vma->vm_file)
95636 - printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95637 + printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95638 vma->vm_file->f_op->mmap);
95639 dump_stack();
95640 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95641 @@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95642 page_add_file_rmap(page);
95643 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95644
95645 +#ifdef CONFIG_PAX_SEGMEXEC
95646 + pax_mirror_file_pte(vma, addr, page, ptl);
95647 +#endif
95648 +
95649 retval = 0;
95650 pte_unmap_unlock(pte, ptl);
95651 return retval;
95652 @@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95653 if (!page_count(page))
95654 return -EINVAL;
95655 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95656 +
95657 +#ifdef CONFIG_PAX_SEGMEXEC
95658 + struct vm_area_struct *vma_m;
95659 +#endif
95660 +
95661 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95662 BUG_ON(vma->vm_flags & VM_PFNMAP);
95663 vma->vm_flags |= VM_MIXEDMAP;
95664 +
95665 +#ifdef CONFIG_PAX_SEGMEXEC
95666 + vma_m = pax_find_mirror_vma(vma);
95667 + if (vma_m)
95668 + vma_m->vm_flags |= VM_MIXEDMAP;
95669 +#endif
95670 +
95671 }
95672 return insert_page(vma, addr, page, vma->vm_page_prot);
95673 }
95674 @@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95675 unsigned long pfn)
95676 {
95677 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95678 + BUG_ON(vma->vm_mirror);
95679
95680 if (addr < vma->vm_start || addr >= vma->vm_end)
95681 return -EFAULT;
95682 @@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95683
95684 BUG_ON(pud_huge(*pud));
95685
95686 - pmd = pmd_alloc(mm, pud, addr);
95687 + pmd = (mm == &init_mm) ?
95688 + pmd_alloc_kernel(mm, pud, addr) :
95689 + pmd_alloc(mm, pud, addr);
95690 if (!pmd)
95691 return -ENOMEM;
95692 do {
95693 @@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95694 unsigned long next;
95695 int err;
95696
95697 - pud = pud_alloc(mm, pgd, addr);
95698 + pud = (mm == &init_mm) ?
95699 + pud_alloc_kernel(mm, pgd, addr) :
95700 + pud_alloc(mm, pgd, addr);
95701 if (!pud)
95702 return -ENOMEM;
95703 do {
95704 @@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95705 return ret;
95706 }
95707
95708 +#ifdef CONFIG_PAX_SEGMEXEC
95709 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95710 +{
95711 + struct mm_struct *mm = vma->vm_mm;
95712 + spinlock_t *ptl;
95713 + pte_t *pte, entry;
95714 +
95715 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95716 + entry = *pte;
95717 + if (!pte_present(entry)) {
95718 + if (!pte_none(entry)) {
95719 + BUG_ON(pte_file(entry));
95720 + free_swap_and_cache(pte_to_swp_entry(entry));
95721 + pte_clear_not_present_full(mm, address, pte, 0);
95722 + }
95723 + } else {
95724 + struct page *page;
95725 +
95726 + flush_cache_page(vma, address, pte_pfn(entry));
95727 + entry = ptep_clear_flush(vma, address, pte);
95728 + BUG_ON(pte_dirty(entry));
95729 + page = vm_normal_page(vma, address, entry);
95730 + if (page) {
95731 + update_hiwater_rss(mm);
95732 + if (PageAnon(page))
95733 + dec_mm_counter_fast(mm, MM_ANONPAGES);
95734 + else
95735 + dec_mm_counter_fast(mm, MM_FILEPAGES);
95736 + page_remove_rmap(page);
95737 + page_cache_release(page);
95738 + }
95739 + }
95740 + pte_unmap_unlock(pte, ptl);
95741 +}
95742 +
95743 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
95744 + *
95745 + * the ptl of the lower mapped page is held on entry and is not released on exit
95746 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
95747 + */
95748 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95749 +{
95750 + struct mm_struct *mm = vma->vm_mm;
95751 + unsigned long address_m;
95752 + spinlock_t *ptl_m;
95753 + struct vm_area_struct *vma_m;
95754 + pmd_t *pmd_m;
95755 + pte_t *pte_m, entry_m;
95756 +
95757 + BUG_ON(!page_m || !PageAnon(page_m));
95758 +
95759 + vma_m = pax_find_mirror_vma(vma);
95760 + if (!vma_m)
95761 + return;
95762 +
95763 + BUG_ON(!PageLocked(page_m));
95764 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95765 + address_m = address + SEGMEXEC_TASK_SIZE;
95766 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95767 + pte_m = pte_offset_map(pmd_m, address_m);
95768 + ptl_m = pte_lockptr(mm, pmd_m);
95769 + if (ptl != ptl_m) {
95770 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95771 + if (!pte_none(*pte_m))
95772 + goto out;
95773 + }
95774 +
95775 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95776 + page_cache_get(page_m);
95777 + page_add_anon_rmap(page_m, vma_m, address_m);
95778 + inc_mm_counter_fast(mm, MM_ANONPAGES);
95779 + set_pte_at(mm, address_m, pte_m, entry_m);
95780 + update_mmu_cache(vma_m, address_m, pte_m);
95781 +out:
95782 + if (ptl != ptl_m)
95783 + spin_unlock(ptl_m);
95784 + pte_unmap(pte_m);
95785 + unlock_page(page_m);
95786 +}
95787 +
95788 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95789 +{
95790 + struct mm_struct *mm = vma->vm_mm;
95791 + unsigned long address_m;
95792 + spinlock_t *ptl_m;
95793 + struct vm_area_struct *vma_m;
95794 + pmd_t *pmd_m;
95795 + pte_t *pte_m, entry_m;
95796 +
95797 + BUG_ON(!page_m || PageAnon(page_m));
95798 +
95799 + vma_m = pax_find_mirror_vma(vma);
95800 + if (!vma_m)
95801 + return;
95802 +
95803 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95804 + address_m = address + SEGMEXEC_TASK_SIZE;
95805 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95806 + pte_m = pte_offset_map(pmd_m, address_m);
95807 + ptl_m = pte_lockptr(mm, pmd_m);
95808 + if (ptl != ptl_m) {
95809 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95810 + if (!pte_none(*pte_m))
95811 + goto out;
95812 + }
95813 +
95814 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95815 + page_cache_get(page_m);
95816 + page_add_file_rmap(page_m);
95817 + inc_mm_counter_fast(mm, MM_FILEPAGES);
95818 + set_pte_at(mm, address_m, pte_m, entry_m);
95819 + update_mmu_cache(vma_m, address_m, pte_m);
95820 +out:
95821 + if (ptl != ptl_m)
95822 + spin_unlock(ptl_m);
95823 + pte_unmap(pte_m);
95824 +}
95825 +
95826 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
95827 +{
95828 + struct mm_struct *mm = vma->vm_mm;
95829 + unsigned long address_m;
95830 + spinlock_t *ptl_m;
95831 + struct vm_area_struct *vma_m;
95832 + pmd_t *pmd_m;
95833 + pte_t *pte_m, entry_m;
95834 +
95835 + vma_m = pax_find_mirror_vma(vma);
95836 + if (!vma_m)
95837 + return;
95838 +
95839 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95840 + address_m = address + SEGMEXEC_TASK_SIZE;
95841 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95842 + pte_m = pte_offset_map(pmd_m, address_m);
95843 + ptl_m = pte_lockptr(mm, pmd_m);
95844 + if (ptl != ptl_m) {
95845 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95846 + if (!pte_none(*pte_m))
95847 + goto out;
95848 + }
95849 +
95850 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
95851 + set_pte_at(mm, address_m, pte_m, entry_m);
95852 +out:
95853 + if (ptl != ptl_m)
95854 + spin_unlock(ptl_m);
95855 + pte_unmap(pte_m);
95856 +}
95857 +
95858 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
95859 +{
95860 + struct page *page_m;
95861 + pte_t entry;
95862 +
95863 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
95864 + goto out;
95865 +
95866 + entry = *pte;
95867 + page_m = vm_normal_page(vma, address, entry);
95868 + if (!page_m)
95869 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
95870 + else if (PageAnon(page_m)) {
95871 + if (pax_find_mirror_vma(vma)) {
95872 + pte_unmap_unlock(pte, ptl);
95873 + lock_page(page_m);
95874 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
95875 + if (pte_same(entry, *pte))
95876 + pax_mirror_anon_pte(vma, address, page_m, ptl);
95877 + else
95878 + unlock_page(page_m);
95879 + }
95880 + } else
95881 + pax_mirror_file_pte(vma, address, page_m, ptl);
95882 +
95883 +out:
95884 + pte_unmap_unlock(pte, ptl);
95885 +}
95886 +#endif
95887 +
95888 /*
95889 * This routine handles present pages, when users try to write
95890 * to a shared page. It is done by copying the page to a new address
95891 @@ -2225,6 +2432,12 @@ gotten:
95892 */
95893 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95894 if (likely(pte_same(*page_table, orig_pte))) {
95895 +
95896 +#ifdef CONFIG_PAX_SEGMEXEC
95897 + if (pax_find_mirror_vma(vma))
95898 + BUG_ON(!trylock_page(new_page));
95899 +#endif
95900 +
95901 if (old_page) {
95902 if (!PageAnon(old_page)) {
95903 dec_mm_counter_fast(mm, MM_FILEPAGES);
95904 @@ -2278,6 +2491,10 @@ gotten:
95905 page_remove_rmap(old_page);
95906 }
95907
95908 +#ifdef CONFIG_PAX_SEGMEXEC
95909 + pax_mirror_anon_pte(vma, address, new_page, ptl);
95910 +#endif
95911 +
95912 /* Free the old page.. */
95913 new_page = old_page;
95914 ret |= VM_FAULT_WRITE;
95915 @@ -2552,6 +2769,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95916 swap_free(entry);
95917 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
95918 try_to_free_swap(page);
95919 +
95920 +#ifdef CONFIG_PAX_SEGMEXEC
95921 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
95922 +#endif
95923 +
95924 unlock_page(page);
95925 if (page != swapcache) {
95926 /*
95927 @@ -2575,6 +2797,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95928
95929 /* No need to invalidate - it was non-present before */
95930 update_mmu_cache(vma, address, page_table);
95931 +
95932 +#ifdef CONFIG_PAX_SEGMEXEC
95933 + pax_mirror_anon_pte(vma, address, page, ptl);
95934 +#endif
95935 +
95936 unlock:
95937 pte_unmap_unlock(page_table, ptl);
95938 out:
95939 @@ -2594,40 +2821,6 @@ out_release:
95940 }
95941
95942 /*
95943 - * This is like a special single-page "expand_{down|up}wards()",
95944 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
95945 - * doesn't hit another vma.
95946 - */
95947 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
95948 -{
95949 - address &= PAGE_MASK;
95950 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
95951 - struct vm_area_struct *prev = vma->vm_prev;
95952 -
95953 - /*
95954 - * Is there a mapping abutting this one below?
95955 - *
95956 - * That's only ok if it's the same stack mapping
95957 - * that has gotten split..
95958 - */
95959 - if (prev && prev->vm_end == address)
95960 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
95961 -
95962 - return expand_downwards(vma, address - PAGE_SIZE);
95963 - }
95964 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
95965 - struct vm_area_struct *next = vma->vm_next;
95966 -
95967 - /* As VM_GROWSDOWN but s/below/above/ */
95968 - if (next && next->vm_start == address + PAGE_SIZE)
95969 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
95970 -
95971 - return expand_upwards(vma, address + PAGE_SIZE);
95972 - }
95973 - return 0;
95974 -}
95975 -
95976 -/*
95977 * We enter with non-exclusive mmap_sem (to exclude vma changes,
95978 * but allow concurrent faults), and pte mapped but not yet locked.
95979 * We return with mmap_sem still held, but pte unmapped and unlocked.
95980 @@ -2637,27 +2830,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95981 unsigned int flags)
95982 {
95983 struct mem_cgroup *memcg;
95984 - struct page *page;
95985 + struct page *page = NULL;
95986 spinlock_t *ptl;
95987 pte_t entry;
95988
95989 - pte_unmap(page_table);
95990 -
95991 - /* Check if we need to add a guard page to the stack */
95992 - if (check_stack_guard_page(vma, address) < 0)
95993 - return VM_FAULT_SIGBUS;
95994 -
95995 - /* Use the zero-page for reads */
95996 if (!(flags & FAULT_FLAG_WRITE)) {
95997 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
95998 vma->vm_page_prot));
95999 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
96000 + ptl = pte_lockptr(mm, pmd);
96001 + spin_lock(ptl);
96002 if (!pte_none(*page_table))
96003 goto unlock;
96004 goto setpte;
96005 }
96006
96007 /* Allocate our own private page. */
96008 + pte_unmap(page_table);
96009 +
96010 if (unlikely(anon_vma_prepare(vma)))
96011 goto oom;
96012 page = alloc_zeroed_user_highpage_movable(vma, address);
96013 @@ -2681,6 +2870,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
96014 if (!pte_none(*page_table))
96015 goto release;
96016
96017 +#ifdef CONFIG_PAX_SEGMEXEC
96018 + if (pax_find_mirror_vma(vma))
96019 + BUG_ON(!trylock_page(page));
96020 +#endif
96021 +
96022 inc_mm_counter_fast(mm, MM_ANONPAGES);
96023 page_add_new_anon_rmap(page, vma, address);
96024 mem_cgroup_commit_charge(page, memcg, false);
96025 @@ -2690,6 +2884,12 @@ setpte:
96026
96027 /* No need to invalidate - it was non-present before */
96028 update_mmu_cache(vma, address, page_table);
96029 +
96030 +#ifdef CONFIG_PAX_SEGMEXEC
96031 + if (page)
96032 + pax_mirror_anon_pte(vma, address, page, ptl);
96033 +#endif
96034 +
96035 unlock:
96036 pte_unmap_unlock(page_table, ptl);
96037 return 0;
96038 @@ -2920,6 +3120,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96039 return ret;
96040 }
96041 do_set_pte(vma, address, fault_page, pte, false, false);
96042 +
96043 +#ifdef CONFIG_PAX_SEGMEXEC
96044 + pax_mirror_file_pte(vma, address, fault_page, ptl);
96045 +#endif
96046 +
96047 unlock_page(fault_page);
96048 unlock_out:
96049 pte_unmap_unlock(pte, ptl);
96050 @@ -2962,7 +3167,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96051 page_cache_release(fault_page);
96052 goto uncharge_out;
96053 }
96054 +
96055 +#ifdef CONFIG_PAX_SEGMEXEC
96056 + if (pax_find_mirror_vma(vma))
96057 + BUG_ON(!trylock_page(new_page));
96058 +#endif
96059 +
96060 do_set_pte(vma, address, new_page, pte, true, true);
96061 +
96062 +#ifdef CONFIG_PAX_SEGMEXEC
96063 + pax_mirror_anon_pte(vma, address, new_page, ptl);
96064 +#endif
96065 +
96066 mem_cgroup_commit_charge(new_page, memcg, false);
96067 lru_cache_add_active_or_unevictable(new_page, vma);
96068 pte_unmap_unlock(pte, ptl);
96069 @@ -3012,6 +3228,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96070 return ret;
96071 }
96072 do_set_pte(vma, address, fault_page, pte, true, false);
96073 +
96074 +#ifdef CONFIG_PAX_SEGMEXEC
96075 + pax_mirror_file_pte(vma, address, fault_page, ptl);
96076 +#endif
96077 +
96078 pte_unmap_unlock(pte, ptl);
96079
96080 if (set_page_dirty(fault_page))
96081 @@ -3253,6 +3474,12 @@ static int handle_pte_fault(struct mm_struct *mm,
96082 if (flags & FAULT_FLAG_WRITE)
96083 flush_tlb_fix_spurious_fault(vma, address);
96084 }
96085 +
96086 +#ifdef CONFIG_PAX_SEGMEXEC
96087 + pax_mirror_pte(vma, address, pte, pmd, ptl);
96088 + return 0;
96089 +#endif
96090 +
96091 unlock:
96092 pte_unmap_unlock(pte, ptl);
96093 return 0;
96094 @@ -3272,9 +3499,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
96095 pmd_t *pmd;
96096 pte_t *pte;
96097
96098 +#ifdef CONFIG_PAX_SEGMEXEC
96099 + struct vm_area_struct *vma_m;
96100 +#endif
96101 +
96102 if (unlikely(is_vm_hugetlb_page(vma)))
96103 return hugetlb_fault(mm, vma, address, flags);
96104
96105 +#ifdef CONFIG_PAX_SEGMEXEC
96106 + vma_m = pax_find_mirror_vma(vma);
96107 + if (vma_m) {
96108 + unsigned long address_m;
96109 + pgd_t *pgd_m;
96110 + pud_t *pud_m;
96111 + pmd_t *pmd_m;
96112 +
96113 + if (vma->vm_start > vma_m->vm_start) {
96114 + address_m = address;
96115 + address -= SEGMEXEC_TASK_SIZE;
96116 + vma = vma_m;
96117 + } else
96118 + address_m = address + SEGMEXEC_TASK_SIZE;
96119 +
96120 + pgd_m = pgd_offset(mm, address_m);
96121 + pud_m = pud_alloc(mm, pgd_m, address_m);
96122 + if (!pud_m)
96123 + return VM_FAULT_OOM;
96124 + pmd_m = pmd_alloc(mm, pud_m, address_m);
96125 + if (!pmd_m)
96126 + return VM_FAULT_OOM;
96127 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
96128 + return VM_FAULT_OOM;
96129 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
96130 + }
96131 +#endif
96132 +
96133 pgd = pgd_offset(mm, address);
96134 pud = pud_alloc(mm, pgd, address);
96135 if (!pud)
96136 @@ -3408,6 +3667,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96137 spin_unlock(&mm->page_table_lock);
96138 return 0;
96139 }
96140 +
96141 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96142 +{
96143 + pud_t *new = pud_alloc_one(mm, address);
96144 + if (!new)
96145 + return -ENOMEM;
96146 +
96147 + smp_wmb(); /* See comment in __pte_alloc */
96148 +
96149 + spin_lock(&mm->page_table_lock);
96150 + if (pgd_present(*pgd)) /* Another has populated it */
96151 + pud_free(mm, new);
96152 + else
96153 + pgd_populate_kernel(mm, pgd, new);
96154 + spin_unlock(&mm->page_table_lock);
96155 + return 0;
96156 +}
96157 #endif /* __PAGETABLE_PUD_FOLDED */
96158
96159 #ifndef __PAGETABLE_PMD_FOLDED
96160 @@ -3438,6 +3714,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
96161 spin_unlock(&mm->page_table_lock);
96162 return 0;
96163 }
96164 +
96165 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
96166 +{
96167 + pmd_t *new = pmd_alloc_one(mm, address);
96168 + if (!new)
96169 + return -ENOMEM;
96170 +
96171 + smp_wmb(); /* See comment in __pte_alloc */
96172 +
96173 + spin_lock(&mm->page_table_lock);
96174 +#ifndef __ARCH_HAS_4LEVEL_HACK
96175 + if (pud_present(*pud)) /* Another has populated it */
96176 + pmd_free(mm, new);
96177 + else
96178 + pud_populate_kernel(mm, pud, new);
96179 +#else
96180 + if (pgd_present(*pud)) /* Another has populated it */
96181 + pmd_free(mm, new);
96182 + else
96183 + pgd_populate_kernel(mm, pud, new);
96184 +#endif /* __ARCH_HAS_4LEVEL_HACK */
96185 + spin_unlock(&mm->page_table_lock);
96186 + return 0;
96187 +}
96188 #endif /* __PAGETABLE_PMD_FOLDED */
96189
96190 static int __follow_pte(struct mm_struct *mm, unsigned long address,
96191 @@ -3547,8 +3847,8 @@ out:
96192 return ret;
96193 }
96194
96195 -int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96196 - void *buf, int len, int write)
96197 +ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96198 + void *buf, size_t len, int write)
96199 {
96200 resource_size_t phys_addr;
96201 unsigned long prot = 0;
96202 @@ -3574,8 +3874,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
96203 * Access another process' address space as given in mm. If non-NULL, use the
96204 * given task for page fault accounting.
96205 */
96206 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96207 - unsigned long addr, void *buf, int len, int write)
96208 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96209 + unsigned long addr, void *buf, size_t len, int write)
96210 {
96211 struct vm_area_struct *vma;
96212 void *old_buf = buf;
96213 @@ -3583,7 +3883,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96214 down_read(&mm->mmap_sem);
96215 /* ignore errors, just check how much was successfully transferred */
96216 while (len) {
96217 - int bytes, ret, offset;
96218 + ssize_t bytes, ret, offset;
96219 void *maddr;
96220 struct page *page = NULL;
96221
96222 @@ -3644,8 +3944,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96223 *
96224 * The caller must hold a reference on @mm.
96225 */
96226 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96227 - void *buf, int len, int write)
96228 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96229 + void *buf, size_t len, int write)
96230 {
96231 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96232 }
96233 @@ -3655,11 +3955,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96234 * Source/target buffer must be kernel space,
96235 * Do not walk the page table directly, use get_user_pages
96236 */
96237 -int access_process_vm(struct task_struct *tsk, unsigned long addr,
96238 - void *buf, int len, int write)
96239 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96240 + void *buf, size_t len, int write)
96241 {
96242 struct mm_struct *mm;
96243 - int ret;
96244 + ssize_t ret;
96245
96246 mm = get_task_mm(tsk);
96247 if (!mm)
96248 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96249 index e58725a..e0be017 100644
96250 --- a/mm/mempolicy.c
96251 +++ b/mm/mempolicy.c
96252 @@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96253 unsigned long vmstart;
96254 unsigned long vmend;
96255
96256 +#ifdef CONFIG_PAX_SEGMEXEC
96257 + struct vm_area_struct *vma_m;
96258 +#endif
96259 +
96260 vma = find_vma(mm, start);
96261 if (!vma || vma->vm_start > start)
96262 return -EFAULT;
96263 @@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96264 err = vma_replace_policy(vma, new_pol);
96265 if (err)
96266 goto out;
96267 +
96268 +#ifdef CONFIG_PAX_SEGMEXEC
96269 + vma_m = pax_find_mirror_vma(vma);
96270 + if (vma_m) {
96271 + err = vma_replace_policy(vma_m, new_pol);
96272 + if (err)
96273 + goto out;
96274 + }
96275 +#endif
96276 +
96277 }
96278
96279 out:
96280 @@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96281
96282 if (end < start)
96283 return -EINVAL;
96284 +
96285 +#ifdef CONFIG_PAX_SEGMEXEC
96286 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96287 + if (end > SEGMEXEC_TASK_SIZE)
96288 + return -EINVAL;
96289 + } else
96290 +#endif
96291 +
96292 + if (end > TASK_SIZE)
96293 + return -EINVAL;
96294 +
96295 if (end == start)
96296 return 0;
96297
96298 @@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96299 */
96300 tcred = __task_cred(task);
96301 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96302 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96303 - !capable(CAP_SYS_NICE)) {
96304 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96305 rcu_read_unlock();
96306 err = -EPERM;
96307 goto out_put;
96308 @@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96309 goto out;
96310 }
96311
96312 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96313 + if (mm != current->mm &&
96314 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96315 + mmput(mm);
96316 + err = -EPERM;
96317 + goto out;
96318 + }
96319 +#endif
96320 +
96321 err = do_migrate_pages(mm, old, new,
96322 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96323
96324 diff --git a/mm/migrate.c b/mm/migrate.c
96325 index 0143995..b294728 100644
96326 --- a/mm/migrate.c
96327 +++ b/mm/migrate.c
96328 @@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96329 */
96330 tcred = __task_cred(task);
96331 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96332 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96333 - !capable(CAP_SYS_NICE)) {
96334 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96335 rcu_read_unlock();
96336 err = -EPERM;
96337 goto out;
96338 diff --git a/mm/mlock.c b/mm/mlock.c
96339 index 73cf098..ab547c7 100644
96340 --- a/mm/mlock.c
96341 +++ b/mm/mlock.c
96342 @@ -14,6 +14,7 @@
96343 #include <linux/pagevec.h>
96344 #include <linux/mempolicy.h>
96345 #include <linux/syscalls.h>
96346 +#include <linux/security.h>
96347 #include <linux/sched.h>
96348 #include <linux/export.h>
96349 #include <linux/rmap.h>
96350 @@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96351 {
96352 unsigned long nstart, end, tmp;
96353 struct vm_area_struct * vma, * prev;
96354 - int error;
96355 + int error = 0;
96356
96357 VM_BUG_ON(start & ~PAGE_MASK);
96358 VM_BUG_ON(len != PAGE_ALIGN(len));
96359 @@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96360 return -EINVAL;
96361 if (end == start)
96362 return 0;
96363 + if (end > TASK_SIZE)
96364 + return -EINVAL;
96365 +
96366 vma = find_vma(current->mm, start);
96367 if (!vma || vma->vm_start > start)
96368 return -ENOMEM;
96369 @@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96370 for (nstart = start ; ; ) {
96371 vm_flags_t newflags;
96372
96373 +#ifdef CONFIG_PAX_SEGMEXEC
96374 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96375 + break;
96376 +#endif
96377 +
96378 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96379
96380 newflags = vma->vm_flags & ~VM_LOCKED;
96381 @@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96382 locked += current->mm->locked_vm;
96383
96384 /* check against resource limits */
96385 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96386 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96387 error = do_mlock(start, len, 1);
96388
96389 @@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96390 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96391 vm_flags_t newflags;
96392
96393 +#ifdef CONFIG_PAX_SEGMEXEC
96394 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96395 + break;
96396 +#endif
96397 +
96398 newflags = vma->vm_flags & ~VM_LOCKED;
96399 if (flags & MCL_CURRENT)
96400 newflags |= VM_LOCKED;
96401 @@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96402 lock_limit >>= PAGE_SHIFT;
96403
96404 ret = -ENOMEM;
96405 +
96406 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96407 +
96408 down_write(&current->mm->mmap_sem);
96409 -
96410 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96411 capable(CAP_IPC_LOCK))
96412 ret = do_mlockall(flags);
96413 diff --git a/mm/mmap.c b/mm/mmap.c
96414 index 1620adb..348da48 100644
96415 --- a/mm/mmap.c
96416 +++ b/mm/mmap.c
96417 @@ -41,6 +41,7 @@
96418 #include <linux/notifier.h>
96419 #include <linux/memory.h>
96420 #include <linux/printk.h>
96421 +#include <linux/random.h>
96422
96423 #include <asm/uaccess.h>
96424 #include <asm/cacheflush.h>
96425 @@ -57,6 +58,16 @@
96426 #define arch_rebalance_pgtables(addr, len) (addr)
96427 #endif
96428
96429 +static inline void verify_mm_writelocked(struct mm_struct *mm)
96430 +{
96431 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96432 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96433 + up_read(&mm->mmap_sem);
96434 + BUG();
96435 + }
96436 +#endif
96437 +}
96438 +
96439 static void unmap_region(struct mm_struct *mm,
96440 struct vm_area_struct *vma, struct vm_area_struct *prev,
96441 unsigned long start, unsigned long end);
96442 @@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96443 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96444 *
96445 */
96446 -pgprot_t protection_map[16] = {
96447 +pgprot_t protection_map[16] __read_only = {
96448 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96449 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96450 };
96451
96452 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
96453 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96454 {
96455 - return __pgprot(pgprot_val(protection_map[vm_flags &
96456 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96457 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96458 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96459 +
96460 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96461 + if (!(__supported_pte_mask & _PAGE_NX) &&
96462 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96463 + (vm_flags & (VM_READ | VM_WRITE)))
96464 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96465 +#endif
96466 +
96467 + return prot;
96468 }
96469 EXPORT_SYMBOL(vm_get_page_prot);
96470
96471 @@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96472 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96473 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96474 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96475 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96476 /*
96477 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96478 * other variables. It can be updated by several CPUs frequently.
96479 @@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96480 struct vm_area_struct *next = vma->vm_next;
96481
96482 might_sleep();
96483 + BUG_ON(vma->vm_mirror);
96484 if (vma->vm_ops && vma->vm_ops->close)
96485 vma->vm_ops->close(vma);
96486 if (vma->vm_file)
96487 @@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96488
96489 SYSCALL_DEFINE1(brk, unsigned long, brk)
96490 {
96491 + unsigned long rlim;
96492 unsigned long retval;
96493 unsigned long newbrk, oldbrk;
96494 struct mm_struct *mm = current->mm;
96495 @@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96496 * segment grow beyond its set limit the in case where the limit is
96497 * not page aligned -Ram Gupta
96498 */
96499 - if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96500 + rlim = rlimit(RLIMIT_DATA);
96501 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96502 + /* force a minimum 16MB brk heap on setuid/setgid binaries */
96503 + if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96504 + rlim = 4096 * PAGE_SIZE;
96505 +#endif
96506 + if (check_data_rlimit(rlim, brk, mm->start_brk,
96507 mm->end_data, mm->start_data))
96508 goto out;
96509
96510 @@ -976,6 +1005,12 @@ static int
96511 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96512 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96513 {
96514 +
96515 +#ifdef CONFIG_PAX_SEGMEXEC
96516 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96517 + return 0;
96518 +#endif
96519 +
96520 if (is_mergeable_vma(vma, file, vm_flags) &&
96521 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96522 if (vma->vm_pgoff == vm_pgoff)
96523 @@ -995,6 +1030,12 @@ static int
96524 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96525 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96526 {
96527 +
96528 +#ifdef CONFIG_PAX_SEGMEXEC
96529 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96530 + return 0;
96531 +#endif
96532 +
96533 if (is_mergeable_vma(vma, file, vm_flags) &&
96534 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96535 pgoff_t vm_pglen;
96536 @@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96537 struct vm_area_struct *area, *next;
96538 int err;
96539
96540 +#ifdef CONFIG_PAX_SEGMEXEC
96541 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96542 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96543 +
96544 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96545 +#endif
96546 +
96547 /*
96548 * We later require that vma->vm_flags == vm_flags,
96549 * so this tests vma->vm_flags & VM_SPECIAL, too.
96550 @@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96551 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96552 next = next->vm_next;
96553
96554 +#ifdef CONFIG_PAX_SEGMEXEC
96555 + if (prev)
96556 + prev_m = pax_find_mirror_vma(prev);
96557 + if (area)
96558 + area_m = pax_find_mirror_vma(area);
96559 + if (next)
96560 + next_m = pax_find_mirror_vma(next);
96561 +#endif
96562 +
96563 /*
96564 * Can it merge with the predecessor?
96565 */
96566 @@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96567 /* cases 1, 6 */
96568 err = vma_adjust(prev, prev->vm_start,
96569 next->vm_end, prev->vm_pgoff, NULL);
96570 - } else /* cases 2, 5, 7 */
96571 +
96572 +#ifdef CONFIG_PAX_SEGMEXEC
96573 + if (!err && prev_m)
96574 + err = vma_adjust(prev_m, prev_m->vm_start,
96575 + next_m->vm_end, prev_m->vm_pgoff, NULL);
96576 +#endif
96577 +
96578 + } else { /* cases 2, 5, 7 */
96579 err = vma_adjust(prev, prev->vm_start,
96580 end, prev->vm_pgoff, NULL);
96581 +
96582 +#ifdef CONFIG_PAX_SEGMEXEC
96583 + if (!err && prev_m)
96584 + err = vma_adjust(prev_m, prev_m->vm_start,
96585 + end_m, prev_m->vm_pgoff, NULL);
96586 +#endif
96587 +
96588 + }
96589 if (err)
96590 return NULL;
96591 khugepaged_enter_vma_merge(prev, vm_flags);
96592 @@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96593 mpol_equal(policy, vma_policy(next)) &&
96594 can_vma_merge_before(next, vm_flags,
96595 anon_vma, file, pgoff+pglen)) {
96596 - if (prev && addr < prev->vm_end) /* case 4 */
96597 + if (prev && addr < prev->vm_end) { /* case 4 */
96598 err = vma_adjust(prev, prev->vm_start,
96599 addr, prev->vm_pgoff, NULL);
96600 - else /* cases 3, 8 */
96601 +
96602 +#ifdef CONFIG_PAX_SEGMEXEC
96603 + if (!err && prev_m)
96604 + err = vma_adjust(prev_m, prev_m->vm_start,
96605 + addr_m, prev_m->vm_pgoff, NULL);
96606 +#endif
96607 +
96608 + } else { /* cases 3, 8 */
96609 err = vma_adjust(area, addr, next->vm_end,
96610 next->vm_pgoff - pglen, NULL);
96611 +
96612 +#ifdef CONFIG_PAX_SEGMEXEC
96613 + if (!err && area_m)
96614 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
96615 + next_m->vm_pgoff - pglen, NULL);
96616 +#endif
96617 +
96618 + }
96619 if (err)
96620 return NULL;
96621 khugepaged_enter_vma_merge(area, vm_flags);
96622 @@ -1208,8 +1295,10 @@ none:
96623 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96624 struct file *file, long pages)
96625 {
96626 - const unsigned long stack_flags
96627 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96628 +
96629 +#ifdef CONFIG_PAX_RANDMMAP
96630 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96631 +#endif
96632
96633 mm->total_vm += pages;
96634
96635 @@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96636 mm->shared_vm += pages;
96637 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96638 mm->exec_vm += pages;
96639 - } else if (flags & stack_flags)
96640 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96641 mm->stack_vm += pages;
96642 }
96643 #endif /* CONFIG_PROC_FS */
96644 @@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96645 locked += mm->locked_vm;
96646 lock_limit = rlimit(RLIMIT_MEMLOCK);
96647 lock_limit >>= PAGE_SHIFT;
96648 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96649 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96650 return -EAGAIN;
96651 }
96652 @@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96653 * (the exception is when the underlying filesystem is noexec
96654 * mounted, in which case we dont add PROT_EXEC.)
96655 */
96656 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96657 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96658 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96659 prot |= PROT_EXEC;
96660
96661 @@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96662 /* Obtain the address to map to. we verify (or select) it and ensure
96663 * that it represents a valid section of the address space.
96664 */
96665 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
96666 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96667 if (addr & ~PAGE_MASK)
96668 return addr;
96669
96670 @@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96671 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96672 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96673
96674 +#ifdef CONFIG_PAX_MPROTECT
96675 + if (mm->pax_flags & MF_PAX_MPROTECT) {
96676 +
96677 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96678 + if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96679 + mm->binfmt->handle_mmap)
96680 + mm->binfmt->handle_mmap(file);
96681 +#endif
96682 +
96683 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
96684 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96685 + gr_log_rwxmmap(file);
96686 +
96687 +#ifdef CONFIG_PAX_EMUPLT
96688 + vm_flags &= ~VM_EXEC;
96689 +#else
96690 + return -EPERM;
96691 +#endif
96692 +
96693 + }
96694 +
96695 + if (!(vm_flags & VM_EXEC))
96696 + vm_flags &= ~VM_MAYEXEC;
96697 +#else
96698 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96699 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96700 +#endif
96701 + else
96702 + vm_flags &= ~VM_MAYWRITE;
96703 + }
96704 +#endif
96705 +
96706 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96707 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96708 + vm_flags &= ~VM_PAGEEXEC;
96709 +#endif
96710 +
96711 if (flags & MAP_LOCKED)
96712 if (!can_do_mlock())
96713 return -EPERM;
96714 @@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96715 vm_flags |= VM_NORESERVE;
96716 }
96717
96718 + if (!gr_acl_handle_mmap(file, prot))
96719 + return -EACCES;
96720 +
96721 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96722 if (!IS_ERR_VALUE(addr) &&
96723 ((vm_flags & VM_LOCKED) ||
96724 @@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96725 vm_flags_t vm_flags = vma->vm_flags;
96726
96727 /* If it was private or non-writable, the write bit is already clear */
96728 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96729 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96730 return 0;
96731
96732 /* The backer wishes to know when pages are first written to? */
96733 @@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96734 struct rb_node **rb_link, *rb_parent;
96735 unsigned long charged = 0;
96736
96737 +#ifdef CONFIG_PAX_SEGMEXEC
96738 + struct vm_area_struct *vma_m = NULL;
96739 +#endif
96740 +
96741 + /*
96742 + * mm->mmap_sem is required to protect against another thread
96743 + * changing the mappings in case we sleep.
96744 + */
96745 + verify_mm_writelocked(mm);
96746 +
96747 /* Check against address space limit. */
96748 +
96749 +#ifdef CONFIG_PAX_RANDMMAP
96750 + if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96751 +#endif
96752 +
96753 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
96754 unsigned long nr_pages;
96755
96756 @@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96757
96758 /* Clear old maps */
96759 error = -ENOMEM;
96760 -munmap_back:
96761 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
96762 if (do_munmap(mm, addr, len))
96763 return -ENOMEM;
96764 - goto munmap_back;
96765 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
96766 }
96767
96768 /*
96769 @@ -1595,6 +1739,16 @@ munmap_back:
96770 goto unacct_error;
96771 }
96772
96773 +#ifdef CONFIG_PAX_SEGMEXEC
96774 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
96775 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
96776 + if (!vma_m) {
96777 + error = -ENOMEM;
96778 + goto free_vma;
96779 + }
96780 + }
96781 +#endif
96782 +
96783 vma->vm_mm = mm;
96784 vma->vm_start = addr;
96785 vma->vm_end = addr + len;
96786 @@ -1625,6 +1779,13 @@ munmap_back:
96787 if (error)
96788 goto unmap_and_free_vma;
96789
96790 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96791 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
96792 + vma->vm_flags |= VM_PAGEEXEC;
96793 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
96794 + }
96795 +#endif
96796 +
96797 /* Can addr have changed??
96798 *
96799 * Answer: Yes, several device drivers can do it in their
96800 @@ -1643,6 +1804,12 @@ munmap_back:
96801 }
96802
96803 vma_link(mm, vma, prev, rb_link, rb_parent);
96804 +
96805 +#ifdef CONFIG_PAX_SEGMEXEC
96806 + if (vma_m)
96807 + BUG_ON(pax_mirror_vma(vma_m, vma));
96808 +#endif
96809 +
96810 /* Once vma denies write, undo our temporary denial count */
96811 if (file) {
96812 if (vm_flags & VM_SHARED)
96813 @@ -1655,6 +1822,7 @@ out:
96814 perf_event_mmap(vma);
96815
96816 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
96817 + track_exec_limit(mm, addr, addr + len, vm_flags);
96818 if (vm_flags & VM_LOCKED) {
96819 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
96820 vma == get_gate_vma(current->mm)))
96821 @@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
96822 if (vm_flags & VM_DENYWRITE)
96823 allow_write_access(file);
96824 free_vma:
96825 +
96826 +#ifdef CONFIG_PAX_SEGMEXEC
96827 + if (vma_m)
96828 + kmem_cache_free(vm_area_cachep, vma_m);
96829 +#endif
96830 +
96831 kmem_cache_free(vm_area_cachep, vma);
96832 unacct_error:
96833 if (charged)
96834 @@ -1699,7 +1873,63 @@ unacct_error:
96835 return error;
96836 }
96837
96838 -unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96839 +#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
96840 +unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
96841 +{
96842 + if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
96843 + return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
96844 +
96845 + return 0;
96846 +}
96847 +#endif
96848 +
96849 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
96850 +{
96851 + if (!vma) {
96852 +#ifdef CONFIG_STACK_GROWSUP
96853 + if (addr > sysctl_heap_stack_gap)
96854 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
96855 + else
96856 + vma = find_vma(current->mm, 0);
96857 + if (vma && (vma->vm_flags & VM_GROWSUP))
96858 + return false;
96859 +#endif
96860 + return true;
96861 + }
96862 +
96863 + if (addr + len > vma->vm_start)
96864 + return false;
96865 +
96866 + if (vma->vm_flags & VM_GROWSDOWN)
96867 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
96868 +#ifdef CONFIG_STACK_GROWSUP
96869 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
96870 + return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
96871 +#endif
96872 + else if (offset)
96873 + return offset <= vma->vm_start - addr - len;
96874 +
96875 + return true;
96876 +}
96877 +
96878 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
96879 +{
96880 + if (vma->vm_start < len)
96881 + return -ENOMEM;
96882 +
96883 + if (!(vma->vm_flags & VM_GROWSDOWN)) {
96884 + if (offset <= vma->vm_start - len)
96885 + return vma->vm_start - len - offset;
96886 + else
96887 + return -ENOMEM;
96888 + }
96889 +
96890 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
96891 + return vma->vm_start - len - sysctl_heap_stack_gap;
96892 + return -ENOMEM;
96893 +}
96894 +
96895 +unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
96896 {
96897 /*
96898 * We implement the search by looking for an rbtree node that
96899 @@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96900 }
96901 }
96902
96903 - gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
96904 + gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
96905 check_current:
96906 /* Check if current node has a suitable gap */
96907 if (gap_start > high_limit)
96908 return -ENOMEM;
96909 +
96910 + if (gap_end - gap_start > info->threadstack_offset)
96911 + gap_start += info->threadstack_offset;
96912 + else
96913 + gap_start = gap_end;
96914 +
96915 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96916 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96917 + gap_start += sysctl_heap_stack_gap;
96918 + else
96919 + gap_start = gap_end;
96920 + }
96921 + if (vma->vm_flags & VM_GROWSDOWN) {
96922 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96923 + gap_end -= sysctl_heap_stack_gap;
96924 + else
96925 + gap_end = gap_start;
96926 + }
96927 if (gap_end >= low_limit && gap_end - gap_start >= length)
96928 goto found;
96929
96930 @@ -1801,7 +2049,7 @@ found:
96931 return gap_start;
96932 }
96933
96934 -unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
96935 +unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
96936 {
96937 struct mm_struct *mm = current->mm;
96938 struct vm_area_struct *vma;
96939 @@ -1855,6 +2103,24 @@ check_current:
96940 gap_end = vma->vm_start;
96941 if (gap_end < low_limit)
96942 return -ENOMEM;
96943 +
96944 + if (gap_end - gap_start > info->threadstack_offset)
96945 + gap_end -= info->threadstack_offset;
96946 + else
96947 + gap_end = gap_start;
96948 +
96949 + if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96950 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96951 + gap_start += sysctl_heap_stack_gap;
96952 + else
96953 + gap_start = gap_end;
96954 + }
96955 + if (vma->vm_flags & VM_GROWSDOWN) {
96956 + if (gap_end - gap_start > sysctl_heap_stack_gap)
96957 + gap_end -= sysctl_heap_stack_gap;
96958 + else
96959 + gap_end = gap_start;
96960 + }
96961 if (gap_start <= high_limit && gap_end - gap_start >= length)
96962 goto found;
96963
96964 @@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96965 struct mm_struct *mm = current->mm;
96966 struct vm_area_struct *vma;
96967 struct vm_unmapped_area_info info;
96968 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96969
96970 if (len > TASK_SIZE - mmap_min_addr)
96971 return -ENOMEM;
96972 @@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96973 if (flags & MAP_FIXED)
96974 return addr;
96975
96976 +#ifdef CONFIG_PAX_RANDMMAP
96977 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96978 +#endif
96979 +
96980 if (addr) {
96981 addr = PAGE_ALIGN(addr);
96982 vma = find_vma(mm, addr);
96983 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96984 - (!vma || addr + len <= vma->vm_start))
96985 + check_heap_stack_gap(vma, addr, len, offset))
96986 return addr;
96987 }
96988
96989 @@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96990 info.low_limit = mm->mmap_base;
96991 info.high_limit = TASK_SIZE;
96992 info.align_mask = 0;
96993 + info.threadstack_offset = offset;
96994 return vm_unmapped_area(&info);
96995 }
96996 #endif
96997 @@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96998 struct mm_struct *mm = current->mm;
96999 unsigned long addr = addr0;
97000 struct vm_unmapped_area_info info;
97001 + unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
97002
97003 /* requested length too big for entire address space */
97004 if (len > TASK_SIZE - mmap_min_addr)
97005 @@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97006 if (flags & MAP_FIXED)
97007 return addr;
97008
97009 +#ifdef CONFIG_PAX_RANDMMAP
97010 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
97011 +#endif
97012 +
97013 /* requesting a specific address */
97014 if (addr) {
97015 addr = PAGE_ALIGN(addr);
97016 vma = find_vma(mm, addr);
97017 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
97018 - (!vma || addr + len <= vma->vm_start))
97019 + check_heap_stack_gap(vma, addr, len, offset))
97020 return addr;
97021 }
97022
97023 @@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97024 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
97025 info.high_limit = mm->mmap_base;
97026 info.align_mask = 0;
97027 + info.threadstack_offset = offset;
97028 addr = vm_unmapped_area(&info);
97029
97030 /*
97031 @@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
97032 VM_BUG_ON(addr != -ENOMEM);
97033 info.flags = 0;
97034 info.low_limit = TASK_UNMAPPED_BASE;
97035 +
97036 +#ifdef CONFIG_PAX_RANDMMAP
97037 + if (mm->pax_flags & MF_PAX_RANDMMAP)
97038 + info.low_limit += mm->delta_mmap;
97039 +#endif
97040 +
97041 info.high_limit = TASK_SIZE;
97042 addr = vm_unmapped_area(&info);
97043 }
97044 @@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
97045 return vma;
97046 }
97047
97048 +#ifdef CONFIG_PAX_SEGMEXEC
97049 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
97050 +{
97051 + struct vm_area_struct *vma_m;
97052 +
97053 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
97054 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
97055 + BUG_ON(vma->vm_mirror);
97056 + return NULL;
97057 + }
97058 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
97059 + vma_m = vma->vm_mirror;
97060 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
97061 + BUG_ON(vma->vm_file != vma_m->vm_file);
97062 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
97063 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
97064 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
97065 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
97066 + return vma_m;
97067 +}
97068 +#endif
97069 +
97070 /*
97071 * Verify that the stack growth is acceptable and
97072 * update accounting. This is shared with both the
97073 @@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97074
97075 /* Stack limit test */
97076 actual_size = size;
97077 - if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
97078 - actual_size -= PAGE_SIZE;
97079 + gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
97080 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
97081 return -ENOMEM;
97082
97083 @@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97084 locked = mm->locked_vm + grow;
97085 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
97086 limit >>= PAGE_SHIFT;
97087 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
97088 if (locked > limit && !capable(CAP_IPC_LOCK))
97089 return -ENOMEM;
97090 }
97091 @@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
97092 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
97093 * vma is the last one with address > vma->vm_end. Have to extend vma.
97094 */
97095 +#ifndef CONFIG_IA64
97096 +static
97097 +#endif
97098 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97099 {
97100 int error;
97101 + bool locknext;
97102
97103 if (!(vma->vm_flags & VM_GROWSUP))
97104 return -EFAULT;
97105
97106 + /* Also guard against wrapping around to address 0. */
97107 + if (address < PAGE_ALIGN(address+1))
97108 + address = PAGE_ALIGN(address+1);
97109 + else
97110 + return -ENOMEM;
97111 +
97112 /*
97113 * We must make sure the anon_vma is allocated
97114 * so that the anon_vma locking is not a noop.
97115 */
97116 if (unlikely(anon_vma_prepare(vma)))
97117 return -ENOMEM;
97118 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
97119 + if (locknext && anon_vma_prepare(vma->vm_next))
97120 + return -ENOMEM;
97121 vma_lock_anon_vma(vma);
97122 + if (locknext)
97123 + vma_lock_anon_vma(vma->vm_next);
97124
97125 /*
97126 * vma->vm_start/vm_end cannot change under us because the caller
97127 * is required to hold the mmap_sem in read mode. We need the
97128 - * anon_vma lock to serialize against concurrent expand_stacks.
97129 - * Also guard against wrapping around to address 0.
97130 + * anon_vma locks to serialize against concurrent expand_stacks
97131 + * and expand_upwards.
97132 */
97133 - if (address < PAGE_ALIGN(address+4))
97134 - address = PAGE_ALIGN(address+4);
97135 - else {
97136 - vma_unlock_anon_vma(vma);
97137 - return -ENOMEM;
97138 - }
97139 error = 0;
97140
97141 /* Somebody else might have raced and expanded it already */
97142 - if (address > vma->vm_end) {
97143 + 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)
97144 + error = -ENOMEM;
97145 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
97146 unsigned long size, grow;
97147
97148 size = address - vma->vm_start;
97149 @@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97150 }
97151 }
97152 }
97153 + if (locknext)
97154 + vma_unlock_anon_vma(vma->vm_next);
97155 vma_unlock_anon_vma(vma);
97156 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97157 validate_mm(vma->vm_mm);
97158 @@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
97159 unsigned long address)
97160 {
97161 int error;
97162 + bool lockprev = false;
97163 + struct vm_area_struct *prev;
97164
97165 /*
97166 * We must make sure the anon_vma is allocated
97167 @@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
97168 if (error)
97169 return error;
97170
97171 + prev = vma->vm_prev;
97172 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
97173 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
97174 +#endif
97175 + if (lockprev && anon_vma_prepare(prev))
97176 + return -ENOMEM;
97177 + if (lockprev)
97178 + vma_lock_anon_vma(prev);
97179 +
97180 vma_lock_anon_vma(vma);
97181
97182 /*
97183 @@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
97184 */
97185
97186 /* Somebody else might have raced and expanded it already */
97187 - if (address < vma->vm_start) {
97188 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
97189 + error = -ENOMEM;
97190 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
97191 unsigned long size, grow;
97192
97193 +#ifdef CONFIG_PAX_SEGMEXEC
97194 + struct vm_area_struct *vma_m;
97195 +
97196 + vma_m = pax_find_mirror_vma(vma);
97197 +#endif
97198 +
97199 size = vma->vm_end - address;
97200 grow = (vma->vm_start - address) >> PAGE_SHIFT;
97201
97202 @@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
97203 vma->vm_pgoff -= grow;
97204 anon_vma_interval_tree_post_update_vma(vma);
97205 vma_gap_update(vma);
97206 +
97207 +#ifdef CONFIG_PAX_SEGMEXEC
97208 + if (vma_m) {
97209 + anon_vma_interval_tree_pre_update_vma(vma_m);
97210 + vma_m->vm_start -= grow << PAGE_SHIFT;
97211 + vma_m->vm_pgoff -= grow;
97212 + anon_vma_interval_tree_post_update_vma(vma_m);
97213 + vma_gap_update(vma_m);
97214 + }
97215 +#endif
97216 +
97217 spin_unlock(&vma->vm_mm->page_table_lock);
97218
97219 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
97220 perf_event_mmap(vma);
97221 }
97222 }
97223 }
97224 vma_unlock_anon_vma(vma);
97225 + if (lockprev)
97226 + vma_unlock_anon_vma(prev);
97227 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97228 validate_mm(vma->vm_mm);
97229 return error;
97230 @@ -2380,6 +2732,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97231 do {
97232 long nrpages = vma_pages(vma);
97233
97234 +#ifdef CONFIG_PAX_SEGMEXEC
97235 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97236 + vma = remove_vma(vma);
97237 + continue;
97238 + }
97239 +#endif
97240 +
97241 if (vma->vm_flags & VM_ACCOUNT)
97242 nr_accounted += nrpages;
97243 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97244 @@ -2424,6 +2783,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97245 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97246 vma->vm_prev = NULL;
97247 do {
97248 +
97249 +#ifdef CONFIG_PAX_SEGMEXEC
97250 + if (vma->vm_mirror) {
97251 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97252 + vma->vm_mirror->vm_mirror = NULL;
97253 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
97254 + vma->vm_mirror = NULL;
97255 + }
97256 +#endif
97257 +
97258 vma_rb_erase(vma, &mm->mm_rb);
97259 mm->map_count--;
97260 tail_vma = vma;
97261 @@ -2451,14 +2820,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97262 struct vm_area_struct *new;
97263 int err = -ENOMEM;
97264
97265 +#ifdef CONFIG_PAX_SEGMEXEC
97266 + struct vm_area_struct *vma_m, *new_m = NULL;
97267 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97268 +#endif
97269 +
97270 if (is_vm_hugetlb_page(vma) && (addr &
97271 ~(huge_page_mask(hstate_vma(vma)))))
97272 return -EINVAL;
97273
97274 +#ifdef CONFIG_PAX_SEGMEXEC
97275 + vma_m = pax_find_mirror_vma(vma);
97276 +#endif
97277 +
97278 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97279 if (!new)
97280 goto out_err;
97281
97282 +#ifdef CONFIG_PAX_SEGMEXEC
97283 + if (vma_m) {
97284 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97285 + if (!new_m) {
97286 + kmem_cache_free(vm_area_cachep, new);
97287 + goto out_err;
97288 + }
97289 + }
97290 +#endif
97291 +
97292 /* most fields are the same, copy all, and then fixup */
97293 *new = *vma;
97294
97295 @@ -2471,6 +2859,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97296 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97297 }
97298
97299 +#ifdef CONFIG_PAX_SEGMEXEC
97300 + if (vma_m) {
97301 + *new_m = *vma_m;
97302 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
97303 + new_m->vm_mirror = new;
97304 + new->vm_mirror = new_m;
97305 +
97306 + if (new_below)
97307 + new_m->vm_end = addr_m;
97308 + else {
97309 + new_m->vm_start = addr_m;
97310 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97311 + }
97312 + }
97313 +#endif
97314 +
97315 err = vma_dup_policy(vma, new);
97316 if (err)
97317 goto out_free_vma;
97318 @@ -2491,6 +2895,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97319 else
97320 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97321
97322 +#ifdef CONFIG_PAX_SEGMEXEC
97323 + if (!err && vma_m) {
97324 + struct mempolicy *pol = vma_policy(new);
97325 +
97326 + if (anon_vma_clone(new_m, vma_m))
97327 + goto out_free_mpol;
97328 +
97329 + mpol_get(pol);
97330 + set_vma_policy(new_m, pol);
97331 +
97332 + if (new_m->vm_file)
97333 + get_file(new_m->vm_file);
97334 +
97335 + if (new_m->vm_ops && new_m->vm_ops->open)
97336 + new_m->vm_ops->open(new_m);
97337 +
97338 + if (new_below)
97339 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97340 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97341 + else
97342 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97343 +
97344 + if (err) {
97345 + if (new_m->vm_ops && new_m->vm_ops->close)
97346 + new_m->vm_ops->close(new_m);
97347 + if (new_m->vm_file)
97348 + fput(new_m->vm_file);
97349 + mpol_put(pol);
97350 + }
97351 + }
97352 +#endif
97353 +
97354 /* Success. */
97355 if (!err)
97356 return 0;
97357 @@ -2500,10 +2936,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97358 new->vm_ops->close(new);
97359 if (new->vm_file)
97360 fput(new->vm_file);
97361 - unlink_anon_vmas(new);
97362 out_free_mpol:
97363 mpol_put(vma_policy(new));
97364 out_free_vma:
97365 +
97366 +#ifdef CONFIG_PAX_SEGMEXEC
97367 + if (new_m) {
97368 + unlink_anon_vmas(new_m);
97369 + kmem_cache_free(vm_area_cachep, new_m);
97370 + }
97371 +#endif
97372 +
97373 + unlink_anon_vmas(new);
97374 kmem_cache_free(vm_area_cachep, new);
97375 out_err:
97376 return err;
97377 @@ -2516,6 +2960,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97378 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97379 unsigned long addr, int new_below)
97380 {
97381 +
97382 +#ifdef CONFIG_PAX_SEGMEXEC
97383 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97384 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97385 + if (mm->map_count >= sysctl_max_map_count-1)
97386 + return -ENOMEM;
97387 + } else
97388 +#endif
97389 +
97390 if (mm->map_count >= sysctl_max_map_count)
97391 return -ENOMEM;
97392
97393 @@ -2527,11 +2980,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97394 * work. This now handles partial unmappings.
97395 * Jeremy Fitzhardinge <jeremy@goop.org>
97396 */
97397 +#ifdef CONFIG_PAX_SEGMEXEC
97398 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97399 {
97400 + int ret = __do_munmap(mm, start, len);
97401 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97402 + return ret;
97403 +
97404 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97405 +}
97406 +
97407 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97408 +#else
97409 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97410 +#endif
97411 +{
97412 unsigned long end;
97413 struct vm_area_struct *vma, *prev, *last;
97414
97415 + /*
97416 + * mm->mmap_sem is required to protect against another thread
97417 + * changing the mappings in case we sleep.
97418 + */
97419 + verify_mm_writelocked(mm);
97420 +
97421 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97422 return -EINVAL;
97423
97424 @@ -2607,6 +3079,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97425 /* Fix up all other VM information */
97426 remove_vma_list(mm, vma);
97427
97428 + track_exec_limit(mm, start, end, 0UL);
97429 +
97430 return 0;
97431 }
97432
97433 @@ -2615,6 +3089,13 @@ int vm_munmap(unsigned long start, size_t len)
97434 int ret;
97435 struct mm_struct *mm = current->mm;
97436
97437 +
97438 +#ifdef CONFIG_PAX_SEGMEXEC
97439 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97440 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97441 + return -EINVAL;
97442 +#endif
97443 +
97444 down_write(&mm->mmap_sem);
97445 ret = do_munmap(mm, start, len);
97446 up_write(&mm->mmap_sem);
97447 @@ -2628,16 +3109,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97448 return vm_munmap(addr, len);
97449 }
97450
97451 -static inline void verify_mm_writelocked(struct mm_struct *mm)
97452 -{
97453 -#ifdef CONFIG_DEBUG_VM
97454 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97455 - WARN_ON(1);
97456 - up_read(&mm->mmap_sem);
97457 - }
97458 -#endif
97459 -}
97460 -
97461 /*
97462 * this is really a simplified "do_mmap". it only handles
97463 * anonymous maps. eventually we may be able to do some
97464 @@ -2651,6 +3122,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97465 struct rb_node **rb_link, *rb_parent;
97466 pgoff_t pgoff = addr >> PAGE_SHIFT;
97467 int error;
97468 + unsigned long charged;
97469
97470 len = PAGE_ALIGN(len);
97471 if (!len)
97472 @@ -2658,10 +3130,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97473
97474 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97475
97476 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97477 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97478 + flags &= ~VM_EXEC;
97479 +
97480 +#ifdef CONFIG_PAX_MPROTECT
97481 + if (mm->pax_flags & MF_PAX_MPROTECT)
97482 + flags &= ~VM_MAYEXEC;
97483 +#endif
97484 +
97485 + }
97486 +#endif
97487 +
97488 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97489 if (error & ~PAGE_MASK)
97490 return error;
97491
97492 + charged = len >> PAGE_SHIFT;
97493 +
97494 error = mlock_future_check(mm, mm->def_flags, len);
97495 if (error)
97496 return error;
97497 @@ -2675,21 +3161,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97498 /*
97499 * Clear old maps. this also does some error checking for us
97500 */
97501 - munmap_back:
97502 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97503 if (do_munmap(mm, addr, len))
97504 return -ENOMEM;
97505 - goto munmap_back;
97506 + BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97507 }
97508
97509 /* Check against address space limits *after* clearing old maps... */
97510 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97511 + if (!may_expand_vm(mm, charged))
97512 return -ENOMEM;
97513
97514 if (mm->map_count > sysctl_max_map_count)
97515 return -ENOMEM;
97516
97517 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97518 + if (security_vm_enough_memory_mm(mm, charged))
97519 return -ENOMEM;
97520
97521 /* Can we just expand an old private anonymous mapping? */
97522 @@ -2703,7 +3188,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97523 */
97524 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97525 if (!vma) {
97526 - vm_unacct_memory(len >> PAGE_SHIFT);
97527 + vm_unacct_memory(charged);
97528 return -ENOMEM;
97529 }
97530
97531 @@ -2717,10 +3202,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97532 vma_link(mm, vma, prev, rb_link, rb_parent);
97533 out:
97534 perf_event_mmap(vma);
97535 - mm->total_vm += len >> PAGE_SHIFT;
97536 + mm->total_vm += charged;
97537 if (flags & VM_LOCKED)
97538 - mm->locked_vm += (len >> PAGE_SHIFT);
97539 + mm->locked_vm += charged;
97540 vma->vm_flags |= VM_SOFTDIRTY;
97541 + track_exec_limit(mm, addr, addr + len, flags);
97542 return addr;
97543 }
97544
97545 @@ -2782,6 +3268,7 @@ void exit_mmap(struct mm_struct *mm)
97546 while (vma) {
97547 if (vma->vm_flags & VM_ACCOUNT)
97548 nr_accounted += vma_pages(vma);
97549 + vma->vm_mirror = NULL;
97550 vma = remove_vma(vma);
97551 }
97552 vm_unacct_memory(nr_accounted);
97553 @@ -2799,6 +3286,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97554 struct vm_area_struct *prev;
97555 struct rb_node **rb_link, *rb_parent;
97556
97557 +#ifdef CONFIG_PAX_SEGMEXEC
97558 + struct vm_area_struct *vma_m = NULL;
97559 +#endif
97560 +
97561 + if (security_mmap_addr(vma->vm_start))
97562 + return -EPERM;
97563 +
97564 /*
97565 * The vm_pgoff of a purely anonymous vma should be irrelevant
97566 * until its first write fault, when page's anon_vma and index
97567 @@ -2822,7 +3316,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97568 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97569 return -ENOMEM;
97570
97571 +#ifdef CONFIG_PAX_SEGMEXEC
97572 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97573 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97574 + if (!vma_m)
97575 + return -ENOMEM;
97576 + }
97577 +#endif
97578 +
97579 vma_link(mm, vma, prev, rb_link, rb_parent);
97580 +
97581 +#ifdef CONFIG_PAX_SEGMEXEC
97582 + if (vma_m)
97583 + BUG_ON(pax_mirror_vma(vma_m, vma));
97584 +#endif
97585 +
97586 return 0;
97587 }
97588
97589 @@ -2841,6 +3349,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97590 struct rb_node **rb_link, *rb_parent;
97591 bool faulted_in_anon_vma = true;
97592
97593 + BUG_ON(vma->vm_mirror);
97594 +
97595 /*
97596 * If anonymous vma has not yet been faulted, update new pgoff
97597 * to match new location, to increase its chance of merging.
97598 @@ -2905,6 +3415,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97599 return NULL;
97600 }
97601
97602 +#ifdef CONFIG_PAX_SEGMEXEC
97603 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97604 +{
97605 + struct vm_area_struct *prev_m;
97606 + struct rb_node **rb_link_m, *rb_parent_m;
97607 + struct mempolicy *pol_m;
97608 +
97609 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97610 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97611 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97612 + *vma_m = *vma;
97613 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97614 + if (anon_vma_clone(vma_m, vma))
97615 + return -ENOMEM;
97616 + pol_m = vma_policy(vma_m);
97617 + mpol_get(pol_m);
97618 + set_vma_policy(vma_m, pol_m);
97619 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97620 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97621 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97622 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97623 + if (vma_m->vm_file)
97624 + get_file(vma_m->vm_file);
97625 + if (vma_m->vm_ops && vma_m->vm_ops->open)
97626 + vma_m->vm_ops->open(vma_m);
97627 + BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97628 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97629 + vma_m->vm_mirror = vma;
97630 + vma->vm_mirror = vma_m;
97631 + return 0;
97632 +}
97633 +#endif
97634 +
97635 /*
97636 * Return true if the calling process may expand its vm space by the passed
97637 * number of pages
97638 @@ -2916,6 +3459,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97639
97640 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97641
97642 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97643 if (cur + npages > lim)
97644 return 0;
97645 return 1;
97646 @@ -2998,6 +3542,22 @@ static struct vm_area_struct *__install_special_mapping(
97647 vma->vm_start = addr;
97648 vma->vm_end = addr + len;
97649
97650 +#ifdef CONFIG_PAX_MPROTECT
97651 + if (mm->pax_flags & MF_PAX_MPROTECT) {
97652 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
97653 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97654 + return ERR_PTR(-EPERM);
97655 + if (!(vm_flags & VM_EXEC))
97656 + vm_flags &= ~VM_MAYEXEC;
97657 +#else
97658 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97659 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97660 +#endif
97661 + else
97662 + vm_flags &= ~VM_MAYWRITE;
97663 + }
97664 +#endif
97665 +
97666 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97667 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97668
97669 diff --git a/mm/mprotect.c b/mm/mprotect.c
97670 index ace9345..63320dc 100644
97671 --- a/mm/mprotect.c
97672 +++ b/mm/mprotect.c
97673 @@ -24,10 +24,18 @@
97674 #include <linux/migrate.h>
97675 #include <linux/perf_event.h>
97676 #include <linux/ksm.h>
97677 +#include <linux/sched/sysctl.h>
97678 +
97679 +#ifdef CONFIG_PAX_MPROTECT
97680 +#include <linux/elf.h>
97681 +#include <linux/binfmts.h>
97682 +#endif
97683 +
97684 #include <asm/uaccess.h>
97685 #include <asm/pgtable.h>
97686 #include <asm/cacheflush.h>
97687 #include <asm/tlbflush.h>
97688 +#include <asm/mmu_context.h>
97689
97690 /*
97691 * For a prot_numa update we only hold mmap_sem for read so there is a
97692 @@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97693 return pages;
97694 }
97695
97696 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97697 +/* called while holding the mmap semaphor for writing except stack expansion */
97698 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97699 +{
97700 + unsigned long oldlimit, newlimit = 0UL;
97701 +
97702 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97703 + return;
97704 +
97705 + spin_lock(&mm->page_table_lock);
97706 + oldlimit = mm->context.user_cs_limit;
97707 + if ((prot & VM_EXEC) && oldlimit < end)
97708 + /* USER_CS limit moved up */
97709 + newlimit = end;
97710 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97711 + /* USER_CS limit moved down */
97712 + newlimit = start;
97713 +
97714 + if (newlimit) {
97715 + mm->context.user_cs_limit = newlimit;
97716 +
97717 +#ifdef CONFIG_SMP
97718 + wmb();
97719 + cpus_clear(mm->context.cpu_user_cs_mask);
97720 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97721 +#endif
97722 +
97723 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97724 + }
97725 + spin_unlock(&mm->page_table_lock);
97726 + if (newlimit == end) {
97727 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
97728 +
97729 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
97730 + if (is_vm_hugetlb_page(vma))
97731 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
97732 + else
97733 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
97734 + }
97735 +}
97736 +#endif
97737 +
97738 int
97739 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97740 unsigned long start, unsigned long end, unsigned long newflags)
97741 @@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97742 int error;
97743 int dirty_accountable = 0;
97744
97745 +#ifdef CONFIG_PAX_SEGMEXEC
97746 + struct vm_area_struct *vma_m = NULL;
97747 + unsigned long start_m, end_m;
97748 +
97749 + start_m = start + SEGMEXEC_TASK_SIZE;
97750 + end_m = end + SEGMEXEC_TASK_SIZE;
97751 +#endif
97752 +
97753 if (newflags == oldflags) {
97754 *pprev = vma;
97755 return 0;
97756 }
97757
97758 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
97759 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
97760 +
97761 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
97762 + return -ENOMEM;
97763 +
97764 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
97765 + return -ENOMEM;
97766 + }
97767 +
97768 /*
97769 * If we make a private mapping writable we increase our commit;
97770 * but (without finer accounting) cannot reduce our commit if we
97771 @@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97772 }
97773 }
97774
97775 +#ifdef CONFIG_PAX_SEGMEXEC
97776 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
97777 + if (start != vma->vm_start) {
97778 + error = split_vma(mm, vma, start, 1);
97779 + if (error)
97780 + goto fail;
97781 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
97782 + *pprev = (*pprev)->vm_next;
97783 + }
97784 +
97785 + if (end != vma->vm_end) {
97786 + error = split_vma(mm, vma, end, 0);
97787 + if (error)
97788 + goto fail;
97789 + }
97790 +
97791 + if (pax_find_mirror_vma(vma)) {
97792 + error = __do_munmap(mm, start_m, end_m - start_m);
97793 + if (error)
97794 + goto fail;
97795 + } else {
97796 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97797 + if (!vma_m) {
97798 + error = -ENOMEM;
97799 + goto fail;
97800 + }
97801 + vma->vm_flags = newflags;
97802 + error = pax_mirror_vma(vma_m, vma);
97803 + if (error) {
97804 + vma->vm_flags = oldflags;
97805 + goto fail;
97806 + }
97807 + }
97808 + }
97809 +#endif
97810 +
97811 /*
97812 * First try to merge with previous and/or next vma.
97813 */
97814 @@ -314,7 +418,19 @@ success:
97815 * vm_flags and vm_page_prot are protected by the mmap_sem
97816 * held in write mode.
97817 */
97818 +
97819 +#ifdef CONFIG_PAX_SEGMEXEC
97820 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
97821 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
97822 +#endif
97823 +
97824 vma->vm_flags = newflags;
97825 +
97826 +#ifdef CONFIG_PAX_MPROTECT
97827 + if (mm->binfmt && mm->binfmt->handle_mprotect)
97828 + mm->binfmt->handle_mprotect(vma, newflags);
97829 +#endif
97830 +
97831 dirty_accountable = vma_wants_writenotify(vma);
97832 vma_set_page_prot(vma);
97833
97834 @@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97835 end = start + len;
97836 if (end <= start)
97837 return -ENOMEM;
97838 +
97839 +#ifdef CONFIG_PAX_SEGMEXEC
97840 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97841 + if (end > SEGMEXEC_TASK_SIZE)
97842 + return -EINVAL;
97843 + } else
97844 +#endif
97845 +
97846 + if (end > TASK_SIZE)
97847 + return -EINVAL;
97848 +
97849 if (!arch_validate_prot(prot))
97850 return -EINVAL;
97851
97852 @@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97853 /*
97854 * Does the application expect PROT_READ to imply PROT_EXEC:
97855 */
97856 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97857 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97858 prot |= PROT_EXEC;
97859
97860 vm_flags = calc_vm_prot_bits(prot);
97861 @@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97862 if (start > vma->vm_start)
97863 prev = vma;
97864
97865 +#ifdef CONFIG_PAX_MPROTECT
97866 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
97867 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
97868 +#endif
97869 +
97870 for (nstart = start ; ; ) {
97871 unsigned long newflags;
97872
97873 @@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97874
97875 /* newflags >> 4 shift VM_MAY% in place of VM_% */
97876 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
97877 + if (prot & (PROT_WRITE | PROT_EXEC))
97878 + gr_log_rwxmprotect(vma);
97879 +
97880 + error = -EACCES;
97881 + goto out;
97882 + }
97883 +
97884 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
97885 error = -EACCES;
97886 goto out;
97887 }
97888 @@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97889 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
97890 if (error)
97891 goto out;
97892 +
97893 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
97894 +
97895 nstart = tmp;
97896
97897 if (nstart < prev->vm_end)
97898 diff --git a/mm/mremap.c b/mm/mremap.c
97899 index b147f66..98a695a 100644
97900 --- a/mm/mremap.c
97901 +++ b/mm/mremap.c
97902 @@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
97903 continue;
97904 pte = ptep_get_and_clear(mm, old_addr, old_pte);
97905 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
97906 +
97907 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97908 + if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
97909 + pte = pte_exprotect(pte);
97910 +#endif
97911 +
97912 pte = move_soft_dirty_pte(pte);
97913 set_pte_at(mm, new_addr, new_pte, pte);
97914 }
97915 @@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
97916 if (is_vm_hugetlb_page(vma))
97917 goto Einval;
97918
97919 +#ifdef CONFIG_PAX_SEGMEXEC
97920 + if (pax_find_mirror_vma(vma))
97921 + goto Einval;
97922 +#endif
97923 +
97924 /* We can't remap across vm area boundaries */
97925 if (old_len > vma->vm_end - addr)
97926 goto Efault;
97927 @@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
97928 unsigned long ret = -EINVAL;
97929 unsigned long charged = 0;
97930 unsigned long map_flags;
97931 + unsigned long pax_task_size = TASK_SIZE;
97932
97933 if (new_addr & ~PAGE_MASK)
97934 goto out;
97935
97936 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
97937 +#ifdef CONFIG_PAX_SEGMEXEC
97938 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97939 + pax_task_size = SEGMEXEC_TASK_SIZE;
97940 +#endif
97941 +
97942 + pax_task_size -= PAGE_SIZE;
97943 +
97944 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
97945 goto out;
97946
97947 /* Check if the location we're moving into overlaps the
97948 * old location at all, and fail if it does.
97949 */
97950 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
97951 - goto out;
97952 -
97953 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
97954 + if (addr + old_len > new_addr && new_addr + new_len > addr)
97955 goto out;
97956
97957 ret = do_munmap(mm, new_addr, new_len);
97958 @@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97959 unsigned long ret = -EINVAL;
97960 unsigned long charged = 0;
97961 bool locked = false;
97962 + unsigned long pax_task_size = TASK_SIZE;
97963
97964 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
97965 return ret;
97966 @@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97967 if (!new_len)
97968 return ret;
97969
97970 +#ifdef CONFIG_PAX_SEGMEXEC
97971 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
97972 + pax_task_size = SEGMEXEC_TASK_SIZE;
97973 +#endif
97974 +
97975 + pax_task_size -= PAGE_SIZE;
97976 +
97977 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
97978 + old_len > pax_task_size || addr > pax_task_size-old_len)
97979 + return ret;
97980 +
97981 down_write(&current->mm->mmap_sem);
97982
97983 if (flags & MREMAP_FIXED) {
97984 @@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97985 new_addr = addr;
97986 }
97987 ret = addr;
97988 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
97989 goto out;
97990 }
97991 }
97992 @@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97993 goto out;
97994 }
97995
97996 + map_flags = vma->vm_flags;
97997 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
97998 + if (!(ret & ~PAGE_MASK)) {
97999 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
98000 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
98001 + }
98002 }
98003 out:
98004 if (ret & ~PAGE_MASK)
98005 diff --git a/mm/nommu.c b/mm/nommu.c
98006 index bd1808e..b63d87c 100644
98007 --- a/mm/nommu.c
98008 +++ b/mm/nommu.c
98009 @@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
98010 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
98011 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
98012 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
98013 -int heap_stack_gap = 0;
98014
98015 atomic_long_t mmap_pages_allocated;
98016
98017 @@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
98018 EXPORT_SYMBOL(find_vma);
98019
98020 /*
98021 - * find a VMA
98022 - * - we don't extend stack VMAs under NOMMU conditions
98023 - */
98024 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
98025 -{
98026 - return find_vma(mm, addr);
98027 -}
98028 -
98029 -/*
98030 * expand a stack to a given address
98031 * - not supported under NOMMU conditions
98032 */
98033 @@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
98034
98035 /* most fields are the same, copy all, and then fixup */
98036 *new = *vma;
98037 + INIT_LIST_HEAD(&new->anon_vma_chain);
98038 *region = *vma->vm_region;
98039 new->vm_region = region;
98040
98041 @@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
98042 }
98043 EXPORT_SYMBOL(generic_file_remap_pages);
98044
98045 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98046 - unsigned long addr, void *buf, int len, int write)
98047 +static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98048 + unsigned long addr, void *buf, size_t len, int write)
98049 {
98050 struct vm_area_struct *vma;
98051
98052 @@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98053 *
98054 * The caller must hold a reference on @mm.
98055 */
98056 -int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98057 - void *buf, int len, int write)
98058 +ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98059 + void *buf, size_t len, int write)
98060 {
98061 return __access_remote_vm(NULL, mm, addr, buf, len, write);
98062 }
98063 @@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98064 * Access another process' address space.
98065 * - source/target buffer must be kernel space
98066 */
98067 -int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
98068 +ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
98069 {
98070 struct mm_struct *mm;
98071
98072 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
98073 index 437174a..8b86707 100644
98074 --- a/mm/page-writeback.c
98075 +++ b/mm/page-writeback.c
98076 @@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
98077 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
98078 * - the bdi dirty thresh drops quickly due to change of JBOD workload
98079 */
98080 -static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
98081 +static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
98082 unsigned long thresh,
98083 unsigned long bg_thresh,
98084 unsigned long dirty,
98085 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
98086 index 616a2c9..0e755f6 100644
98087 --- a/mm/page_alloc.c
98088 +++ b/mm/page_alloc.c
98089 @@ -59,6 +59,7 @@
98090 #include <linux/page-debug-flags.h>
98091 #include <linux/hugetlb.h>
98092 #include <linux/sched/rt.h>
98093 +#include <linux/random.h>
98094
98095 #include <asm/sections.h>
98096 #include <asm/tlbflush.h>
98097 @@ -356,7 +357,7 @@ out:
98098 * This usage means that zero-order pages may not be compound.
98099 */
98100
98101 -static void free_compound_page(struct page *page)
98102 +void free_compound_page(struct page *page)
98103 {
98104 __free_pages_ok(page, compound_order(page));
98105 }
98106 @@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98107 int i;
98108 int bad = 0;
98109
98110 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98111 + unsigned long index = 1UL << order;
98112 +#endif
98113 +
98114 trace_mm_page_free(page, order);
98115 kmemcheck_free_shadow(page, order);
98116
98117 @@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98118 debug_check_no_obj_freed(page_address(page),
98119 PAGE_SIZE << order);
98120 }
98121 +
98122 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98123 + for (; index; --index)
98124 + sanitize_highpage(page + index - 1);
98125 +#endif
98126 +
98127 arch_free_page(page, order);
98128 kernel_map_pages(page, 1 << order, 0);
98129
98130 @@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
98131 local_irq_restore(flags);
98132 }
98133
98134 +#ifdef CONFIG_PAX_LATENT_ENTROPY
98135 +bool __meminitdata extra_latent_entropy;
98136 +
98137 +static int __init setup_pax_extra_latent_entropy(char *str)
98138 +{
98139 + extra_latent_entropy = true;
98140 + return 0;
98141 +}
98142 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
98143 +
98144 +volatile u64 latent_entropy __latent_entropy;
98145 +EXPORT_SYMBOL(latent_entropy);
98146 +#endif
98147 +
98148 void __init __free_pages_bootmem(struct page *page, unsigned int order)
98149 {
98150 unsigned int nr_pages = 1 << order;
98151 @@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
98152 __ClearPageReserved(p);
98153 set_page_count(p, 0);
98154
98155 +#ifdef CONFIG_PAX_LATENT_ENTROPY
98156 + if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
98157 + u64 hash = 0;
98158 + size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
98159 + const u64 *data = lowmem_page_address(page);
98160 +
98161 + for (index = 0; index < end; index++)
98162 + hash ^= hash + data[index];
98163 + latent_entropy ^= hash;
98164 + add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
98165 + }
98166 +#endif
98167 +
98168 page_zone(page)->managed_pages += nr_pages;
98169 set_page_refcounted(page);
98170 __free_pages(page, order);
98171 @@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
98172 arch_alloc_page(page, order);
98173 kernel_map_pages(page, 1 << order, 1);
98174
98175 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
98176 if (gfp_flags & __GFP_ZERO)
98177 prep_zero_page(page, order, gfp_flags);
98178 +#endif
98179
98180 if (order && (gfp_flags & __GFP_COMP))
98181 prep_compound_page(page, order);
98182 @@ -1602,7 +1642,7 @@ again:
98183 }
98184
98185 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
98186 - if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98187 + if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98188 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
98189 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98190
98191 @@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
98192 do {
98193 mod_zone_page_state(zone, NR_ALLOC_BATCH,
98194 high_wmark_pages(zone) - low_wmark_pages(zone) -
98195 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98196 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98197 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98198 } while (zone++ != preferred_zone);
98199 }
98200 @@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
98201
98202 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
98203 high_wmark_pages(zone) - low_wmark_pages(zone) -
98204 - atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98205 + atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98206
98207 setup_zone_migrate_reserve(zone);
98208 spin_unlock_irqrestore(&zone->lock, flags);
98209 diff --git a/mm/percpu.c b/mm/percpu.c
98210 index 014bab6..db5a76f 100644
98211 --- a/mm/percpu.c
98212 +++ b/mm/percpu.c
98213 @@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
98214 static unsigned int pcpu_high_unit_cpu __read_mostly;
98215
98216 /* the address of the first chunk which starts with the kernel static area */
98217 -void *pcpu_base_addr __read_mostly;
98218 +void *pcpu_base_addr __read_only;
98219 EXPORT_SYMBOL_GPL(pcpu_base_addr);
98220
98221 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98222 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98223 index 5077afc..846c9ef 100644
98224 --- a/mm/process_vm_access.c
98225 +++ b/mm/process_vm_access.c
98226 @@ -13,6 +13,7 @@
98227 #include <linux/uio.h>
98228 #include <linux/sched.h>
98229 #include <linux/highmem.h>
98230 +#include <linux/security.h>
98231 #include <linux/ptrace.h>
98232 #include <linux/slab.h>
98233 #include <linux/syscalls.h>
98234 @@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98235 ssize_t iov_len;
98236 size_t total_len = iov_iter_count(iter);
98237
98238 + return -ENOSYS; // PaX: until properly audited
98239 +
98240 /*
98241 * Work out how many pages of struct pages we're going to need
98242 * when eventually calling get_user_pages
98243 */
98244 for (i = 0; i < riovcnt; i++) {
98245 iov_len = rvec[i].iov_len;
98246 - if (iov_len > 0) {
98247 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
98248 - + iov_len)
98249 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98250 - / PAGE_SIZE + 1;
98251 - nr_pages = max(nr_pages, nr_pages_iov);
98252 - }
98253 + if (iov_len <= 0)
98254 + continue;
98255 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98256 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98257 + nr_pages = max(nr_pages, nr_pages_iov);
98258 }
98259
98260 if (nr_pages == 0)
98261 @@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98262 goto free_proc_pages;
98263 }
98264
98265 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98266 + rc = -EPERM;
98267 + goto put_task_struct;
98268 + }
98269 +
98270 mm = mm_access(task, PTRACE_MODE_ATTACH);
98271 if (!mm || IS_ERR(mm)) {
98272 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98273 diff --git a/mm/rmap.c b/mm/rmap.c
98274 index 3e4c721..a5e3e39 100644
98275 --- a/mm/rmap.c
98276 +++ b/mm/rmap.c
98277 @@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98278 struct anon_vma *anon_vma = vma->anon_vma;
98279 struct anon_vma_chain *avc;
98280
98281 +#ifdef CONFIG_PAX_SEGMEXEC
98282 + struct anon_vma_chain *avc_m = NULL;
98283 +#endif
98284 +
98285 might_sleep();
98286 if (unlikely(!anon_vma)) {
98287 struct mm_struct *mm = vma->vm_mm;
98288 @@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98289 if (!avc)
98290 goto out_enomem;
98291
98292 +#ifdef CONFIG_PAX_SEGMEXEC
98293 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98294 + if (!avc_m)
98295 + goto out_enomem_free_avc;
98296 +#endif
98297 +
98298 anon_vma = find_mergeable_anon_vma(vma);
98299 allocated = NULL;
98300 if (!anon_vma) {
98301 @@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98302 /* page_table_lock to protect against threads */
98303 spin_lock(&mm->page_table_lock);
98304 if (likely(!vma->anon_vma)) {
98305 +
98306 +#ifdef CONFIG_PAX_SEGMEXEC
98307 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98308 +
98309 + if (vma_m) {
98310 + BUG_ON(vma_m->anon_vma);
98311 + vma_m->anon_vma = anon_vma;
98312 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
98313 + avc_m = NULL;
98314 + }
98315 +#endif
98316 +
98317 vma->anon_vma = anon_vma;
98318 anon_vma_chain_link(vma, avc, anon_vma);
98319 allocated = NULL;
98320 @@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98321
98322 if (unlikely(allocated))
98323 put_anon_vma(allocated);
98324 +
98325 +#ifdef CONFIG_PAX_SEGMEXEC
98326 + if (unlikely(avc_m))
98327 + anon_vma_chain_free(avc_m);
98328 +#endif
98329 +
98330 if (unlikely(avc))
98331 anon_vma_chain_free(avc);
98332 }
98333 return 0;
98334
98335 out_enomem_free_avc:
98336 +
98337 +#ifdef CONFIG_PAX_SEGMEXEC
98338 + if (avc_m)
98339 + anon_vma_chain_free(avc_m);
98340 +#endif
98341 +
98342 anon_vma_chain_free(avc);
98343 out_enomem:
98344 return -ENOMEM;
98345 @@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98346 * Attach the anon_vmas from src to dst.
98347 * Returns 0 on success, -ENOMEM on failure.
98348 */
98349 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98350 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98351 {
98352 struct anon_vma_chain *avc, *pavc;
98353 struct anon_vma *root = NULL;
98354 @@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98355 * the corresponding VMA in the parent process is attached to.
98356 * Returns 0 on success, non-zero on failure.
98357 */
98358 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98359 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98360 {
98361 struct anon_vma_chain *avc;
98362 struct anon_vma *anon_vma;
98363 @@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98364 void __init anon_vma_init(void)
98365 {
98366 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98367 - 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98368 - anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98369 + 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98370 + anon_vma_ctor);
98371 + anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98372 + SLAB_PANIC|SLAB_NO_SANITIZE);
98373 }
98374
98375 /*
98376 diff --git a/mm/shmem.c b/mm/shmem.c
98377 index 185836b..d7255a1 100644
98378 --- a/mm/shmem.c
98379 +++ b/mm/shmem.c
98380 @@ -33,7 +33,7 @@
98381 #include <linux/swap.h>
98382 #include <linux/aio.h>
98383
98384 -static struct vfsmount *shm_mnt;
98385 +struct vfsmount *shm_mnt;
98386
98387 #ifdef CONFIG_SHMEM
98388 /*
98389 @@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98390 #define BOGO_DIRENT_SIZE 20
98391
98392 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98393 -#define SHORT_SYMLINK_LEN 128
98394 +#define SHORT_SYMLINK_LEN 64
98395
98396 /*
98397 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98398 @@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98399 static int shmem_xattr_validate(const char *name)
98400 {
98401 struct { const char *prefix; size_t len; } arr[] = {
98402 +
98403 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98404 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98405 +#endif
98406 +
98407 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98408 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98409 };
98410 @@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98411 if (err)
98412 return err;
98413
98414 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98415 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98416 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98417 + return -EOPNOTSUPP;
98418 + if (size > 8)
98419 + return -EINVAL;
98420 + }
98421 +#endif
98422 +
98423 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98424 }
98425
98426 @@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98427 int err = -ENOMEM;
98428
98429 /* Round up to L1_CACHE_BYTES to resist false sharing */
98430 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98431 - L1_CACHE_BYTES), GFP_KERNEL);
98432 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98433 if (!sbinfo)
98434 return -ENOMEM;
98435
98436 diff --git a/mm/slab.c b/mm/slab.c
98437 index f34e053..78a3839 100644
98438 --- a/mm/slab.c
98439 +++ b/mm/slab.c
98440 @@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98441 if ((x)->max_freeable < i) \
98442 (x)->max_freeable = i; \
98443 } while (0)
98444 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98445 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98446 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98447 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98448 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98449 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98450 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98451 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98452 +#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98453 +#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98454 #else
98455 #define STATS_INC_ACTIVE(x) do { } while (0)
98456 #define STATS_DEC_ACTIVE(x) do { } while (0)
98457 @@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98458 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98459 #define STATS_INC_FREEHIT(x) do { } while (0)
98460 #define STATS_INC_FREEMISS(x) do { } while (0)
98461 +#define STATS_INC_SANITIZED(x) do { } while (0)
98462 +#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98463 #endif
98464
98465 #if DEBUG
98466 @@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98467 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98468 */
98469 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98470 - const struct page *page, void *obj)
98471 + const struct page *page, const void *obj)
98472 {
98473 u32 offset = (obj - page->s_mem);
98474 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98475 @@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98476 * structures first. Without this, further allocations will bug.
98477 */
98478 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98479 - kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98480 + kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98481 slab_state = PARTIAL_NODE;
98482
98483 slab_early_init = 0;
98484 @@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98485
98486 cachep = find_mergeable(size, align, flags, name, ctor);
98487 if (cachep) {
98488 - cachep->refcount++;
98489 + atomic_inc(&cachep->refcount);
98490
98491 /*
98492 * Adjust the object sizes so that we clear
98493 @@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98494 struct array_cache *ac = cpu_cache_get(cachep);
98495
98496 check_irq_off();
98497 +
98498 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98499 + if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98500 + STATS_INC_NOT_SANITIZED(cachep);
98501 + else {
98502 + memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98503 +
98504 + if (cachep->ctor)
98505 + cachep->ctor(objp);
98506 +
98507 + STATS_INC_SANITIZED(cachep);
98508 + }
98509 +#endif
98510 +
98511 kmemleak_free_recursive(objp, cachep->flags);
98512 objp = cache_free_debugcheck(cachep, objp, caller);
98513
98514 @@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98515
98516 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98517 return;
98518 + VM_BUG_ON(!virt_addr_valid(objp));
98519 local_irq_save(flags);
98520 kfree_debugcheck(objp);
98521 c = virt_to_cache(objp);
98522 @@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98523 }
98524 /* cpu stats */
98525 {
98526 - unsigned long allochit = atomic_read(&cachep->allochit);
98527 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98528 - unsigned long freehit = atomic_read(&cachep->freehit);
98529 - unsigned long freemiss = atomic_read(&cachep->freemiss);
98530 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98531 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98532 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98533 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98534
98535 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98536 allochit, allocmiss, freehit, freemiss);
98537 }
98538 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98539 + {
98540 + unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98541 + unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98542 +
98543 + seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98544 + }
98545 +#endif
98546 #endif
98547 }
98548
98549 @@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98550 static int __init slab_proc_init(void)
98551 {
98552 #ifdef CONFIG_DEBUG_SLAB_LEAK
98553 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98554 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98555 #endif
98556 return 0;
98557 }
98558 module_init(slab_proc_init);
98559 #endif
98560
98561 +bool is_usercopy_object(const void *ptr)
98562 +{
98563 + struct page *page;
98564 + struct kmem_cache *cachep;
98565 +
98566 + if (ZERO_OR_NULL_PTR(ptr))
98567 + return false;
98568 +
98569 + if (!slab_is_available())
98570 + return false;
98571 +
98572 + if (!virt_addr_valid(ptr))
98573 + return false;
98574 +
98575 + page = virt_to_head_page(ptr);
98576 +
98577 + if (!PageSlab(page))
98578 + return false;
98579 +
98580 + cachep = page->slab_cache;
98581 + return cachep->flags & SLAB_USERCOPY;
98582 +}
98583 +
98584 +#ifdef CONFIG_PAX_USERCOPY
98585 +const char *check_heap_object(const void *ptr, unsigned long n)
98586 +{
98587 + struct page *page;
98588 + struct kmem_cache *cachep;
98589 + unsigned int objnr;
98590 + unsigned long offset;
98591 +
98592 + if (ZERO_OR_NULL_PTR(ptr))
98593 + return "<null>";
98594 +
98595 + if (!virt_addr_valid(ptr))
98596 + return NULL;
98597 +
98598 + page = virt_to_head_page(ptr);
98599 +
98600 + if (!PageSlab(page))
98601 + return NULL;
98602 +
98603 + cachep = page->slab_cache;
98604 + if (!(cachep->flags & SLAB_USERCOPY))
98605 + return cachep->name;
98606 +
98607 + objnr = obj_to_index(cachep, page, ptr);
98608 + BUG_ON(objnr >= cachep->num);
98609 + offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98610 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98611 + return NULL;
98612 +
98613 + return cachep->name;
98614 +}
98615 +#endif
98616 +
98617 /**
98618 * ksize - get the actual amount of memory allocated for a given object
98619 * @objp: Pointer to the object
98620 diff --git a/mm/slab.h b/mm/slab.h
98621 index ab019e6..fbcac34 100644
98622 --- a/mm/slab.h
98623 +++ b/mm/slab.h
98624 @@ -22,7 +22,7 @@ struct kmem_cache {
98625 unsigned int align; /* Alignment as calculated */
98626 unsigned long flags; /* Active flags on the slab */
98627 const char *name; /* Slab name for sysfs */
98628 - int refcount; /* Use counter */
98629 + atomic_t refcount; /* Use counter */
98630 void (*ctor)(void *); /* Called on object slot creation */
98631 struct list_head list; /* List of all slab caches on the system */
98632 };
98633 @@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98634 /* The slab cache that manages slab cache information */
98635 extern struct kmem_cache *kmem_cache;
98636
98637 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98638 +#ifdef CONFIG_X86_64
98639 +#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98640 +#else
98641 +#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98642 +#endif
98643 +enum pax_sanitize_mode {
98644 + PAX_SANITIZE_SLAB_OFF = 0,
98645 + PAX_SANITIZE_SLAB_FAST,
98646 + PAX_SANITIZE_SLAB_FULL,
98647 +};
98648 +extern enum pax_sanitize_mode pax_sanitize_slab;
98649 +#endif
98650 +
98651 unsigned long calculate_alignment(unsigned long flags,
98652 unsigned long align, unsigned long size);
98653
98654 @@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98655
98656 /* Legal flag mask for kmem_cache_create(), for various configurations */
98657 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98658 - SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98659 + SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98660 + SLAB_USERCOPY | SLAB_NO_SANITIZE)
98661
98662 #if defined(CONFIG_DEBUG_SLAB)
98663 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98664 @@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98665 return s;
98666
98667 page = virt_to_head_page(x);
98668 +
98669 + BUG_ON(!PageSlab(page));
98670 +
98671 cachep = page->slab_cache;
98672 if (slab_equal_or_root(cachep, s))
98673 return cachep;
98674 diff --git a/mm/slab_common.c b/mm/slab_common.c
98675 index dcdab81..3576646 100644
98676 --- a/mm/slab_common.c
98677 +++ b/mm/slab_common.c
98678 @@ -25,11 +25,35 @@
98679
98680 #include "slab.h"
98681
98682 -enum slab_state slab_state;
98683 +enum slab_state slab_state __read_only;
98684 LIST_HEAD(slab_caches);
98685 DEFINE_MUTEX(slab_mutex);
98686 struct kmem_cache *kmem_cache;
98687
98688 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98689 +enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98690 +static int __init pax_sanitize_slab_setup(char *str)
98691 +{
98692 + if (!str)
98693 + return 0;
98694 +
98695 + if (!strcmp(str, "0") || !strcmp(str, "off")) {
98696 + pr_info("PaX slab sanitization: %s\n", "disabled");
98697 + pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98698 + } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98699 + pr_info("PaX slab sanitization: %s\n", "fast");
98700 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98701 + } else if (!strcmp(str, "full")) {
98702 + pr_info("PaX slab sanitization: %s\n", "full");
98703 + pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98704 + } else
98705 + pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98706 +
98707 + return 0;
98708 +}
98709 +early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98710 +#endif
98711 +
98712 /*
98713 * Set of flags that will prevent slab merging
98714 */
98715 @@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98716 * Merge control. If this is set then no merging of slab caches will occur.
98717 * (Could be removed. This was introduced to pacify the merge skeptics.)
98718 */
98719 -static int slab_nomerge;
98720 +static int slab_nomerge = 1;
98721
98722 static int __init setup_slab_nomerge(char *str)
98723 {
98724 @@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98725 /*
98726 * We may have set a slab to be unmergeable during bootstrap.
98727 */
98728 - if (s->refcount < 0)
98729 + if (atomic_read(&s->refcount) < 0)
98730 return 1;
98731
98732 return 0;
98733 @@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
98734 if (err)
98735 goto out_free_cache;
98736
98737 - s->refcount = 1;
98738 + atomic_set(&s->refcount, 1);
98739 list_add(&s->list, &slab_caches);
98740 out:
98741 if (err)
98742 @@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
98743 */
98744 flags &= CACHE_CREATE_MASK;
98745
98746 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98747 + if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
98748 + flags |= SLAB_NO_SANITIZE;
98749 + else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
98750 + flags &= ~SLAB_NO_SANITIZE;
98751 +#endif
98752 +
98753 s = __kmem_cache_alias(name, size, align, flags, ctor);
98754 if (s)
98755 goto out_unlock;
98756 @@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98757
98758 mutex_lock(&slab_mutex);
98759
98760 - s->refcount--;
98761 - if (s->refcount)
98762 + if (!atomic_dec_and_test(&s->refcount))
98763 goto out_unlock;
98764
98765 if (memcg_cleanup_cache_params(s) != 0)
98766 @@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98767 rcu_barrier();
98768
98769 memcg_free_cache_params(s);
98770 -#ifdef SLAB_SUPPORTS_SYSFS
98771 +#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
98772 sysfs_slab_remove(s);
98773 #else
98774 slab_kmem_cache_release(s);
98775 @@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
98776 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
98777 name, size, err);
98778
98779 - s->refcount = -1; /* Exempt from merging for now */
98780 + atomic_set(&s->refcount, -1); /* Exempt from merging for now */
98781 }
98782
98783 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98784 @@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98785
98786 create_boot_cache(s, name, size, flags);
98787 list_add(&s->list, &slab_caches);
98788 - s->refcount = 1;
98789 + atomic_set(&s->refcount, 1);
98790 return s;
98791 }
98792
98793 @@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
98794 EXPORT_SYMBOL(kmalloc_dma_caches);
98795 #endif
98796
98797 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98798 +struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
98799 +EXPORT_SYMBOL(kmalloc_usercopy_caches);
98800 +#endif
98801 +
98802 /*
98803 * Conversion table for small slabs sizes / 8 to the index in the
98804 * kmalloc array. This is necessary for slabs < 192 since we have non power
98805 @@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
98806 return kmalloc_dma_caches[index];
98807
98808 #endif
98809 +
98810 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98811 + if (unlikely((flags & GFP_USERCOPY)))
98812 + return kmalloc_usercopy_caches[index];
98813 +
98814 +#endif
98815 +
98816 return kmalloc_caches[index];
98817 }
98818
98819 @@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
98820 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
98821 if (!kmalloc_caches[i]) {
98822 kmalloc_caches[i] = create_kmalloc_cache(NULL,
98823 - 1 << i, flags);
98824 + 1 << i, SLAB_USERCOPY | flags);
98825 }
98826
98827 /*
98828 @@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
98829 * earlier power of two caches
98830 */
98831 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
98832 - kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
98833 + kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
98834
98835 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
98836 - kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
98837 + kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
98838 }
98839
98840 /* Kmalloc array is now usable */
98841 @@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
98842 }
98843 }
98844 #endif
98845 +
98846 +#ifdef CONFIG_PAX_USERCOPY_SLABS
98847 + for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
98848 + struct kmem_cache *s = kmalloc_caches[i];
98849 +
98850 + if (s) {
98851 + int size = kmalloc_size(i);
98852 + char *n = kasprintf(GFP_NOWAIT,
98853 + "usercopy-kmalloc-%d", size);
98854 +
98855 + BUG_ON(!n);
98856 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
98857 + size, SLAB_USERCOPY | flags);
98858 + }
98859 + }
98860 +#endif
98861 +
98862 }
98863 #endif /* !CONFIG_SLOB */
98864
98865 @@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
98866 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
98867 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
98868 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
98869 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98870 + seq_puts(m, " : pax <sanitized> <not_sanitized>");
98871 +#endif
98872 #endif
98873 seq_putc(m, '\n');
98874 }
98875 diff --git a/mm/slob.c b/mm/slob.c
98876 index 96a8620..3e7e663 100644
98877 --- a/mm/slob.c
98878 +++ b/mm/slob.c
98879 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
98880 /*
98881 * Return the size of a slob block.
98882 */
98883 -static slobidx_t slob_units(slob_t *s)
98884 +static slobidx_t slob_units(const slob_t *s)
98885 {
98886 if (s->units > 0)
98887 return s->units;
98888 @@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
98889 /*
98890 * Return the next free slob block pointer after this one.
98891 */
98892 -static slob_t *slob_next(slob_t *s)
98893 +static slob_t *slob_next(const slob_t *s)
98894 {
98895 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
98896 slobidx_t next;
98897 @@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
98898 /*
98899 * Returns true if s is the last free block in its page.
98900 */
98901 -static int slob_last(slob_t *s)
98902 +static int slob_last(const slob_t *s)
98903 {
98904 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
98905 }
98906
98907 -static void *slob_new_pages(gfp_t gfp, int order, int node)
98908 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
98909 {
98910 - void *page;
98911 + struct page *page;
98912
98913 #ifdef CONFIG_NUMA
98914 if (node != NUMA_NO_NODE)
98915 @@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
98916 if (!page)
98917 return NULL;
98918
98919 - return page_address(page);
98920 + __SetPageSlab(page);
98921 + return page;
98922 }
98923
98924 -static void slob_free_pages(void *b, int order)
98925 +static void slob_free_pages(struct page *sp, int order)
98926 {
98927 if (current->reclaim_state)
98928 current->reclaim_state->reclaimed_slab += 1 << order;
98929 - free_pages((unsigned long)b, order);
98930 + __ClearPageSlab(sp);
98931 + page_mapcount_reset(sp);
98932 + sp->private = 0;
98933 + __free_pages(sp, order);
98934 }
98935
98936 /*
98937 @@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98938
98939 /* Not enough space: must allocate a new page */
98940 if (!b) {
98941 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98942 - if (!b)
98943 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98944 + if (!sp)
98945 return NULL;
98946 - sp = virt_to_page(b);
98947 - __SetPageSlab(sp);
98948 + b = page_address(sp);
98949
98950 spin_lock_irqsave(&slob_lock, flags);
98951 sp->units = SLOB_UNITS(PAGE_SIZE);
98952 sp->freelist = b;
98953 + sp->private = 0;
98954 INIT_LIST_HEAD(&sp->lru);
98955 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
98956 set_slob_page_free(sp, slob_list);
98957 @@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98958 /*
98959 * slob_free: entry point into the slob allocator.
98960 */
98961 -static void slob_free(void *block, int size)
98962 +static void slob_free(struct kmem_cache *c, void *block, int size)
98963 {
98964 struct page *sp;
98965 slob_t *prev, *next, *b = (slob_t *)block;
98966 @@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
98967 if (slob_page_free(sp))
98968 clear_slob_page_free(sp);
98969 spin_unlock_irqrestore(&slob_lock, flags);
98970 - __ClearPageSlab(sp);
98971 - page_mapcount_reset(sp);
98972 - slob_free_pages(b, 0);
98973 + slob_free_pages(sp, 0);
98974 return;
98975 }
98976
98977 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
98978 + if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
98979 + memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
98980 +#endif
98981 +
98982 if (!slob_page_free(sp)) {
98983 /* This slob page is about to become partially free. Easy! */
98984 sp->units = units;
98985 @@ -424,11 +431,10 @@ out:
98986 */
98987
98988 static __always_inline void *
98989 -__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98990 +__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
98991 {
98992 - unsigned int *m;
98993 - int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98994 - void *ret;
98995 + slob_t *m;
98996 + void *ret = NULL;
98997
98998 gfp &= gfp_allowed_mask;
98999
99000 @@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
99001
99002 if (!m)
99003 return NULL;
99004 - *m = size;
99005 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
99006 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
99007 + m[0].units = size;
99008 + m[1].units = align;
99009 ret = (void *)m + align;
99010
99011 trace_kmalloc_node(caller, ret,
99012 size, size + align, gfp, node);
99013 } else {
99014 unsigned int order = get_order(size);
99015 + struct page *page;
99016
99017 if (likely(order))
99018 gfp |= __GFP_COMP;
99019 - ret = slob_new_pages(gfp, order, node);
99020 + page = slob_new_pages(gfp, order, node);
99021 + if (page) {
99022 + ret = page_address(page);
99023 + page->private = size;
99024 + }
99025
99026 trace_kmalloc_node(caller, ret,
99027 size, PAGE_SIZE << order, gfp, node);
99028 }
99029
99030 - kmemleak_alloc(ret, size, 1, gfp);
99031 + return ret;
99032 +}
99033 +
99034 +static __always_inline void *
99035 +__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
99036 +{
99037 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99038 + void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
99039 +
99040 + if (!ZERO_OR_NULL_PTR(ret))
99041 + kmemleak_alloc(ret, size, 1, gfp);
99042 return ret;
99043 }
99044
99045 @@ -491,34 +515,112 @@ void kfree(const void *block)
99046 return;
99047 kmemleak_free(block);
99048
99049 + VM_BUG_ON(!virt_addr_valid(block));
99050 sp = virt_to_page(block);
99051 - if (PageSlab(sp)) {
99052 + VM_BUG_ON(!PageSlab(sp));
99053 + if (!sp->private) {
99054 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99055 - unsigned int *m = (unsigned int *)(block - align);
99056 - slob_free(m, *m + align);
99057 - } else
99058 + slob_t *m = (slob_t *)(block - align);
99059 + slob_free(NULL, m, m[0].units + align);
99060 + } else {
99061 + __ClearPageSlab(sp);
99062 + page_mapcount_reset(sp);
99063 + sp->private = 0;
99064 __free_pages(sp, compound_order(sp));
99065 + }
99066 }
99067 EXPORT_SYMBOL(kfree);
99068
99069 +bool is_usercopy_object(const void *ptr)
99070 +{
99071 + if (!slab_is_available())
99072 + return false;
99073 +
99074 + // PAX: TODO
99075 +
99076 + return false;
99077 +}
99078 +
99079 +#ifdef CONFIG_PAX_USERCOPY
99080 +const char *check_heap_object(const void *ptr, unsigned long n)
99081 +{
99082 + struct page *page;
99083 + const slob_t *free;
99084 + const void *base;
99085 + unsigned long flags;
99086 +
99087 + if (ZERO_OR_NULL_PTR(ptr))
99088 + return "<null>";
99089 +
99090 + if (!virt_addr_valid(ptr))
99091 + return NULL;
99092 +
99093 + page = virt_to_head_page(ptr);
99094 + if (!PageSlab(page))
99095 + return NULL;
99096 +
99097 + if (page->private) {
99098 + base = page;
99099 + if (base <= ptr && n <= page->private - (ptr - base))
99100 + return NULL;
99101 + return "<slob>";
99102 + }
99103 +
99104 + /* some tricky double walking to find the chunk */
99105 + spin_lock_irqsave(&slob_lock, flags);
99106 + base = (void *)((unsigned long)ptr & PAGE_MASK);
99107 + free = page->freelist;
99108 +
99109 + while (!slob_last(free) && (void *)free <= ptr) {
99110 + base = free + slob_units(free);
99111 + free = slob_next(free);
99112 + }
99113 +
99114 + while (base < (void *)free) {
99115 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
99116 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
99117 + int offset;
99118 +
99119 + if (ptr < base + align)
99120 + break;
99121 +
99122 + offset = ptr - base - align;
99123 + if (offset >= m) {
99124 + base += size;
99125 + continue;
99126 + }
99127 +
99128 + if (n > m - offset)
99129 + break;
99130 +
99131 + spin_unlock_irqrestore(&slob_lock, flags);
99132 + return NULL;
99133 + }
99134 +
99135 + spin_unlock_irqrestore(&slob_lock, flags);
99136 + return "<slob>";
99137 +}
99138 +#endif
99139 +
99140 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
99141 size_t ksize(const void *block)
99142 {
99143 struct page *sp;
99144 int align;
99145 - unsigned int *m;
99146 + slob_t *m;
99147
99148 BUG_ON(!block);
99149 if (unlikely(block == ZERO_SIZE_PTR))
99150 return 0;
99151
99152 sp = virt_to_page(block);
99153 - if (unlikely(!PageSlab(sp)))
99154 - return PAGE_SIZE << compound_order(sp);
99155 + VM_BUG_ON(!PageSlab(sp));
99156 + if (sp->private)
99157 + return sp->private;
99158
99159 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99160 - m = (unsigned int *)(block - align);
99161 - return SLOB_UNITS(*m) * SLOB_UNIT;
99162 + m = (slob_t *)(block - align);
99163 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
99164 }
99165 EXPORT_SYMBOL(ksize);
99166
99167 @@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
99168
99169 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
99170 {
99171 - void *b;
99172 + void *b = NULL;
99173
99174 flags &= gfp_allowed_mask;
99175
99176 lockdep_trace_alloc(flags);
99177
99178 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99179 + b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
99180 +#else
99181 if (c->size < PAGE_SIZE) {
99182 b = slob_alloc(c->size, flags, c->align, node);
99183 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99184 SLOB_UNITS(c->size) * SLOB_UNIT,
99185 flags, node);
99186 } else {
99187 - b = slob_new_pages(flags, get_order(c->size), node);
99188 + struct page *sp;
99189 +
99190 + sp = slob_new_pages(flags, get_order(c->size), node);
99191 + if (sp) {
99192 + b = page_address(sp);
99193 + sp->private = c->size;
99194 + }
99195 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99196 PAGE_SIZE << get_order(c->size),
99197 flags, node);
99198 }
99199 +#endif
99200
99201 if (b && c->ctor)
99202 c->ctor(b);
99203 @@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
99204 EXPORT_SYMBOL(kmem_cache_alloc_node);
99205 #endif
99206
99207 -static void __kmem_cache_free(void *b, int size)
99208 +static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
99209 {
99210 - if (size < PAGE_SIZE)
99211 - slob_free(b, size);
99212 + struct page *sp;
99213 +
99214 + sp = virt_to_page(b);
99215 + BUG_ON(!PageSlab(sp));
99216 + if (!sp->private)
99217 + slob_free(c, b, size);
99218 else
99219 - slob_free_pages(b, get_order(size));
99220 + slob_free_pages(sp, get_order(size));
99221 }
99222
99223 static void kmem_rcu_free(struct rcu_head *head)
99224 @@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99225 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99226 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99227
99228 - __kmem_cache_free(b, slob_rcu->size);
99229 + __kmem_cache_free(NULL, b, slob_rcu->size);
99230 }
99231
99232 void kmem_cache_free(struct kmem_cache *c, void *b)
99233 {
99234 + int size = c->size;
99235 +
99236 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99237 + if (size + c->align < PAGE_SIZE) {
99238 + size += c->align;
99239 + b -= c->align;
99240 + }
99241 +#endif
99242 +
99243 kmemleak_free_recursive(b, c->flags);
99244 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99245 struct slob_rcu *slob_rcu;
99246 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99247 - slob_rcu->size = c->size;
99248 + slob_rcu = b + (size - sizeof(struct slob_rcu));
99249 + slob_rcu->size = size;
99250 call_rcu(&slob_rcu->head, kmem_rcu_free);
99251 } else {
99252 - __kmem_cache_free(b, c->size);
99253 + __kmem_cache_free(c, b, size);
99254 }
99255
99256 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99257 + trace_kfree(_RET_IP_, b);
99258 +#else
99259 trace_kmem_cache_free(_RET_IP_, b);
99260 +#endif
99261 +
99262 }
99263 EXPORT_SYMBOL(kmem_cache_free);
99264
99265 diff --git a/mm/slub.c b/mm/slub.c
99266 index ae7b9f1..7b3fdbe 100644
99267 --- a/mm/slub.c
99268 +++ b/mm/slub.c
99269 @@ -197,7 +197,7 @@ struct track {
99270
99271 enum track_item { TRACK_ALLOC, TRACK_FREE };
99272
99273 -#ifdef CONFIG_SYSFS
99274 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99275 static int sysfs_slab_add(struct kmem_cache *);
99276 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99277 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99278 @@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99279 if (!t->addr)
99280 return;
99281
99282 - pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99283 + pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99284 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99285 #ifdef CONFIG_STACKTRACE
99286 {
99287 @@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99288
99289 slab_free_hook(s, x);
99290
99291 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99292 + if (!(s->flags & SLAB_NO_SANITIZE)) {
99293 + memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99294 + if (s->ctor)
99295 + s->ctor(x);
99296 + }
99297 +#endif
99298 +
99299 redo:
99300 /*
99301 * Determine the currently cpus per cpu slab.
99302 @@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99303 s->inuse = size;
99304
99305 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99306 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99307 + (!(flags & SLAB_NO_SANITIZE)) ||
99308 +#endif
99309 s->ctor)) {
99310 /*
99311 * Relocate free pointer after the object if it is not
99312 @@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99313 EXPORT_SYMBOL(__kmalloc_node);
99314 #endif
99315
99316 +bool is_usercopy_object(const void *ptr)
99317 +{
99318 + struct page *page;
99319 + struct kmem_cache *s;
99320 +
99321 + if (ZERO_OR_NULL_PTR(ptr))
99322 + return false;
99323 +
99324 + if (!slab_is_available())
99325 + return false;
99326 +
99327 + if (!virt_addr_valid(ptr))
99328 + return false;
99329 +
99330 + page = virt_to_head_page(ptr);
99331 +
99332 + if (!PageSlab(page))
99333 + return false;
99334 +
99335 + s = page->slab_cache;
99336 + return s->flags & SLAB_USERCOPY;
99337 +}
99338 +
99339 +#ifdef CONFIG_PAX_USERCOPY
99340 +const char *check_heap_object(const void *ptr, unsigned long n)
99341 +{
99342 + struct page *page;
99343 + struct kmem_cache *s;
99344 + unsigned long offset;
99345 +
99346 + if (ZERO_OR_NULL_PTR(ptr))
99347 + return "<null>";
99348 +
99349 + if (!virt_addr_valid(ptr))
99350 + return NULL;
99351 +
99352 + page = virt_to_head_page(ptr);
99353 +
99354 + if (!PageSlab(page))
99355 + return NULL;
99356 +
99357 + s = page->slab_cache;
99358 + if (!(s->flags & SLAB_USERCOPY))
99359 + return s->name;
99360 +
99361 + offset = (ptr - page_address(page)) % s->size;
99362 + if (offset <= s->object_size && n <= s->object_size - offset)
99363 + return NULL;
99364 +
99365 + return s->name;
99366 +}
99367 +#endif
99368 +
99369 size_t ksize(const void *object)
99370 {
99371 struct page *page;
99372 @@ -3329,6 +3393,7 @@ void kfree(const void *x)
99373 if (unlikely(ZERO_OR_NULL_PTR(x)))
99374 return;
99375
99376 + VM_BUG_ON(!virt_addr_valid(x));
99377 page = virt_to_head_page(x);
99378 if (unlikely(!PageSlab(page))) {
99379 BUG_ON(!PageCompound(page));
99380 @@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99381 int i;
99382 struct kmem_cache *c;
99383
99384 - s->refcount++;
99385 + atomic_inc(&s->refcount);
99386
99387 /*
99388 * Adjust the object sizes so that we clear
99389 @@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99390 }
99391
99392 if (sysfs_slab_alias(s, name)) {
99393 - s->refcount--;
99394 + atomic_dec(&s->refcount);
99395 s = NULL;
99396 }
99397 }
99398 @@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99399 }
99400 #endif
99401
99402 -#ifdef CONFIG_SYSFS
99403 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99404 static int count_inuse(struct page *page)
99405 {
99406 return page->inuse;
99407 @@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99408 len += sprintf(buf + len, "%7ld ", l->count);
99409
99410 if (l->addr)
99411 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99412 + len += sprintf(buf + len, "%pS", NULL);
99413 +#else
99414 len += sprintf(buf + len, "%pS", (void *)l->addr);
99415 +#endif
99416 else
99417 len += sprintf(buf + len, "<not-available>");
99418
99419 @@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99420 validate_slab_cache(kmalloc_caches[9]);
99421 }
99422 #else
99423 -#ifdef CONFIG_SYSFS
99424 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99425 static void resiliency_test(void) {};
99426 #endif
99427 #endif
99428
99429 -#ifdef CONFIG_SYSFS
99430 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99431 enum slab_stat_type {
99432 SL_ALL, /* All slabs */
99433 SL_PARTIAL, /* Only partially allocated slabs */
99434 @@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99435 {
99436 if (!s->ctor)
99437 return 0;
99438 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99439 + return sprintf(buf, "%pS\n", NULL);
99440 +#else
99441 return sprintf(buf, "%pS\n", s->ctor);
99442 +#endif
99443 }
99444 SLAB_ATTR_RO(ctor);
99445
99446 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99447 {
99448 - return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99449 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99450 }
99451 SLAB_ATTR_RO(aliases);
99452
99453 @@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99454 SLAB_ATTR_RO(cache_dma);
99455 #endif
99456
99457 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99458 +static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99459 +{
99460 + return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99461 +}
99462 +SLAB_ATTR_RO(usercopy);
99463 +#endif
99464 +
99465 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99466 +static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99467 +{
99468 + return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99469 +}
99470 +SLAB_ATTR_RO(sanitize);
99471 +#endif
99472 +
99473 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99474 {
99475 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99476 @@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99477 * as well as cause other issues like converting a mergeable
99478 * cache into an umergeable one.
99479 */
99480 - if (s->refcount > 1)
99481 + if (atomic_read(&s->refcount) > 1)
99482 return -EINVAL;
99483
99484 s->flags &= ~SLAB_TRACE;
99485 @@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99486 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99487 size_t length)
99488 {
99489 - if (s->refcount > 1)
99490 + if (atomic_read(&s->refcount) > 1)
99491 return -EINVAL;
99492
99493 s->flags &= ~SLAB_FAILSLAB;
99494 @@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99495 #ifdef CONFIG_ZONE_DMA
99496 &cache_dma_attr.attr,
99497 #endif
99498 +#ifdef CONFIG_PAX_USERCOPY_SLABS
99499 + &usercopy_attr.attr,
99500 +#endif
99501 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
99502 + &sanitize_attr.attr,
99503 +#endif
99504 #ifdef CONFIG_NUMA
99505 &remote_node_defrag_ratio_attr.attr,
99506 #endif
99507 @@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99508 return name;
99509 }
99510
99511 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99512 static int sysfs_slab_add(struct kmem_cache *s)
99513 {
99514 int err;
99515 @@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99516 kobject_del(&s->kobj);
99517 kobject_put(&s->kobj);
99518 }
99519 +#endif
99520
99521 /*
99522 * Need to buffer aliases during bootup until sysfs becomes
99523 @@ -5154,6 +5251,7 @@ struct saved_alias {
99524
99525 static struct saved_alias *alias_list;
99526
99527 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99528 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99529 {
99530 struct saved_alias *al;
99531 @@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99532 alias_list = al;
99533 return 0;
99534 }
99535 +#endif
99536
99537 static int __init slab_sysfs_init(void)
99538 {
99539 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99540 index 4cba9c2..b4f9fcc 100644
99541 --- a/mm/sparse-vmemmap.c
99542 +++ b/mm/sparse-vmemmap.c
99543 @@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99544 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99545 if (!p)
99546 return NULL;
99547 - pud_populate(&init_mm, pud, p);
99548 + pud_populate_kernel(&init_mm, pud, p);
99549 }
99550 return pud;
99551 }
99552 @@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99553 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99554 if (!p)
99555 return NULL;
99556 - pgd_populate(&init_mm, pgd, p);
99557 + pgd_populate_kernel(&init_mm, pgd, p);
99558 }
99559 return pgd;
99560 }
99561 diff --git a/mm/sparse.c b/mm/sparse.c
99562 index d1b48b6..6e8590e 100644
99563 --- a/mm/sparse.c
99564 +++ b/mm/sparse.c
99565 @@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99566
99567 for (i = 0; i < PAGES_PER_SECTION; i++) {
99568 if (PageHWPoison(&memmap[i])) {
99569 - atomic_long_sub(1, &num_poisoned_pages);
99570 + atomic_long_sub_unchecked(1, &num_poisoned_pages);
99571 ClearPageHWPoison(&memmap[i]);
99572 }
99573 }
99574 diff --git a/mm/swap.c b/mm/swap.c
99575 index 8a12b33..7068e78 100644
99576 --- a/mm/swap.c
99577 +++ b/mm/swap.c
99578 @@ -31,6 +31,7 @@
99579 #include <linux/memcontrol.h>
99580 #include <linux/gfp.h>
99581 #include <linux/uio.h>
99582 +#include <linux/hugetlb.h>
99583
99584 #include "internal.h"
99585
99586 @@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99587
99588 __page_cache_release(page);
99589 dtor = get_compound_page_dtor(page);
99590 + if (!PageHuge(page))
99591 + BUG_ON(dtor != free_compound_page);
99592 (*dtor)(page);
99593 }
99594
99595 diff --git a/mm/swapfile.c b/mm/swapfile.c
99596 index 8798b2e..348f9dd 100644
99597 --- a/mm/swapfile.c
99598 +++ b/mm/swapfile.c
99599 @@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99600
99601 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99602 /* Activity counter to indicate that a swapon or swapoff has occurred */
99603 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
99604 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99605
99606 static inline unsigned char swap_count(unsigned char ent)
99607 {
99608 @@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99609 spin_unlock(&swap_lock);
99610
99611 err = 0;
99612 - atomic_inc(&proc_poll_event);
99613 + atomic_inc_unchecked(&proc_poll_event);
99614 wake_up_interruptible(&proc_poll_wait);
99615
99616 out_dput:
99617 @@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99618
99619 poll_wait(file, &proc_poll_wait, wait);
99620
99621 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
99622 - seq->poll_event = atomic_read(&proc_poll_event);
99623 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99624 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99625 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99626 }
99627
99628 @@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99629 return ret;
99630
99631 seq = file->private_data;
99632 - seq->poll_event = atomic_read(&proc_poll_event);
99633 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99634 return 0;
99635 }
99636
99637 @@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99638 (frontswap_map) ? "FS" : "");
99639
99640 mutex_unlock(&swapon_mutex);
99641 - atomic_inc(&proc_poll_event);
99642 + atomic_inc_unchecked(&proc_poll_event);
99643 wake_up_interruptible(&proc_poll_wait);
99644
99645 if (S_ISREG(inode->i_mode))
99646 diff --git a/mm/util.c b/mm/util.c
99647 index fec39d4..3e60325 100644
99648 --- a/mm/util.c
99649 +++ b/mm/util.c
99650 @@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99651 void arch_pick_mmap_layout(struct mm_struct *mm)
99652 {
99653 mm->mmap_base = TASK_UNMAPPED_BASE;
99654 +
99655 +#ifdef CONFIG_PAX_RANDMMAP
99656 + if (mm->pax_flags & MF_PAX_RANDMMAP)
99657 + mm->mmap_base += mm->delta_mmap;
99658 +#endif
99659 +
99660 mm->get_unmapped_area = arch_get_unmapped_area;
99661 }
99662 #endif
99663 @@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99664 if (!mm->arg_end)
99665 goto out_mm; /* Shh! No looking before we're done */
99666
99667 + if (gr_acl_handle_procpidmem(task))
99668 + goto out_mm;
99669 +
99670 len = mm->arg_end - mm->arg_start;
99671
99672 if (len > buflen)
99673 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99674 index 90520af..24231aa 100644
99675 --- a/mm/vmalloc.c
99676 +++ b/mm/vmalloc.c
99677 @@ -40,6 +40,21 @@ struct vfree_deferred {
99678 };
99679 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99680
99681 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99682 +struct stack_deferred_llist {
99683 + struct llist_head list;
99684 + void *stack;
99685 + void *lowmem_stack;
99686 +};
99687 +
99688 +struct stack_deferred {
99689 + struct stack_deferred_llist list;
99690 + struct work_struct wq;
99691 +};
99692 +
99693 +static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99694 +#endif
99695 +
99696 static void __vunmap(const void *, int);
99697
99698 static void free_work(struct work_struct *w)
99699 @@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99700 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99701 struct llist_node *llnode = llist_del_all(&p->list);
99702 while (llnode) {
99703 - void *p = llnode;
99704 + void *x = llnode;
99705 llnode = llist_next(llnode);
99706 - __vunmap(p, 1);
99707 + __vunmap(x, 1);
99708 }
99709 }
99710
99711 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99712 +static void unmap_work(struct work_struct *w)
99713 +{
99714 + struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99715 + struct llist_node *llnode = llist_del_all(&p->list.list);
99716 + while (llnode) {
99717 + struct stack_deferred_llist *x =
99718 + llist_entry((struct llist_head *)llnode,
99719 + struct stack_deferred_llist, list);
99720 + void *stack = ACCESS_ONCE(x->stack);
99721 + void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99722 + llnode = llist_next(llnode);
99723 + __vunmap(stack, 0);
99724 + free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99725 + }
99726 +}
99727 +#endif
99728 +
99729 /*** Page table manipulation functions ***/
99730
99731 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99732 @@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99733
99734 pte = pte_offset_kernel(pmd, addr);
99735 do {
99736 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99737 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99738 +
99739 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99740 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
99741 + BUG_ON(!pte_exec(*pte));
99742 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
99743 + continue;
99744 + }
99745 +#endif
99746 +
99747 + {
99748 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99749 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99750 + }
99751 } while (pte++, addr += PAGE_SIZE, addr != end);
99752 }
99753
99754 @@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
99755 pte = pte_alloc_kernel(pmd, addr);
99756 if (!pte)
99757 return -ENOMEM;
99758 +
99759 + pax_open_kernel();
99760 do {
99761 struct page *page = pages[*nr];
99762
99763 - if (WARN_ON(!pte_none(*pte)))
99764 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99765 + if (pgprot_val(prot) & _PAGE_NX)
99766 +#endif
99767 +
99768 + if (!pte_none(*pte)) {
99769 + pax_close_kernel();
99770 + WARN_ON(1);
99771 return -EBUSY;
99772 - if (WARN_ON(!page))
99773 + }
99774 + if (!page) {
99775 + pax_close_kernel();
99776 + WARN_ON(1);
99777 return -ENOMEM;
99778 + }
99779 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
99780 (*nr)++;
99781 } while (pte++, addr += PAGE_SIZE, addr != end);
99782 + pax_close_kernel();
99783 return 0;
99784 }
99785
99786 @@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
99787 pmd_t *pmd;
99788 unsigned long next;
99789
99790 - pmd = pmd_alloc(&init_mm, pud, addr);
99791 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
99792 if (!pmd)
99793 return -ENOMEM;
99794 do {
99795 @@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
99796 pud_t *pud;
99797 unsigned long next;
99798
99799 - pud = pud_alloc(&init_mm, pgd, addr);
99800 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
99801 if (!pud)
99802 return -ENOMEM;
99803 do {
99804 @@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
99805 if (addr >= MODULES_VADDR && addr < MODULES_END)
99806 return 1;
99807 #endif
99808 +
99809 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99810 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
99811 + return 1;
99812 +#endif
99813 +
99814 return is_vmalloc_addr(x);
99815 }
99816
99817 @@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
99818
99819 if (!pgd_none(*pgd)) {
99820 pud_t *pud = pud_offset(pgd, addr);
99821 +#ifdef CONFIG_X86
99822 + if (!pud_large(*pud))
99823 +#endif
99824 if (!pud_none(*pud)) {
99825 pmd_t *pmd = pmd_offset(pud, addr);
99826 +#ifdef CONFIG_X86
99827 + if (!pmd_large(*pmd))
99828 +#endif
99829 if (!pmd_none(*pmd)) {
99830 pte_t *ptep, pte;
99831
99832 @@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
99833 for_each_possible_cpu(i) {
99834 struct vmap_block_queue *vbq;
99835 struct vfree_deferred *p;
99836 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99837 + struct stack_deferred *p2;
99838 +#endif
99839
99840 vbq = &per_cpu(vmap_block_queue, i);
99841 spin_lock_init(&vbq->lock);
99842 INIT_LIST_HEAD(&vbq->free);
99843 +
99844 p = &per_cpu(vfree_deferred, i);
99845 init_llist_head(&p->list);
99846 INIT_WORK(&p->wq, free_work);
99847 +
99848 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99849 + p2 = &per_cpu(stack_deferred, i);
99850 + init_llist_head(&p2->list.list);
99851 + INIT_WORK(&p2->wq, unmap_work);
99852 +#endif
99853 }
99854
99855 /* Import existing vmlist entries. */
99856 @@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
99857 struct vm_struct *area;
99858
99859 BUG_ON(in_interrupt());
99860 +
99861 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99862 + if (flags & VM_KERNEXEC) {
99863 + if (start != VMALLOC_START || end != VMALLOC_END)
99864 + return NULL;
99865 + start = (unsigned long)MODULES_EXEC_VADDR;
99866 + end = (unsigned long)MODULES_EXEC_END;
99867 + }
99868 +#endif
99869 +
99870 if (flags & VM_IOREMAP)
99871 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
99872
99873 @@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
99874 }
99875 EXPORT_SYMBOL(vunmap);
99876
99877 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99878 +void unmap_process_stacks(struct task_struct *task)
99879 +{
99880 + if (unlikely(in_interrupt())) {
99881 + struct stack_deferred *p = &__get_cpu_var(stack_deferred);
99882 + struct stack_deferred_llist *list = task->stack;
99883 + list->stack = task->stack;
99884 + list->lowmem_stack = task->lowmem_stack;
99885 + if (llist_add((struct llist_node *)&list->list, &p->list.list))
99886 + schedule_work(&p->wq);
99887 + } else {
99888 + __vunmap(task->stack, 0);
99889 + free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
99890 + }
99891 +}
99892 +#endif
99893 +
99894 /**
99895 * vmap - map an array of pages into virtually contiguous space
99896 * @pages: array of page pointers
99897 @@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
99898 if (count > totalram_pages)
99899 return NULL;
99900
99901 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99902 + if (!(pgprot_val(prot) & _PAGE_NX))
99903 + flags |= VM_KERNEXEC;
99904 +#endif
99905 +
99906 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
99907 __builtin_return_address(0));
99908 if (!area)
99909 @@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
99910 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
99911 goto fail;
99912
99913 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99914 + if (!(pgprot_val(prot) & _PAGE_NX))
99915 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
99916 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
99917 + else
99918 +#endif
99919 +
99920 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
99921 start, end, node, gfp_mask, caller);
99922 if (!area)
99923 @@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
99924 * For tight control over page level allocator and protection flags
99925 * use __vmalloc() instead.
99926 */
99927 -
99928 void *vmalloc_exec(unsigned long size)
99929 {
99930 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
99931 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
99932 NUMA_NO_NODE, __builtin_return_address(0));
99933 }
99934
99935 @@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
99936 {
99937 struct vm_struct *area;
99938
99939 + BUG_ON(vma->vm_mirror);
99940 +
99941 size = PAGE_ALIGN(size);
99942
99943 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
99944 @@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
99945 v->addr, v->addr + v->size, v->size);
99946
99947 if (v->caller)
99948 +#ifdef CONFIG_GRKERNSEC_HIDESYM
99949 + seq_printf(m, " %pK", v->caller);
99950 +#else
99951 seq_printf(m, " %pS", v->caller);
99952 +#endif
99953
99954 if (v->nr_pages)
99955 seq_printf(m, " pages=%d", v->nr_pages);
99956 diff --git a/mm/vmstat.c b/mm/vmstat.c
99957 index 1b12d39..57b29b2 100644
99958 --- a/mm/vmstat.c
99959 +++ b/mm/vmstat.c
99960 @@ -22,6 +22,7 @@
99961 #include <linux/writeback.h>
99962 #include <linux/compaction.h>
99963 #include <linux/mm_inline.h>
99964 +#include <linux/grsecurity.h>
99965
99966 #include "internal.h"
99967
99968 @@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
99969 *
99970 * vm_stat contains the global counters
99971 */
99972 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99973 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99974 EXPORT_SYMBOL(vm_stat);
99975
99976 #ifdef CONFIG_SMP
99977 @@ -433,7 +434,7 @@ static int fold_diff(int *diff)
99978
99979 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99980 if (diff[i]) {
99981 - atomic_long_add(diff[i], &vm_stat[i]);
99982 + atomic_long_add_unchecked(diff[i], &vm_stat[i]);
99983 changes++;
99984 }
99985 return changes;
99986 @@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
99987 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
99988 if (v) {
99989
99990 - atomic_long_add(v, &zone->vm_stat[i]);
99991 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99992 global_diff[i] += v;
99993 #ifdef CONFIG_NUMA
99994 /* 3 seconds idle till flush */
99995 @@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
99996
99997 v = p->vm_stat_diff[i];
99998 p->vm_stat_diff[i] = 0;
99999 - atomic_long_add(v, &zone->vm_stat[i]);
100000 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
100001 global_diff[i] += v;
100002 }
100003 }
100004 @@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
100005 if (pset->vm_stat_diff[i]) {
100006 int v = pset->vm_stat_diff[i];
100007 pset->vm_stat_diff[i] = 0;
100008 - atomic_long_add(v, &zone->vm_stat[i]);
100009 - atomic_long_add(v, &vm_stat[i]);
100010 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
100011 + atomic_long_add_unchecked(v, &vm_stat[i]);
100012 }
100013 }
100014 #endif
100015 @@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
100016 stat_items_size += sizeof(struct vm_event_state);
100017 #endif
100018
100019 - v = kmalloc(stat_items_size, GFP_KERNEL);
100020 + v = kzalloc(stat_items_size, GFP_KERNEL);
100021 m->private = v;
100022 if (!v)
100023 return ERR_PTR(-ENOMEM);
100024 +
100025 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
100026 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
100027 + if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
100028 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
100029 + && !in_group_p(grsec_proc_gid)
100030 +#endif
100031 + )
100032 + return (unsigned long *)m->private + *pos;
100033 +#endif
100034 +#endif
100035 +
100036 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
100037 v[i] = global_page_state(i);
100038 v += NR_VM_ZONE_STAT_ITEMS;
100039 @@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
100040 cpu_notifier_register_done();
100041 #endif
100042 #ifdef CONFIG_PROC_FS
100043 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
100044 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
100045 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
100046 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
100047 + {
100048 + mode_t gr_mode = S_IRUGO;
100049 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
100050 + gr_mode = S_IRUSR;
100051 +#endif
100052 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
100053 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
100054 + proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
100055 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
100056 + }
100057 #endif
100058 return 0;
100059 }
100060 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
100061 index 64c6bed..b79a5de 100644
100062 --- a/net/8021q/vlan.c
100063 +++ b/net/8021q/vlan.c
100064 @@ -481,7 +481,7 @@ out:
100065 return NOTIFY_DONE;
100066 }
100067
100068 -static struct notifier_block vlan_notifier_block __read_mostly = {
100069 +static struct notifier_block vlan_notifier_block = {
100070 .notifier_call = vlan_device_event,
100071 };
100072
100073 @@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
100074 err = -EPERM;
100075 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
100076 break;
100077 - if ((args.u.name_type >= 0) &&
100078 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
100079 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
100080 struct vlan_net *vn;
100081
100082 vn = net_generic(net, vlan_net_id);
100083 diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
100084 index 8ac8a5c..991defc 100644
100085 --- a/net/8021q/vlan_netlink.c
100086 +++ b/net/8021q/vlan_netlink.c
100087 @@ -238,7 +238,7 @@ nla_put_failure:
100088 return -EMSGSIZE;
100089 }
100090
100091 -struct rtnl_link_ops vlan_link_ops __read_mostly = {
100092 +struct rtnl_link_ops vlan_link_ops = {
100093 .kind = "vlan",
100094 .maxtype = IFLA_VLAN_MAX,
100095 .policy = vlan_policy,
100096 diff --git a/net/9p/client.c b/net/9p/client.c
100097 index e86a9bea..e91f70e 100644
100098 --- a/net/9p/client.c
100099 +++ b/net/9p/client.c
100100 @@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
100101 len - inline_len);
100102 } else {
100103 err = copy_from_user(ename + inline_len,
100104 - uidata, len - inline_len);
100105 + (char __force_user *)uidata, len - inline_len);
100106 if (err) {
100107 err = -EFAULT;
100108 goto out_err;
100109 @@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
100110 kernel_buf = 1;
100111 indata = data;
100112 } else
100113 - indata = (__force char *)udata;
100114 + indata = (__force_kernel char *)udata;
100115 /*
100116 * response header len is 11
100117 * PDU Header(7) + IO Size (4)
100118 @@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
100119 kernel_buf = 1;
100120 odata = data;
100121 } else
100122 - odata = (char *)udata;
100123 + odata = (char __force_kernel *)udata;
100124 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
100125 P9_ZC_HDR_SZ, kernel_buf, "dqd",
100126 fid->fid, offset, rsize);
100127 diff --git a/net/9p/mod.c b/net/9p/mod.c
100128 index 6ab36ae..6f1841b 100644
100129 --- a/net/9p/mod.c
100130 +++ b/net/9p/mod.c
100131 @@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
100132 void v9fs_register_trans(struct p9_trans_module *m)
100133 {
100134 spin_lock(&v9fs_trans_lock);
100135 - list_add_tail(&m->list, &v9fs_trans_list);
100136 + pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
100137 spin_unlock(&v9fs_trans_lock);
100138 }
100139 EXPORT_SYMBOL(v9fs_register_trans);
100140 @@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
100141 void v9fs_unregister_trans(struct p9_trans_module *m)
100142 {
100143 spin_lock(&v9fs_trans_lock);
100144 - list_del_init(&m->list);
100145 + pax_list_del_init((struct list_head *)&m->list);
100146 spin_unlock(&v9fs_trans_lock);
100147 }
100148 EXPORT_SYMBOL(v9fs_unregister_trans);
100149 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
100150 index 80d08f6..de63fd1 100644
100151 --- a/net/9p/trans_fd.c
100152 +++ b/net/9p/trans_fd.c
100153 @@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
100154 oldfs = get_fs();
100155 set_fs(get_ds());
100156 /* The cast to a user pointer is valid due to the set_fs() */
100157 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
100158 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
100159 set_fs(oldfs);
100160
100161 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
100162 diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
100163 index af46bc4..f9adfcd 100644
100164 --- a/net/appletalk/atalk_proc.c
100165 +++ b/net/appletalk/atalk_proc.c
100166 @@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
100167 struct proc_dir_entry *p;
100168 int rc = -ENOMEM;
100169
100170 - atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
100171 + atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
100172 if (!atalk_proc_dir)
100173 goto out;
100174
100175 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
100176 index 876fbe8..8bbea9f 100644
100177 --- a/net/atm/atm_misc.c
100178 +++ b/net/atm/atm_misc.c
100179 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
100180 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
100181 return 1;
100182 atm_return(vcc, truesize);
100183 - atomic_inc(&vcc->stats->rx_drop);
100184 + atomic_inc_unchecked(&vcc->stats->rx_drop);
100185 return 0;
100186 }
100187 EXPORT_SYMBOL(atm_charge);
100188 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
100189 }
100190 }
100191 atm_return(vcc, guess);
100192 - atomic_inc(&vcc->stats->rx_drop);
100193 + atomic_inc_unchecked(&vcc->stats->rx_drop);
100194 return NULL;
100195 }
100196 EXPORT_SYMBOL(atm_alloc_charge);
100197 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
100198
100199 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100200 {
100201 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100202 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100203 __SONET_ITEMS
100204 #undef __HANDLE_ITEM
100205 }
100206 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
100207
100208 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100209 {
100210 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100211 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
100212 __SONET_ITEMS
100213 #undef __HANDLE_ITEM
100214 }
100215 diff --git a/net/atm/lec.c b/net/atm/lec.c
100216 index 4b98f89..5a2f6cb 100644
100217 --- a/net/atm/lec.c
100218 +++ b/net/atm/lec.c
100219 @@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
100220 }
100221
100222 static struct lane2_ops lane2_ops = {
100223 - lane2_resolve, /* resolve, spec 3.1.3 */
100224 - lane2_associate_req, /* associate_req, spec 3.1.4 */
100225 - NULL /* associate indicator, spec 3.1.5 */
100226 + .resolve = lane2_resolve,
100227 + .associate_req = lane2_associate_req,
100228 + .associate_indicator = NULL
100229 };
100230
100231 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100232 diff --git a/net/atm/lec.h b/net/atm/lec.h
100233 index 4149db1..f2ab682 100644
100234 --- a/net/atm/lec.h
100235 +++ b/net/atm/lec.h
100236 @@ -48,7 +48,7 @@ struct lane2_ops {
100237 const u8 *tlvs, u32 sizeoftlvs);
100238 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100239 const u8 *tlvs, u32 sizeoftlvs);
100240 -};
100241 +} __no_const;
100242
100243 /*
100244 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100245 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100246 index d1b2d9a..d549f7f 100644
100247 --- a/net/atm/mpoa_caches.c
100248 +++ b/net/atm/mpoa_caches.c
100249 @@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100250
100251
100252 static struct in_cache_ops ingress_ops = {
100253 - in_cache_add_entry, /* add_entry */
100254 - in_cache_get, /* get */
100255 - in_cache_get_with_mask, /* get_with_mask */
100256 - in_cache_get_by_vcc, /* get_by_vcc */
100257 - in_cache_put, /* put */
100258 - in_cache_remove_entry, /* remove_entry */
100259 - cache_hit, /* cache_hit */
100260 - clear_count_and_expired, /* clear_count */
100261 - check_resolving_entries, /* check_resolving */
100262 - refresh_entries, /* refresh */
100263 - in_destroy_cache /* destroy_cache */
100264 + .add_entry = in_cache_add_entry,
100265 + .get = in_cache_get,
100266 + .get_with_mask = in_cache_get_with_mask,
100267 + .get_by_vcc = in_cache_get_by_vcc,
100268 + .put = in_cache_put,
100269 + .remove_entry = in_cache_remove_entry,
100270 + .cache_hit = cache_hit,
100271 + .clear_count = clear_count_and_expired,
100272 + .check_resolving = check_resolving_entries,
100273 + .refresh = refresh_entries,
100274 + .destroy_cache = in_destroy_cache
100275 };
100276
100277 static struct eg_cache_ops egress_ops = {
100278 - eg_cache_add_entry, /* add_entry */
100279 - eg_cache_get_by_cache_id, /* get_by_cache_id */
100280 - eg_cache_get_by_tag, /* get_by_tag */
100281 - eg_cache_get_by_vcc, /* get_by_vcc */
100282 - eg_cache_get_by_src_ip, /* get_by_src_ip */
100283 - eg_cache_put, /* put */
100284 - eg_cache_remove_entry, /* remove_entry */
100285 - update_eg_cache_entry, /* update */
100286 - clear_expired, /* clear_expired */
100287 - eg_destroy_cache /* destroy_cache */
100288 + .add_entry = eg_cache_add_entry,
100289 + .get_by_cache_id = eg_cache_get_by_cache_id,
100290 + .get_by_tag = eg_cache_get_by_tag,
100291 + .get_by_vcc = eg_cache_get_by_vcc,
100292 + .get_by_src_ip = eg_cache_get_by_src_ip,
100293 + .put = eg_cache_put,
100294 + .remove_entry = eg_cache_remove_entry,
100295 + .update = update_eg_cache_entry,
100296 + .clear_expired = clear_expired,
100297 + .destroy_cache = eg_destroy_cache
100298 };
100299
100300
100301 diff --git a/net/atm/proc.c b/net/atm/proc.c
100302 index bbb6461..cf04016 100644
100303 --- a/net/atm/proc.c
100304 +++ b/net/atm/proc.c
100305 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100306 const struct k_atm_aal_stats *stats)
100307 {
100308 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100309 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100310 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100311 - atomic_read(&stats->rx_drop));
100312 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100313 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100314 + atomic_read_unchecked(&stats->rx_drop));
100315 }
100316
100317 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100318 diff --git a/net/atm/resources.c b/net/atm/resources.c
100319 index 0447d5d..3cf4728 100644
100320 --- a/net/atm/resources.c
100321 +++ b/net/atm/resources.c
100322 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100323 static void copy_aal_stats(struct k_atm_aal_stats *from,
100324 struct atm_aal_stats *to)
100325 {
100326 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100327 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100328 __AAL_STAT_ITEMS
100329 #undef __HANDLE_ITEM
100330 }
100331 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100332 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100333 struct atm_aal_stats *to)
100334 {
100335 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100336 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100337 __AAL_STAT_ITEMS
100338 #undef __HANDLE_ITEM
100339 }
100340 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100341 index 919a5ce..cc6b444 100644
100342 --- a/net/ax25/sysctl_net_ax25.c
100343 +++ b/net/ax25/sysctl_net_ax25.c
100344 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100345 {
100346 char path[sizeof("net/ax25/") + IFNAMSIZ];
100347 int k;
100348 - struct ctl_table *table;
100349 + ctl_table_no_const *table;
100350
100351 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100352 if (!table)
100353 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100354 index 1e80539..676c37a 100644
100355 --- a/net/batman-adv/bat_iv_ogm.c
100356 +++ b/net/batman-adv/bat_iv_ogm.c
100357 @@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100358
100359 /* randomize initial seqno to avoid collision */
100360 get_random_bytes(&random_seqno, sizeof(random_seqno));
100361 - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100362 + atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100363
100364 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100365 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100366 @@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100367 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100368
100369 /* change sequence number to network order */
100370 - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100371 + seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100372 batadv_ogm_packet->seqno = htonl(seqno);
100373 - atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100374 + atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100375
100376 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100377
100378 @@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100379 return;
100380
100381 /* could be changed by schedule_own_packet() */
100382 - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100383 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100384
100385 if (ogm_packet->flags & BATADV_DIRECTLINK)
100386 has_directlink_flag = true;
100387 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100388 index fc1835c..42f2c2f 100644
100389 --- a/net/batman-adv/fragmentation.c
100390 +++ b/net/batman-adv/fragmentation.c
100391 @@ -251,7 +251,7 @@ batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb)
100392 kfree(entry);
100393
100394 /* Make room for the rest of the fragments. */
100395 - if (pskb_expand_head(skb_out, 0, size - skb->len, GFP_ATOMIC) < 0) {
100396 + if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) {
100397 kfree_skb(skb_out);
100398 skb_out = NULL;
100399 goto free;
100400 @@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100401 frag_header.packet_type = BATADV_UNICAST_FRAG;
100402 frag_header.version = BATADV_COMPAT_VERSION;
100403 frag_header.ttl = BATADV_TTL;
100404 - frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100405 + frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100406 frag_header.reserved = 0;
100407 frag_header.no = 0;
100408 frag_header.total_size = htons(skb->len);
100409 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100410 index 5467955..75ad4e3 100644
100411 --- a/net/batman-adv/soft-interface.c
100412 +++ b/net/batman-adv/soft-interface.c
100413 @@ -296,7 +296,7 @@ send:
100414 primary_if->net_dev->dev_addr);
100415
100416 /* set broadcast sequence number */
100417 - seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100418 + seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100419 bcast_packet->seqno = htonl(seqno);
100420
100421 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100422 @@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100423 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100424
100425 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100426 - atomic_set(&bat_priv->bcast_seqno, 1);
100427 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100428 atomic_set(&bat_priv->tt.vn, 0);
100429 atomic_set(&bat_priv->tt.local_changes, 0);
100430 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100431 @@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100432
100433 /* randomize initial seqno to avoid collision */
100434 get_random_bytes(&random_seqno, sizeof(random_seqno));
100435 - atomic_set(&bat_priv->frag_seqno, random_seqno);
100436 + atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100437
100438 bat_priv->primary_if = NULL;
100439 bat_priv->num_ifaces = 0;
100440 @@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100441 return 0;
100442 }
100443
100444 -struct rtnl_link_ops batadv_link_ops __read_mostly = {
100445 +struct rtnl_link_ops batadv_link_ops = {
100446 .kind = "batadv",
100447 .priv_size = sizeof(struct batadv_priv),
100448 .setup = batadv_softif_init_early,
100449 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100450 index 8854c05..ee5d5497 100644
100451 --- a/net/batman-adv/types.h
100452 +++ b/net/batman-adv/types.h
100453 @@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100454 struct batadv_hard_iface_bat_iv {
100455 unsigned char *ogm_buff;
100456 int ogm_buff_len;
100457 - atomic_t ogm_seqno;
100458 + atomic_unchecked_t ogm_seqno;
100459 };
100460
100461 /**
100462 @@ -768,7 +768,7 @@ struct batadv_priv {
100463 atomic_t bonding;
100464 atomic_t fragmentation;
100465 atomic_t packet_size_max;
100466 - atomic_t frag_seqno;
100467 + atomic_unchecked_t frag_seqno;
100468 #ifdef CONFIG_BATMAN_ADV_BLA
100469 atomic_t bridge_loop_avoidance;
100470 #endif
100471 @@ -787,7 +787,7 @@ struct batadv_priv {
100472 #endif
100473 uint32_t isolation_mark;
100474 uint32_t isolation_mark_mask;
100475 - atomic_t bcast_seqno;
100476 + atomic_unchecked_t bcast_seqno;
100477 atomic_t bcast_queue_left;
100478 atomic_t batman_queue_left;
100479 char num_ifaces;
100480 diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100481 index cfbb39e..0bbfc9d 100644
100482 --- a/net/bluetooth/6lowpan.c
100483 +++ b/net/bluetooth/6lowpan.c
100484 @@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100485
100486 drop:
100487 dev->stats.rx_dropped++;
100488 - kfree_skb(skb);
100489 return NET_RX_DROP;
100490 }
100491
100492 diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100493 index 85bcc21..ce82722d 100644
100494 --- a/net/bluetooth/bnep/core.c
100495 +++ b/net/bluetooth/bnep/core.c
100496 @@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100497
100498 BT_DBG("");
100499
100500 + if (!l2cap_is_socket(sock))
100501 + return -EBADFD;
100502 +
100503 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100504 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100505
100506 diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100507 index 67fe5e8..278a194 100644
100508 --- a/net/bluetooth/cmtp/core.c
100509 +++ b/net/bluetooth/cmtp/core.c
100510 @@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100511
100512 BT_DBG("");
100513
100514 + if (!l2cap_is_socket(sock))
100515 + return -EBADFD;
100516 +
100517 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100518 if (!session)
100519 return -ENOMEM;
100520 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100521 index 115f149..f0ba286 100644
100522 --- a/net/bluetooth/hci_sock.c
100523 +++ b/net/bluetooth/hci_sock.c
100524 @@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100525 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100526 }
100527
100528 - len = min_t(unsigned int, len, sizeof(uf));
100529 + len = min((size_t)len, sizeof(uf));
100530 if (copy_from_user(&uf, optval, len)) {
100531 err = -EFAULT;
100532 break;
100533 diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100534 index 1b7d605..02ebd10 100644
100535 --- a/net/bluetooth/hidp/core.c
100536 +++ b/net/bluetooth/hidp/core.c
100537 @@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100538 {
100539 struct hidp_session *session;
100540 struct l2cap_conn *conn;
100541 - struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100542 + struct l2cap_chan *chan;
100543 int ret;
100544
100545 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100546 if (ret)
100547 return ret;
100548
100549 + chan = l2cap_pi(ctrl_sock->sk)->chan;
100550 conn = NULL;
100551 l2cap_chan_lock(chan);
100552 if (chan->conn)
100553 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100554 index b6f9777..36d3039 100644
100555 --- a/net/bluetooth/l2cap_core.c
100556 +++ b/net/bluetooth/l2cap_core.c
100557 @@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100558 break;
100559
100560 case L2CAP_CONF_RFC:
100561 - if (olen == sizeof(rfc))
100562 - memcpy(&rfc, (void *)val, olen);
100563 + if (olen != sizeof(rfc))
100564 + break;
100565 +
100566 + memcpy(&rfc, (void *)val, olen);
100567
100568 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100569 rfc.mode != chan->mode)
100570 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100571 index 31f106e..323f606 100644
100572 --- a/net/bluetooth/l2cap_sock.c
100573 +++ b/net/bluetooth/l2cap_sock.c
100574 @@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100575 struct sock *sk = sock->sk;
100576 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100577 struct l2cap_options opts;
100578 - int len, err = 0;
100579 + int err = 0;
100580 + size_t len = optlen;
100581 u32 opt;
100582
100583 BT_DBG("sk %p", sk);
100584 @@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100585 opts.max_tx = chan->max_tx;
100586 opts.txwin_size = chan->tx_win;
100587
100588 - len = min_t(unsigned int, sizeof(opts), optlen);
100589 + len = min(sizeof(opts), len);
100590 if (copy_from_user((char *) &opts, optval, len)) {
100591 err = -EFAULT;
100592 break;
100593 @@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100594 struct bt_security sec;
100595 struct bt_power pwr;
100596 struct l2cap_conn *conn;
100597 - int len, err = 0;
100598 + int err = 0;
100599 + size_t len = optlen;
100600 u32 opt;
100601
100602 BT_DBG("sk %p", sk);
100603 @@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100604
100605 sec.level = BT_SECURITY_LOW;
100606
100607 - len = min_t(unsigned int, sizeof(sec), optlen);
100608 + len = min(sizeof(sec), len);
100609 if (copy_from_user((char *) &sec, optval, len)) {
100610 err = -EFAULT;
100611 break;
100612 @@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100613
100614 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100615
100616 - len = min_t(unsigned int, sizeof(pwr), optlen);
100617 + len = min(sizeof(pwr), len);
100618 if (copy_from_user((char *) &pwr, optval, len)) {
100619 err = -EFAULT;
100620 break;
100621 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100622 index 8bbbb5e..6fc0950 100644
100623 --- a/net/bluetooth/rfcomm/sock.c
100624 +++ b/net/bluetooth/rfcomm/sock.c
100625 @@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100626 struct sock *sk = sock->sk;
100627 struct bt_security sec;
100628 int err = 0;
100629 - size_t len;
100630 + size_t len = optlen;
100631 u32 opt;
100632
100633 BT_DBG("sk %p", sk);
100634 @@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100635
100636 sec.level = BT_SECURITY_LOW;
100637
100638 - len = min_t(unsigned int, sizeof(sec), optlen);
100639 + len = min(sizeof(sec), len);
100640 if (copy_from_user((char *) &sec, optval, len)) {
100641 err = -EFAULT;
100642 break;
100643 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100644 index 8e385a0..a5bdd8e 100644
100645 --- a/net/bluetooth/rfcomm/tty.c
100646 +++ b/net/bluetooth/rfcomm/tty.c
100647 @@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100648 BT_DBG("tty %p id %d", tty, tty->index);
100649
100650 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100651 - dev->channel, dev->port.count);
100652 + dev->channel, atomic_read(&dev->port.count));
100653
100654 err = tty_port_open(&dev->port, tty, filp);
100655 if (err)
100656 @@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100657 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100658
100659 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100660 - dev->port.count);
100661 + atomic_read(&dev->port.count));
100662
100663 tty_port_close(&dev->port, tty, filp);
100664 }
100665 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100666 index e5ec470..cbfabd1 100644
100667 --- a/net/bridge/br_netlink.c
100668 +++ b/net/bridge/br_netlink.c
100669 @@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100670 .get_link_af_size = br_get_link_af_size,
100671 };
100672
100673 -struct rtnl_link_ops br_link_ops __read_mostly = {
100674 +struct rtnl_link_ops br_link_ops = {
100675 .kind = "bridge",
100676 .priv_size = sizeof(struct net_bridge),
100677 .setup = br_dev_setup,
100678 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100679 index d9a8c05..8dadc6c6 100644
100680 --- a/net/bridge/netfilter/ebtables.c
100681 +++ b/net/bridge/netfilter/ebtables.c
100682 @@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100683 tmp.valid_hooks = t->table->valid_hooks;
100684 }
100685 mutex_unlock(&ebt_mutex);
100686 - if (copy_to_user(user, &tmp, *len) != 0) {
100687 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100688 BUGPRINT("c2u Didn't work\n");
100689 ret = -EFAULT;
100690 break;
100691 @@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100692 goto out;
100693 tmp.valid_hooks = t->valid_hooks;
100694
100695 - if (copy_to_user(user, &tmp, *len) != 0) {
100696 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100697 ret = -EFAULT;
100698 break;
100699 }
100700 @@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100701 tmp.entries_size = t->table->entries_size;
100702 tmp.valid_hooks = t->table->valid_hooks;
100703
100704 - if (copy_to_user(user, &tmp, *len) != 0) {
100705 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100706 ret = -EFAULT;
100707 break;
100708 }
100709 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100710 index f5afda1..dcf770a 100644
100711 --- a/net/caif/cfctrl.c
100712 +++ b/net/caif/cfctrl.c
100713 @@ -10,6 +10,7 @@
100714 #include <linux/spinlock.h>
100715 #include <linux/slab.h>
100716 #include <linux/pkt_sched.h>
100717 +#include <linux/sched.h>
100718 #include <net/caif/caif_layer.h>
100719 #include <net/caif/cfpkt.h>
100720 #include <net/caif/cfctrl.h>
100721 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100722 memset(&dev_info, 0, sizeof(dev_info));
100723 dev_info.id = 0xff;
100724 cfsrvl_init(&this->serv, 0, &dev_info, false);
100725 - atomic_set(&this->req_seq_no, 1);
100726 - atomic_set(&this->rsp_seq_no, 1);
100727 + atomic_set_unchecked(&this->req_seq_no, 1);
100728 + atomic_set_unchecked(&this->rsp_seq_no, 1);
100729 this->serv.layer.receive = cfctrl_recv;
100730 sprintf(this->serv.layer.name, "ctrl");
100731 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100732 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100733 struct cfctrl_request_info *req)
100734 {
100735 spin_lock_bh(&ctrl->info_list_lock);
100736 - atomic_inc(&ctrl->req_seq_no);
100737 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
100738 + atomic_inc_unchecked(&ctrl->req_seq_no);
100739 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
100740 list_add_tail(&req->list, &ctrl->list);
100741 spin_unlock_bh(&ctrl->info_list_lock);
100742 }
100743 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
100744 if (p != first)
100745 pr_warn("Requests are not received in order\n");
100746
100747 - atomic_set(&ctrl->rsp_seq_no,
100748 + atomic_set_unchecked(&ctrl->rsp_seq_no,
100749 p->sequence_no);
100750 list_del(&p->list);
100751 goto out;
100752 diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
100753 index 4589ff67..46d6b8f 100644
100754 --- a/net/caif/chnl_net.c
100755 +++ b/net/caif/chnl_net.c
100756 @@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
100757 };
100758
100759
100760 -static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
100761 +static struct rtnl_link_ops ipcaif_link_ops = {
100762 .kind = "caif",
100763 .priv_size = sizeof(struct chnl_net),
100764 .setup = ipcaif_net_setup,
100765 diff --git a/net/can/af_can.c b/net/can/af_can.c
100766 index ce82337..5d17b4d 100644
100767 --- a/net/can/af_can.c
100768 +++ b/net/can/af_can.c
100769 @@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
100770 };
100771
100772 /* notifier block for netdevice event */
100773 -static struct notifier_block can_netdev_notifier __read_mostly = {
100774 +static struct notifier_block can_netdev_notifier = {
100775 .notifier_call = can_notifier,
100776 };
100777
100778 diff --git a/net/can/bcm.c b/net/can/bcm.c
100779 index dcb75c0..24b1b43 100644
100780 --- a/net/can/bcm.c
100781 +++ b/net/can/bcm.c
100782 @@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
100783 }
100784
100785 /* create /proc/net/can-bcm directory */
100786 - proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
100787 + proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
100788 return 0;
100789 }
100790
100791 diff --git a/net/can/gw.c b/net/can/gw.c
100792 index 050a211..bb9fe33 100644
100793 --- a/net/can/gw.c
100794 +++ b/net/can/gw.c
100795 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
100796 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
100797
100798 static HLIST_HEAD(cgw_list);
100799 -static struct notifier_block notifier;
100800
100801 static struct kmem_cache *cgw_cache __read_mostly;
100802
100803 @@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
100804 return err;
100805 }
100806
100807 +static struct notifier_block notifier = {
100808 + .notifier_call = cgw_notifier
100809 +};
100810 +
100811 static __init int cgw_module_init(void)
100812 {
100813 /* sanitize given module parameter */
100814 @@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
100815 return -ENOMEM;
100816
100817 /* set notifier */
100818 - notifier.notifier_call = cgw_notifier;
100819 register_netdevice_notifier(&notifier);
100820
100821 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
100822 diff --git a/net/can/proc.c b/net/can/proc.c
100823 index 1a19b98..df2b4ec 100644
100824 --- a/net/can/proc.c
100825 +++ b/net/can/proc.c
100826 @@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
100827 void can_init_proc(void)
100828 {
100829 /* create /proc/net/can directory */
100830 - can_dir = proc_mkdir("can", init_net.proc_net);
100831 + can_dir = proc_mkdir_restrict("can", init_net.proc_net);
100832
100833 if (!can_dir) {
100834 printk(KERN_INFO "can: failed to create /proc/net/can . "
100835 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
100836 index 8d1653c..77ad145 100644
100837 --- a/net/ceph/messenger.c
100838 +++ b/net/ceph/messenger.c
100839 @@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
100840 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
100841
100842 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
100843 -static atomic_t addr_str_seq = ATOMIC_INIT(0);
100844 +static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
100845
100846 static struct page *zero_page; /* used in certain error cases */
100847
100848 @@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
100849 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
100850 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
100851
100852 - i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100853 + i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100854 s = addr_str[i];
100855
100856 switch (ss->ss_family) {
100857 diff --git a/net/compat.c b/net/compat.c
100858 index bc8aeef..f9c070c 100644
100859 --- a/net/compat.c
100860 +++ b/net/compat.c
100861 @@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
100862 return -EFAULT;
100863 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
100864 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
100865 - kmsg->msg_name = compat_ptr(tmp1);
100866 - kmsg->msg_iov = compat_ptr(tmp2);
100867 - kmsg->msg_control = compat_ptr(tmp3);
100868 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
100869 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
100870 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
100871 return 0;
100872 }
100873
100874 @@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100875
100876 if (kern_msg->msg_name && kern_msg->msg_namelen) {
100877 if (mode == VERIFY_READ) {
100878 - int err = move_addr_to_kernel(kern_msg->msg_name,
100879 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
100880 kern_msg->msg_namelen,
100881 kern_address);
100882 if (err < 0)
100883 @@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100884 }
100885
100886 tot_len = iov_from_user_compat_to_kern(kern_iov,
100887 - (struct compat_iovec __user *)kern_msg->msg_iov,
100888 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
100889 kern_msg->msg_iovlen);
100890 if (tot_len >= 0)
100891 kern_msg->msg_iov = kern_iov;
100892 @@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100893
100894 #define CMSG_COMPAT_FIRSTHDR(msg) \
100895 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
100896 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
100897 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
100898 (struct compat_cmsghdr __user *)NULL)
100899
100900 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
100901 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
100902 (ucmlen) <= (unsigned long) \
100903 ((mhdr)->msg_controllen - \
100904 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
100905 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
100906
100907 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
100908 struct compat_cmsghdr __user *cmsg, int cmsg_len)
100909 {
100910 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
100911 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
100912 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
100913 msg->msg_controllen)
100914 return NULL;
100915 return (struct compat_cmsghdr __user *)ptr;
100916 @@ -223,7 +223,7 @@ Efault:
100917
100918 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
100919 {
100920 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100921 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100922 struct compat_cmsghdr cmhdr;
100923 struct compat_timeval ctv;
100924 struct compat_timespec cts[3];
100925 @@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
100926
100927 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
100928 {
100929 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100930 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100931 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
100932 int fdnum = scm->fp->count;
100933 struct file **fp = scm->fp->fp;
100934 @@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
100935 return -EFAULT;
100936 old_fs = get_fs();
100937 set_fs(KERNEL_DS);
100938 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
100939 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
100940 set_fs(old_fs);
100941
100942 return err;
100943 @@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
100944 len = sizeof(ktime);
100945 old_fs = get_fs();
100946 set_fs(KERNEL_DS);
100947 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
100948 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
100949 set_fs(old_fs);
100950
100951 if (!err) {
100952 @@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100953 case MCAST_JOIN_GROUP:
100954 case MCAST_LEAVE_GROUP:
100955 {
100956 - struct compat_group_req __user *gr32 = (void *)optval;
100957 + struct compat_group_req __user *gr32 = (void __user *)optval;
100958 struct group_req __user *kgr =
100959 compat_alloc_user_space(sizeof(struct group_req));
100960 u32 interface;
100961 @@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100962 case MCAST_BLOCK_SOURCE:
100963 case MCAST_UNBLOCK_SOURCE:
100964 {
100965 - struct compat_group_source_req __user *gsr32 = (void *)optval;
100966 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
100967 struct group_source_req __user *kgsr = compat_alloc_user_space(
100968 sizeof(struct group_source_req));
100969 u32 interface;
100970 @@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100971 }
100972 case MCAST_MSFILTER:
100973 {
100974 - struct compat_group_filter __user *gf32 = (void *)optval;
100975 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100976 struct group_filter __user *kgf;
100977 u32 interface, fmode, numsrc;
100978
100979 @@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
100980 char __user *optval, int __user *optlen,
100981 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
100982 {
100983 - struct compat_group_filter __user *gf32 = (void *)optval;
100984 + struct compat_group_filter __user *gf32 = (void __user *)optval;
100985 struct group_filter __user *kgf;
100986 int __user *koptlen;
100987 u32 interface, fmode, numsrc;
100988 @@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
100989
100990 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
100991 return -EINVAL;
100992 - if (copy_from_user(a, args, nas[call]))
100993 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
100994 return -EFAULT;
100995 a0 = a[0];
100996 a1 = a[1];
100997 diff --git a/net/core/datagram.c b/net/core/datagram.c
100998 index fdbc9a8..cd6972c 100644
100999 --- a/net/core/datagram.c
101000 +++ b/net/core/datagram.c
101001 @@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
101002 }
101003
101004 kfree_skb(skb);
101005 - atomic_inc(&sk->sk_drops);
101006 + atomic_inc_unchecked(&sk->sk_drops);
101007 sk_mem_reclaim_partial(sk);
101008
101009 return err;
101010 diff --git a/net/core/dev.c b/net/core/dev.c
101011 index 945bbd0..8b1a370 100644
101012 --- a/net/core/dev.c
101013 +++ b/net/core/dev.c
101014 @@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
101015 {
101016 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
101017 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
101018 - atomic_long_inc(&dev->rx_dropped);
101019 + atomic_long_inc_unchecked(&dev->rx_dropped);
101020 kfree_skb(skb);
101021 return NET_RX_DROP;
101022 }
101023 }
101024
101025 if (unlikely(!is_skb_forwardable(dev, skb))) {
101026 - atomic_long_inc(&dev->rx_dropped);
101027 + atomic_long_inc_unchecked(&dev->rx_dropped);
101028 kfree_skb(skb);
101029 return NET_RX_DROP;
101030 }
101031 @@ -2985,7 +2985,7 @@ recursion_alert:
101032 drop:
101033 rcu_read_unlock_bh();
101034
101035 - atomic_long_inc(&dev->tx_dropped);
101036 + atomic_long_inc_unchecked(&dev->tx_dropped);
101037 kfree_skb_list(skb);
101038 return rc;
101039 out:
101040 @@ -3328,7 +3328,7 @@ enqueue:
101041
101042 local_irq_restore(flags);
101043
101044 - atomic_long_inc(&skb->dev->rx_dropped);
101045 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
101046 kfree_skb(skb);
101047 return NET_RX_DROP;
101048 }
101049 @@ -3405,7 +3405,7 @@ int netif_rx_ni(struct sk_buff *skb)
101050 }
101051 EXPORT_SYMBOL(netif_rx_ni);
101052
101053 -static void net_tx_action(struct softirq_action *h)
101054 +static __latent_entropy void net_tx_action(void)
101055 {
101056 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
101057
101058 @@ -3738,7 +3738,7 @@ ncls:
101059 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
101060 } else {
101061 drop:
101062 - atomic_long_inc(&skb->dev->rx_dropped);
101063 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
101064 kfree_skb(skb);
101065 /* Jamal, now you will not able to escape explaining
101066 * me how you were going to use this. :-)
101067 @@ -4502,7 +4502,7 @@ void netif_napi_del(struct napi_struct *napi)
101068 }
101069 EXPORT_SYMBOL(netif_napi_del);
101070
101071 -static void net_rx_action(struct softirq_action *h)
101072 +static __latent_entropy void net_rx_action(void)
101073 {
101074 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
101075 unsigned long time_limit = jiffies + 2;
101076 @@ -6548,8 +6548,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
101077 } else {
101078 netdev_stats_to_stats64(storage, &dev->stats);
101079 }
101080 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
101081 - storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
101082 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
101083 + storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
101084 return storage;
101085 }
101086 EXPORT_SYMBOL(dev_get_stats);
101087 diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
101088 index 72e899a..79a9409 100644
101089 --- a/net/core/dev_ioctl.c
101090 +++ b/net/core/dev_ioctl.c
101091 @@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
101092 no_module = !dev;
101093 if (no_module && capable(CAP_NET_ADMIN))
101094 no_module = request_module("netdev-%s", name);
101095 - if (no_module && capable(CAP_SYS_MODULE))
101096 + if (no_module && capable(CAP_SYS_MODULE)) {
101097 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
101098 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
101099 +#else
101100 request_module("%s", name);
101101 +#endif
101102 + }
101103 }
101104 EXPORT_SYMBOL(dev_load);
101105
101106 diff --git a/net/core/filter.c b/net/core/filter.c
101107 index 647b122..18a7ff6 100644
101108 --- a/net/core/filter.c
101109 +++ b/net/core/filter.c
101110 @@ -532,7 +532,11 @@ do_pass:
101111
101112 /* Unkown instruction. */
101113 default:
101114 - goto err;
101115 + WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
101116 + fp->code, fp->jt, fp->jf, fp->k);
101117 + kfree(addrs);
101118 + BUG();
101119 + return -EINVAL;
101120 }
101121
101122 insn++;
101123 @@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
101124 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
101125 int pc, ret = 0;
101126
101127 - BUILD_BUG_ON(BPF_MEMWORDS > 16);
101128 + BUILD_BUG_ON(BPF_MEMWORDS != 16);
101129
101130 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
101131 if (!masks)
101132 @@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
101133 if (!fp)
101134 return -ENOMEM;
101135
101136 - memcpy(fp->insns, fprog->filter, fsize);
101137 + memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
101138
101139 fp->len = fprog->len;
101140 /* Since unattached filters are not copied back to user
101141 diff --git a/net/core/flow.c b/net/core/flow.c
101142 index a0348fd..6951c76 100644
101143 --- a/net/core/flow.c
101144 +++ b/net/core/flow.c
101145 @@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
101146 static int flow_entry_valid(struct flow_cache_entry *fle,
101147 struct netns_xfrm *xfrm)
101148 {
101149 - if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
101150 + if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
101151 return 0;
101152 if (fle->object && !fle->object->ops->check(fle->object))
101153 return 0;
101154 @@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
101155 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
101156 fcp->hash_count++;
101157 }
101158 - } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
101159 + } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
101160 flo = fle->object;
101161 if (!flo)
101162 goto ret_object;
101163 @@ -263,7 +263,7 @@ nocache:
101164 }
101165 flo = resolver(net, key, family, dir, flo, ctx);
101166 if (fle) {
101167 - fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
101168 + fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
101169 if (!IS_ERR(flo))
101170 fle->object = flo;
101171 else
101172 diff --git a/net/core/iovec.c b/net/core/iovec.c
101173 index e1ec45a..e5c6f16 100644
101174 --- a/net/core/iovec.c
101175 +++ b/net/core/iovec.c
101176 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101177 if (m->msg_name && m->msg_namelen) {
101178 if (mode == VERIFY_READ) {
101179 void __user *namep;
101180 - namep = (void __user __force *) m->msg_name;
101181 + namep = (void __force_user *) m->msg_name;
101182 err = move_addr_to_kernel(namep, m->msg_namelen,
101183 address);
101184 if (err < 0)
101185 @@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101186 }
101187
101188 size = m->msg_iovlen * sizeof(struct iovec);
101189 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
101190 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
101191 return -EFAULT;
101192
101193 m->msg_iov = iov;
101194 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
101195 index ef31fef..8be66d9 100644
101196 --- a/net/core/neighbour.c
101197 +++ b/net/core/neighbour.c
101198 @@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
101199 void __user *buffer, size_t *lenp, loff_t *ppos)
101200 {
101201 int size, ret;
101202 - struct ctl_table tmp = *ctl;
101203 + ctl_table_no_const tmp = *ctl;
101204
101205 tmp.extra1 = &zero;
101206 tmp.extra2 = &unres_qlen_max;
101207 @@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
101208 void __user *buffer,
101209 size_t *lenp, loff_t *ppos)
101210 {
101211 - struct ctl_table tmp = *ctl;
101212 + ctl_table_no_const tmp = *ctl;
101213 int ret;
101214
101215 tmp.extra1 = &zero;
101216 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
101217 index 2bf8329..2eb1423 100644
101218 --- a/net/core/net-procfs.c
101219 +++ b/net/core/net-procfs.c
101220 @@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
101221 struct rtnl_link_stats64 temp;
101222 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101223
101224 - seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101225 + if (gr_proc_is_restricted())
101226 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101227 + "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101228 + dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101229 + 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101230 + else
101231 + seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101232 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101233 dev->name, stats->rx_bytes, stats->rx_packets,
101234 stats->rx_errors,
101235 @@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101236 return 0;
101237 }
101238
101239 -static const struct seq_operations dev_seq_ops = {
101240 +const struct seq_operations dev_seq_ops = {
101241 .start = dev_seq_start,
101242 .next = dev_seq_next,
101243 .stop = dev_seq_stop,
101244 @@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101245
101246 static int softnet_seq_open(struct inode *inode, struct file *file)
101247 {
101248 - return seq_open(file, &softnet_seq_ops);
101249 + return seq_open_restrict(file, &softnet_seq_ops);
101250 }
101251
101252 static const struct file_operations softnet_seq_fops = {
101253 @@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101254 else
101255 seq_printf(seq, "%04x", ntohs(pt->type));
101256
101257 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101258 + seq_printf(seq, " %-8s %pf\n",
101259 + pt->dev ? pt->dev->name : "", NULL);
101260 +#else
101261 seq_printf(seq, " %-8s %pf\n",
101262 pt->dev ? pt->dev->name : "", pt->func);
101263 +#endif
101264 }
101265
101266 return 0;
101267 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101268 index 9dd0669..c52fb1b 100644
101269 --- a/net/core/net-sysfs.c
101270 +++ b/net/core/net-sysfs.c
101271 @@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101272 {
101273 struct net_device *netdev = to_net_dev(dev);
101274 return sprintf(buf, fmt_dec,
101275 - atomic_read(&netdev->carrier_changes));
101276 + atomic_read_unchecked(&netdev->carrier_changes));
101277 }
101278 static DEVICE_ATTR_RO(carrier_changes);
101279
101280 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101281 index 7f15517..f7d65c0 100644
101282 --- a/net/core/net_namespace.c
101283 +++ b/net/core/net_namespace.c
101284 @@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101285 int error;
101286 LIST_HEAD(net_exit_list);
101287
101288 - list_add_tail(&ops->list, list);
101289 + pax_list_add_tail((struct list_head *)&ops->list, list);
101290 if (ops->init || (ops->id && ops->size)) {
101291 for_each_net(net) {
101292 error = ops_init(ops, net);
101293 @@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101294
101295 out_undo:
101296 /* If I have an error cleanup all namespaces I initialized */
101297 - list_del(&ops->list);
101298 + pax_list_del((struct list_head *)&ops->list);
101299 ops_exit_list(ops, &net_exit_list);
101300 ops_free_list(ops, &net_exit_list);
101301 return error;
101302 @@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101303 struct net *net;
101304 LIST_HEAD(net_exit_list);
101305
101306 - list_del(&ops->list);
101307 + pax_list_del((struct list_head *)&ops->list);
101308 for_each_net(net)
101309 list_add_tail(&net->exit_list, &net_exit_list);
101310 ops_exit_list(ops, &net_exit_list);
101311 @@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101312 mutex_lock(&net_mutex);
101313 error = register_pernet_operations(&pernet_list, ops);
101314 if (!error && (first_device == &pernet_list))
101315 - first_device = &ops->list;
101316 + first_device = (struct list_head *)&ops->list;
101317 mutex_unlock(&net_mutex);
101318 return error;
101319 }
101320 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101321 index e6645b4..43e1af9 100644
101322 --- a/net/core/netpoll.c
101323 +++ b/net/core/netpoll.c
101324 @@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101325 struct udphdr *udph;
101326 struct iphdr *iph;
101327 struct ethhdr *eth;
101328 - static atomic_t ip_ident;
101329 + static atomic_unchecked_t ip_ident;
101330 struct ipv6hdr *ip6h;
101331
101332 udp_len = len + sizeof(*udph);
101333 @@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101334 put_unaligned(0x45, (unsigned char *)iph);
101335 iph->tos = 0;
101336 put_unaligned(htons(ip_len), &(iph->tot_len));
101337 - iph->id = htons(atomic_inc_return(&ip_ident));
101338 + iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101339 iph->frag_off = 0;
101340 iph->ttl = 64;
101341 iph->protocol = IPPROTO_UDP;
101342 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101343 index 443256b..bbff424 100644
101344 --- a/net/core/pktgen.c
101345 +++ b/net/core/pktgen.c
101346 @@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101347 pn->net = net;
101348 INIT_LIST_HEAD(&pn->pktgen_threads);
101349 pn->pktgen_exiting = false;
101350 - pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101351 + pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101352 if (!pn->proc_dir) {
101353 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101354 return -ENODEV;
101355 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101356 index 76321ea..3129bd6 100644
101357 --- a/net/core/rtnetlink.c
101358 +++ b/net/core/rtnetlink.c
101359 @@ -58,7 +58,7 @@ struct rtnl_link {
101360 rtnl_doit_func doit;
101361 rtnl_dumpit_func dumpit;
101362 rtnl_calcit_func calcit;
101363 -};
101364 +} __no_const;
101365
101366 static DEFINE_MUTEX(rtnl_mutex);
101367
101368 @@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101369 * to use the ops for creating device. So do not
101370 * fill up dellink as well. That disables rtnl_dellink.
101371 */
101372 - if (ops->setup && !ops->dellink)
101373 - ops->dellink = unregister_netdevice_queue;
101374 + if (ops->setup && !ops->dellink) {
101375 + pax_open_kernel();
101376 + *(void **)&ops->dellink = unregister_netdevice_queue;
101377 + pax_close_kernel();
101378 + }
101379
101380 - list_add_tail(&ops->list, &link_ops);
101381 + pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101382 return 0;
101383 }
101384 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101385 @@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101386 for_each_net(net) {
101387 __rtnl_kill_links(net, ops);
101388 }
101389 - list_del(&ops->list);
101390 + pax_list_del((struct list_head *)&ops->list);
101391 }
101392 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101393
101394 @@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101395 (dev->ifalias &&
101396 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101397 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101398 - atomic_read(&dev->carrier_changes)))
101399 + atomic_read_unchecked(&dev->carrier_changes)))
101400 goto nla_put_failure;
101401
101402 if (1) {
101403 diff --git a/net/core/scm.c b/net/core/scm.c
101404 index b442e7e..6f5b5a2 100644
101405 --- a/net/core/scm.c
101406 +++ b/net/core/scm.c
101407 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101408 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101409 {
101410 struct cmsghdr __user *cm
101411 - = (__force struct cmsghdr __user *)msg->msg_control;
101412 + = (struct cmsghdr __force_user *)msg->msg_control;
101413 struct cmsghdr cmhdr;
101414 int cmlen = CMSG_LEN(len);
101415 int err;
101416 @@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101417 err = -EFAULT;
101418 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101419 goto out;
101420 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101421 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101422 goto out;
101423 cmlen = CMSG_SPACE(len);
101424 if (msg->msg_controllen < cmlen)
101425 @@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101426 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101427 {
101428 struct cmsghdr __user *cm
101429 - = (__force struct cmsghdr __user*)msg->msg_control;
101430 + = (struct cmsghdr __force_user *)msg->msg_control;
101431
101432 int fdmax = 0;
101433 int fdnum = scm->fp->count;
101434 @@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101435 if (fdnum < fdmax)
101436 fdmax = fdnum;
101437
101438 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101439 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101440 i++, cmfptr++)
101441 {
101442 struct socket *sock;
101443 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101444 index 32e31c2..e981248 100644
101445 --- a/net/core/skbuff.c
101446 +++ b/net/core/skbuff.c
101447 @@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101448 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101449 int len, __wsum csum)
101450 {
101451 - const struct skb_checksum_ops ops = {
101452 + static const struct skb_checksum_ops ops = {
101453 .update = csum_partial_ext,
101454 .combine = csum_block_add_ext,
101455 };
101456 @@ -3255,12 +3255,14 @@ void __init skb_init(void)
101457 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101458 sizeof(struct sk_buff),
101459 0,
101460 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101461 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101462 + SLAB_NO_SANITIZE,
101463 NULL);
101464 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101465 sizeof(struct sk_buff_fclones),
101466 0,
101467 - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101468 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101469 + SLAB_NO_SANITIZE,
101470 NULL);
101471 }
101472
101473 diff --git a/net/core/sock.c b/net/core/sock.c
101474 index 15e0c67..0310f4a 100644
101475 --- a/net/core/sock.c
101476 +++ b/net/core/sock.c
101477 @@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101478 struct sk_buff_head *list = &sk->sk_receive_queue;
101479
101480 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101481 - atomic_inc(&sk->sk_drops);
101482 + atomic_inc_unchecked(&sk->sk_drops);
101483 trace_sock_rcvqueue_full(sk, skb);
101484 return -ENOMEM;
101485 }
101486 @@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101487 return err;
101488
101489 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101490 - atomic_inc(&sk->sk_drops);
101491 + atomic_inc_unchecked(&sk->sk_drops);
101492 return -ENOBUFS;
101493 }
101494
101495 @@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101496 skb_dst_force(skb);
101497
101498 spin_lock_irqsave(&list->lock, flags);
101499 - skb->dropcount = atomic_read(&sk->sk_drops);
101500 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101501 __skb_queue_tail(list, skb);
101502 spin_unlock_irqrestore(&list->lock, flags);
101503
101504 @@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101505 skb->dev = NULL;
101506
101507 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101508 - atomic_inc(&sk->sk_drops);
101509 + atomic_inc_unchecked(&sk->sk_drops);
101510 goto discard_and_relse;
101511 }
101512 if (nested)
101513 @@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101514 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101515 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101516 bh_unlock_sock(sk);
101517 - atomic_inc(&sk->sk_drops);
101518 + atomic_inc_unchecked(&sk->sk_drops);
101519 goto discard_and_relse;
101520 }
101521
101522 @@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101523 struct timeval tm;
101524 } v;
101525
101526 - int lv = sizeof(int);
101527 - int len;
101528 + unsigned int lv = sizeof(int);
101529 + unsigned int len;
101530
101531 if (get_user(len, optlen))
101532 return -EFAULT;
101533 - if (len < 0)
101534 + if (len > INT_MAX)
101535 return -EINVAL;
101536
101537 memset(&v, 0, sizeof(v));
101538 @@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101539
101540 case SO_PEERNAME:
101541 {
101542 - char address[128];
101543 + char address[_K_SS_MAXSIZE];
101544
101545 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101546 return -ENOTCONN;
101547 - if (lv < len)
101548 + if (lv < len || sizeof address < len)
101549 return -EINVAL;
101550 if (copy_to_user(optval, address, len))
101551 return -EFAULT;
101552 @@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101553
101554 if (len > lv)
101555 len = lv;
101556 - if (copy_to_user(optval, &v, len))
101557 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
101558 return -EFAULT;
101559 lenout:
101560 if (put_user(len, optlen))
101561 @@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101562 */
101563 smp_wmb();
101564 atomic_set(&sk->sk_refcnt, 1);
101565 - atomic_set(&sk->sk_drops, 0);
101566 + atomic_set_unchecked(&sk->sk_drops, 0);
101567 }
101568 EXPORT_SYMBOL(sock_init_data);
101569
101570 @@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101571 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101572 int level, int type)
101573 {
101574 + struct sock_extended_err ee;
101575 struct sock_exterr_skb *serr;
101576 struct sk_buff *skb;
101577 int copied, err;
101578 @@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101579 sock_recv_timestamp(msg, sk, skb);
101580
101581 serr = SKB_EXT_ERR(skb);
101582 - put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101583 + ee = serr->ee;
101584 + put_cmsg(msg, level, type, sizeof ee, &ee);
101585
101586 msg->msg_flags |= MSG_ERRQUEUE;
101587 err = copied;
101588 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101589 index ad704c7..ca48aff 100644
101590 --- a/net/core/sock_diag.c
101591 +++ b/net/core/sock_diag.c
101592 @@ -9,26 +9,33 @@
101593 #include <linux/inet_diag.h>
101594 #include <linux/sock_diag.h>
101595
101596 -static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101597 +static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101598 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101599 static DEFINE_MUTEX(sock_diag_table_mutex);
101600
101601 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101602 {
101603 +#ifndef CONFIG_GRKERNSEC_HIDESYM
101604 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101605 cookie[1] != INET_DIAG_NOCOOKIE) &&
101606 ((u32)(unsigned long)sk != cookie[0] ||
101607 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101608 return -ESTALE;
101609 else
101610 +#endif
101611 return 0;
101612 }
101613 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101614
101615 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101616 {
101617 +#ifdef CONFIG_GRKERNSEC_HIDESYM
101618 + cookie[0] = 0;
101619 + cookie[1] = 0;
101620 +#else
101621 cookie[0] = (u32)(unsigned long)sk;
101622 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101623 +#endif
101624 }
101625 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101626
101627 @@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101628 mutex_lock(&sock_diag_table_mutex);
101629 if (sock_diag_handlers[hndl->family])
101630 err = -EBUSY;
101631 - else
101632 + else {
101633 + pax_open_kernel();
101634 sock_diag_handlers[hndl->family] = hndl;
101635 + pax_close_kernel();
101636 + }
101637 mutex_unlock(&sock_diag_table_mutex);
101638
101639 return err;
101640 @@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101641
101642 mutex_lock(&sock_diag_table_mutex);
101643 BUG_ON(sock_diag_handlers[family] != hnld);
101644 + pax_open_kernel();
101645 sock_diag_handlers[family] = NULL;
101646 + pax_close_kernel();
101647 mutex_unlock(&sock_diag_table_mutex);
101648 }
101649 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101650 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101651 index cf9cd13..50683950 100644
101652 --- a/net/core/sysctl_net_core.c
101653 +++ b/net/core/sysctl_net_core.c
101654 @@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101655 {
101656 unsigned int orig_size, size;
101657 int ret, i;
101658 - struct ctl_table tmp = {
101659 + ctl_table_no_const tmp = {
101660 .data = &size,
101661 .maxlen = sizeof(size),
101662 .mode = table->mode
101663 @@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101664 void __user *buffer, size_t *lenp, loff_t *ppos)
101665 {
101666 char id[IFNAMSIZ];
101667 - struct ctl_table tbl = {
101668 + ctl_table_no_const tbl = {
101669 .data = id,
101670 .maxlen = IFNAMSIZ,
101671 };
101672 @@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101673 .mode = 0644,
101674 .proc_handler = proc_dointvec
101675 },
101676 -#ifdef CONFIG_BPF_JIT
101677 +#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101678 {
101679 .procname = "bpf_jit_enable",
101680 .data = &bpf_jit_enable,
101681 @@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101682
101683 static __net_init int sysctl_core_net_init(struct net *net)
101684 {
101685 - struct ctl_table *tbl;
101686 + ctl_table_no_const *tbl = NULL;
101687
101688 net->core.sysctl_somaxconn = SOMAXCONN;
101689
101690 - tbl = netns_core_table;
101691 if (!net_eq(net, &init_net)) {
101692 - tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101693 + tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101694 if (tbl == NULL)
101695 goto err_dup;
101696
101697 @@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101698 if (net->user_ns != &init_user_ns) {
101699 tbl[0].procname = NULL;
101700 }
101701 - }
101702 -
101703 - net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101704 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101705 + } else
101706 + net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101707 if (net->core.sysctl_hdr == NULL)
101708 goto err_reg;
101709
101710 return 0;
101711
101712 err_reg:
101713 - if (tbl != netns_core_table)
101714 - kfree(tbl);
101715 + kfree(tbl);
101716 err_dup:
101717 return -ENOMEM;
101718 }
101719 @@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101720 kfree(tbl);
101721 }
101722
101723 -static __net_initdata struct pernet_operations sysctl_core_ops = {
101724 +static __net_initconst struct pernet_operations sysctl_core_ops = {
101725 .init = sysctl_core_net_init,
101726 .exit = sysctl_core_net_exit,
101727 };
101728 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101729 index 25733d5..b9360f0 100644
101730 --- a/net/decnet/af_decnet.c
101731 +++ b/net/decnet/af_decnet.c
101732 @@ -466,6 +466,7 @@ static struct proto dn_proto = {
101733 .sysctl_rmem = sysctl_decnet_rmem,
101734 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
101735 .obj_size = sizeof(struct dn_sock),
101736 + .slab_flags = SLAB_USERCOPY,
101737 };
101738
101739 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
101740 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
101741 index 4400da7..3429972 100644
101742 --- a/net/decnet/dn_dev.c
101743 +++ b/net/decnet/dn_dev.c
101744 @@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
101745 .extra1 = &min_t3,
101746 .extra2 = &max_t3
101747 },
101748 - {0}
101749 + { }
101750 },
101751 };
101752
101753 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
101754 index 5325b54..a0d4d69 100644
101755 --- a/net/decnet/sysctl_net_decnet.c
101756 +++ b/net/decnet/sysctl_net_decnet.c
101757 @@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
101758
101759 if (len > *lenp) len = *lenp;
101760
101761 - if (copy_to_user(buffer, addr, len))
101762 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
101763 return -EFAULT;
101764
101765 *lenp = len;
101766 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
101767
101768 if (len > *lenp) len = *lenp;
101769
101770 - if (copy_to_user(buffer, devname, len))
101771 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
101772 return -EFAULT;
101773
101774 *lenp = len;
101775 diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
101776 index a2c7e4c..3dc9f67 100644
101777 --- a/net/hsr/hsr_netlink.c
101778 +++ b/net/hsr/hsr_netlink.c
101779 @@ -102,7 +102,7 @@ nla_put_failure:
101780 return -EMSGSIZE;
101781 }
101782
101783 -static struct rtnl_link_ops hsr_link_ops __read_mostly = {
101784 +static struct rtnl_link_ops hsr_link_ops = {
101785 .kind = "hsr",
101786 .maxtype = IFLA_HSR_MAX,
101787 .policy = hsr_policy,
101788 diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
101789 index 4413629..dea596a 100644
101790 --- a/net/ieee802154/6lowpan_rtnl.c
101791 +++ b/net/ieee802154/6lowpan_rtnl.c
101792 @@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
101793 dev_put(real_dev);
101794 }
101795
101796 -static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
101797 +static struct rtnl_link_ops lowpan_link_ops = {
101798 .kind = "lowpan",
101799 .priv_size = sizeof(struct lowpan_dev_info),
101800 .setup = lowpan_setup,
101801 diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
101802 index 7cfcd68..84ca5b7 100644
101803 --- a/net/ieee802154/reassembly.c
101804 +++ b/net/ieee802154/reassembly.c
101805 @@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
101806
101807 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101808 {
101809 - struct ctl_table *table;
101810 + ctl_table_no_const *table = NULL;
101811 struct ctl_table_header *hdr;
101812 struct netns_ieee802154_lowpan *ieee802154_lowpan =
101813 net_ieee802154_lowpan(net);
101814
101815 - table = lowpan_frags_ns_ctl_table;
101816 if (!net_eq(net, &init_net)) {
101817 - table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
101818 + table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
101819 GFP_KERNEL);
101820 if (table == NULL)
101821 goto err_alloc;
101822 @@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101823 /* Don't export sysctls to unprivileged users */
101824 if (net->user_ns != &init_user_ns)
101825 table[0].procname = NULL;
101826 - }
101827 -
101828 - hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101829 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101830 + } else
101831 + hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
101832 if (hdr == NULL)
101833 goto err_reg;
101834
101835 @@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101836 return 0;
101837
101838 err_reg:
101839 - if (!net_eq(net, &init_net))
101840 - kfree(table);
101841 + kfree(table);
101842 err_alloc:
101843 return -ENOMEM;
101844 }
101845 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
101846 index e67da4e..da217942 100644
101847 --- a/net/ipv4/af_inet.c
101848 +++ b/net/ipv4/af_inet.c
101849 @@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
101850 return ip_recv_error(sk, msg, len, addr_len);
101851 #if IS_ENABLED(CONFIG_IPV6)
101852 if (sk->sk_family == AF_INET6)
101853 - return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
101854 + return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
101855 #endif
101856 return -EINVAL;
101857 }
101858 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
101859 index 214882e..ec032f6 100644
101860 --- a/net/ipv4/devinet.c
101861 +++ b/net/ipv4/devinet.c
101862 @@ -69,7 +69,8 @@
101863
101864 static struct ipv4_devconf ipv4_devconf = {
101865 .data = {
101866 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101867 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101868 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101869 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101870 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101871 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101872 @@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
101873
101874 static struct ipv4_devconf ipv4_devconf_dflt = {
101875 .data = {
101876 - [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101877 + [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101878 + [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101879 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101880 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101881 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101882 @@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
101883 idx = 0;
101884 head = &net->dev_index_head[h];
101885 rcu_read_lock();
101886 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101887 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101888 net->dev_base_seq;
101889 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101890 if (idx < s_idx)
101891 @@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
101892 idx = 0;
101893 head = &net->dev_index_head[h];
101894 rcu_read_lock();
101895 - cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101896 + cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101897 net->dev_base_seq;
101898 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101899 if (idx < s_idx)
101900 @@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
101901 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
101902 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
101903
101904 -static struct devinet_sysctl_table {
101905 +static const struct devinet_sysctl_table {
101906 struct ctl_table_header *sysctl_header;
101907 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
101908 } devinet_sysctl = {
101909 @@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
101910 int err;
101911 struct ipv4_devconf *all, *dflt;
101912 #ifdef CONFIG_SYSCTL
101913 - struct ctl_table *tbl = ctl_forward_entry;
101914 + ctl_table_no_const *tbl = NULL;
101915 struct ctl_table_header *forw_hdr;
101916 #endif
101917
101918 @@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
101919 goto err_alloc_dflt;
101920
101921 #ifdef CONFIG_SYSCTL
101922 - tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
101923 + tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
101924 if (tbl == NULL)
101925 goto err_alloc_ctl;
101926
101927 @@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
101928 goto err_reg_dflt;
101929
101930 err = -ENOMEM;
101931 - forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101932 + if (!net_eq(net, &init_net))
101933 + forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101934 + else
101935 + forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
101936 if (forw_hdr == NULL)
101937 goto err_reg_ctl;
101938 net->ipv4.forw_hdr = forw_hdr;
101939 @@ -2287,8 +2292,7 @@ err_reg_ctl:
101940 err_reg_dflt:
101941 __devinet_sysctl_unregister(all);
101942 err_reg_all:
101943 - if (tbl != ctl_forward_entry)
101944 - kfree(tbl);
101945 + kfree(tbl);
101946 err_alloc_ctl:
101947 #endif
101948 if (dflt != &ipv4_devconf_dflt)
101949 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
101950 index 23104a3..9f5570b 100644
101951 --- a/net/ipv4/fib_frontend.c
101952 +++ b/net/ipv4/fib_frontend.c
101953 @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
101954 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101955 fib_sync_up(dev);
101956 #endif
101957 - atomic_inc(&net->ipv4.dev_addr_genid);
101958 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101959 rt_cache_flush(dev_net(dev));
101960 break;
101961 case NETDEV_DOWN:
101962 fib_del_ifaddr(ifa, NULL);
101963 - atomic_inc(&net->ipv4.dev_addr_genid);
101964 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101965 if (ifa->ifa_dev->ifa_list == NULL) {
101966 /* Last address was deleted from this interface.
101967 * Disable IP.
101968 @@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
101969 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101970 fib_sync_up(dev);
101971 #endif
101972 - atomic_inc(&net->ipv4.dev_addr_genid);
101973 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101974 rt_cache_flush(net);
101975 break;
101976 case NETDEV_DOWN:
101977 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
101978 index f99f41b..1879da9 100644
101979 --- a/net/ipv4/fib_semantics.c
101980 +++ b/net/ipv4/fib_semantics.c
101981 @@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
101982 nh->nh_saddr = inet_select_addr(nh->nh_dev,
101983 nh->nh_gw,
101984 nh->nh_parent->fib_scope);
101985 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
101986 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
101987
101988 return nh->nh_saddr;
101989 }
101990 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
101991 index 9111a4e..3576905 100644
101992 --- a/net/ipv4/inet_hashtables.c
101993 +++ b/net/ipv4/inet_hashtables.c
101994 @@ -18,6 +18,7 @@
101995 #include <linux/sched.h>
101996 #include <linux/slab.h>
101997 #include <linux/wait.h>
101998 +#include <linux/security.h>
101999
102000 #include <net/inet_connection_sock.h>
102001 #include <net/inet_hashtables.h>
102002 @@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
102003 return inet_ehashfn(net, laddr, lport, faddr, fport);
102004 }
102005
102006 +extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
102007 +
102008 /*
102009 * Allocate and initialize a new local port bind bucket.
102010 * The bindhash mutex for snum's hash chain must be held here.
102011 @@ -554,6 +557,8 @@ ok:
102012 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
102013 spin_unlock(&head->lock);
102014
102015 + gr_update_task_in_ip_table(inet_sk(sk));
102016 +
102017 if (tw) {
102018 inet_twsk_deschedule(tw, death_row);
102019 while (twrefcnt) {
102020 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
102021 index 241afd7..31b95d5 100644
102022 --- a/net/ipv4/inetpeer.c
102023 +++ b/net/ipv4/inetpeer.c
102024 @@ -461,7 +461,7 @@ relookup:
102025 if (p) {
102026 p->daddr = *daddr;
102027 atomic_set(&p->refcnt, 1);
102028 - atomic_set(&p->rid, 0);
102029 + atomic_set_unchecked(&p->rid, 0);
102030 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
102031 p->rate_tokens = 0;
102032 /* 60*HZ is arbitrary, but chosen enough high so that the first
102033 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
102034 index 2811cc1..ad5a534 100644
102035 --- a/net/ipv4/ip_fragment.c
102036 +++ b/net/ipv4/ip_fragment.c
102037 @@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
102038 return 0;
102039
102040 start = qp->rid;
102041 - end = atomic_inc_return(&peer->rid);
102042 + end = atomic_inc_return_unchecked(&peer->rid);
102043 qp->rid = end;
102044
102045 rc = qp->q.fragments && (end - start) > max;
102046 @@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
102047
102048 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102049 {
102050 - struct ctl_table *table;
102051 + ctl_table_no_const *table = NULL;
102052 struct ctl_table_header *hdr;
102053
102054 - table = ip4_frags_ns_ctl_table;
102055 if (!net_eq(net, &init_net)) {
102056 - table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
102057 + table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
102058 if (table == NULL)
102059 goto err_alloc;
102060
102061 @@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102062 /* Don't export sysctls to unprivileged users */
102063 if (net->user_ns != &init_user_ns)
102064 table[0].procname = NULL;
102065 - }
102066 + hdr = register_net_sysctl(net, "net/ipv4", table);
102067 + } else
102068 + hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
102069
102070 - hdr = register_net_sysctl(net, "net/ipv4", table);
102071 if (hdr == NULL)
102072 goto err_reg;
102073
102074 @@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
102075 return 0;
102076
102077 err_reg:
102078 - if (!net_eq(net, &init_net))
102079 - kfree(table);
102080 + kfree(table);
102081 err_alloc:
102082 return -ENOMEM;
102083 }
102084 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
102085 index 12055fd..df852c4 100644
102086 --- a/net/ipv4/ip_gre.c
102087 +++ b/net/ipv4/ip_gre.c
102088 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
102089 module_param(log_ecn_error, bool, 0644);
102090 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102091
102092 -static struct rtnl_link_ops ipgre_link_ops __read_mostly;
102093 +static struct rtnl_link_ops ipgre_link_ops;
102094 static int ipgre_tunnel_init(struct net_device *dev);
102095
102096 static int ipgre_net_id __read_mostly;
102097 @@ -815,7 +815,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
102098 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
102099 };
102100
102101 -static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102102 +static struct rtnl_link_ops ipgre_link_ops = {
102103 .kind = "gre",
102104 .maxtype = IFLA_GRE_MAX,
102105 .policy = ipgre_policy,
102106 @@ -829,7 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102107 .fill_info = ipgre_fill_info,
102108 };
102109
102110 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
102111 +static struct rtnl_link_ops ipgre_tap_ops = {
102112 .kind = "gretap",
102113 .maxtype = IFLA_GRE_MAX,
102114 .policy = ipgre_policy,
102115 diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
102116 index 3d4da2c..40f9c29 100644
102117 --- a/net/ipv4/ip_input.c
102118 +++ b/net/ipv4/ip_input.c
102119 @@ -147,6 +147,10 @@
102120 #include <linux/mroute.h>
102121 #include <linux/netlink.h>
102122
102123 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102124 +extern int grsec_enable_blackhole;
102125 +#endif
102126 +
102127 /*
102128 * Process Router Attention IP option (RFC 2113)
102129 */
102130 @@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
102131 if (!raw) {
102132 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
102133 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
102134 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102135 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102136 +#endif
102137 icmp_send(skb, ICMP_DEST_UNREACH,
102138 ICMP_PROT_UNREACH, 0);
102139 }
102140 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
102141 index 9daf217..373d454 100644
102142 --- a/net/ipv4/ip_sockglue.c
102143 +++ b/net/ipv4/ip_sockglue.c
102144 @@ -443,15 +443,12 @@ int ip_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
102145
102146 memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
102147 sin = &errhdr.offender;
102148 - sin->sin_family = AF_UNSPEC;
102149 + memset(sin, 0, sizeof(*sin));
102150 +
102151 if (serr->ee.ee_origin == SO_EE_ORIGIN_ICMP) {
102152 - struct inet_sock *inet = inet_sk(sk);
102153 -
102154 sin->sin_family = AF_INET;
102155 sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
102156 - sin->sin_port = 0;
102157 - memset(&sin->sin_zero, 0, sizeof(sin->sin_zero));
102158 - if (inet->cmsg_flags)
102159 + if (inet_sk(sk)->cmsg_flags)
102160 ip_cmsg_recv(msg, skb);
102161 }
102162
102163 @@ -1177,7 +1174,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102164 len = min_t(unsigned int, len, opt->optlen);
102165 if (put_user(len, optlen))
102166 return -EFAULT;
102167 - if (copy_to_user(optval, opt->__data, len))
102168 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
102169 + copy_to_user(optval, opt->__data, len))
102170 return -EFAULT;
102171 return 0;
102172 }
102173 @@ -1308,7 +1306,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102174 if (sk->sk_type != SOCK_STREAM)
102175 return -ENOPROTOOPT;
102176
102177 - msg.msg_control = (__force void *) optval;
102178 + msg.msg_control = (__force_kernel void *) optval;
102179 msg.msg_controllen = len;
102180 msg.msg_flags = flags;
102181
102182 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
102183 index 1a7e979..fd05aa4 100644
102184 --- a/net/ipv4/ip_vti.c
102185 +++ b/net/ipv4/ip_vti.c
102186 @@ -45,7 +45,7 @@
102187 #include <net/net_namespace.h>
102188 #include <net/netns/generic.h>
102189
102190 -static struct rtnl_link_ops vti_link_ops __read_mostly;
102191 +static struct rtnl_link_ops vti_link_ops;
102192
102193 static int vti_net_id __read_mostly;
102194 static int vti_tunnel_init(struct net_device *dev);
102195 @@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
102196 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
102197 };
102198
102199 -static struct rtnl_link_ops vti_link_ops __read_mostly = {
102200 +static struct rtnl_link_ops vti_link_ops = {
102201 .kind = "vti",
102202 .maxtype = IFLA_VTI_MAX,
102203 .policy = vti_policy,
102204 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
102205 index 648fa14..97864d0 100644
102206 --- a/net/ipv4/ipconfig.c
102207 +++ b/net/ipv4/ipconfig.c
102208 @@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
102209
102210 mm_segment_t oldfs = get_fs();
102211 set_fs(get_ds());
102212 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102213 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102214 set_fs(oldfs);
102215 return res;
102216 }
102217 @@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
102218
102219 mm_segment_t oldfs = get_fs();
102220 set_fs(get_ds());
102221 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102222 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102223 set_fs(oldfs);
102224 return res;
102225 }
102226 @@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
102227
102228 mm_segment_t oldfs = get_fs();
102229 set_fs(get_ds());
102230 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
102231 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
102232 set_fs(oldfs);
102233 return res;
102234 }
102235 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
102236 index 37096d6..86abb03 100644
102237 --- a/net/ipv4/ipip.c
102238 +++ b/net/ipv4/ipip.c
102239 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102240 static int ipip_net_id __read_mostly;
102241
102242 static int ipip_tunnel_init(struct net_device *dev);
102243 -static struct rtnl_link_ops ipip_link_ops __read_mostly;
102244 +static struct rtnl_link_ops ipip_link_ops;
102245
102246 static int ipip_err(struct sk_buff *skb, u32 info)
102247 {
102248 @@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102249 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102250 };
102251
102252 -static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102253 +static struct rtnl_link_ops ipip_link_ops = {
102254 .kind = "ipip",
102255 .maxtype = IFLA_IPTUN_MAX,
102256 .policy = ipip_policy,
102257 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102258 index f95b6f9..2ee2097 100644
102259 --- a/net/ipv4/netfilter/arp_tables.c
102260 +++ b/net/ipv4/netfilter/arp_tables.c
102261 @@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102262 #endif
102263
102264 static int get_info(struct net *net, void __user *user,
102265 - const int *len, int compat)
102266 + int len, int compat)
102267 {
102268 char name[XT_TABLE_MAXNAMELEN];
102269 struct xt_table *t;
102270 int ret;
102271
102272 - if (*len != sizeof(struct arpt_getinfo)) {
102273 - duprintf("length %u != %Zu\n", *len,
102274 + if (len != sizeof(struct arpt_getinfo)) {
102275 + duprintf("length %u != %Zu\n", len,
102276 sizeof(struct arpt_getinfo));
102277 return -EINVAL;
102278 }
102279 @@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102280 info.size = private->size;
102281 strcpy(info.name, name);
102282
102283 - if (copy_to_user(user, &info, *len) != 0)
102284 + if (copy_to_user(user, &info, len) != 0)
102285 ret = -EFAULT;
102286 else
102287 ret = 0;
102288 @@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102289
102290 switch (cmd) {
102291 case ARPT_SO_GET_INFO:
102292 - ret = get_info(sock_net(sk), user, len, 1);
102293 + ret = get_info(sock_net(sk), user, *len, 1);
102294 break;
102295 case ARPT_SO_GET_ENTRIES:
102296 ret = compat_get_entries(sock_net(sk), user, len);
102297 @@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102298
102299 switch (cmd) {
102300 case ARPT_SO_GET_INFO:
102301 - ret = get_info(sock_net(sk), user, len, 0);
102302 + ret = get_info(sock_net(sk), user, *len, 0);
102303 break;
102304
102305 case ARPT_SO_GET_ENTRIES:
102306 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102307 index 99e810f..3711b81 100644
102308 --- a/net/ipv4/netfilter/ip_tables.c
102309 +++ b/net/ipv4/netfilter/ip_tables.c
102310 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102311 #endif
102312
102313 static int get_info(struct net *net, void __user *user,
102314 - const int *len, int compat)
102315 + int len, int compat)
102316 {
102317 char name[XT_TABLE_MAXNAMELEN];
102318 struct xt_table *t;
102319 int ret;
102320
102321 - if (*len != sizeof(struct ipt_getinfo)) {
102322 - duprintf("length %u != %zu\n", *len,
102323 + if (len != sizeof(struct ipt_getinfo)) {
102324 + duprintf("length %u != %zu\n", len,
102325 sizeof(struct ipt_getinfo));
102326 return -EINVAL;
102327 }
102328 @@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102329 info.size = private->size;
102330 strcpy(info.name, name);
102331
102332 - if (copy_to_user(user, &info, *len) != 0)
102333 + if (copy_to_user(user, &info, len) != 0)
102334 ret = -EFAULT;
102335 else
102336 ret = 0;
102337 @@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102338
102339 switch (cmd) {
102340 case IPT_SO_GET_INFO:
102341 - ret = get_info(sock_net(sk), user, len, 1);
102342 + ret = get_info(sock_net(sk), user, *len, 1);
102343 break;
102344 case IPT_SO_GET_ENTRIES:
102345 ret = compat_get_entries(sock_net(sk), user, len);
102346 @@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102347
102348 switch (cmd) {
102349 case IPT_SO_GET_INFO:
102350 - ret = get_info(sock_net(sk), user, len, 0);
102351 + ret = get_info(sock_net(sk), user, *len, 0);
102352 break;
102353
102354 case IPT_SO_GET_ENTRIES:
102355 diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102356 index e90f83a..3e6acca 100644
102357 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102358 +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102359 @@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102360 spin_lock_init(&cn->lock);
102361
102362 #ifdef CONFIG_PROC_FS
102363 - cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102364 + cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102365 if (!cn->procdir) {
102366 pr_err("Unable to proc dir entry\n");
102367 return -ENOMEM;
102368 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102369 index 5d740cc..b2842b9 100644
102370 --- a/net/ipv4/ping.c
102371 +++ b/net/ipv4/ping.c
102372 @@ -59,7 +59,7 @@ struct ping_table {
102373 };
102374
102375 static struct ping_table ping_table;
102376 -struct pingv6_ops pingv6_ops;
102377 +struct pingv6_ops *pingv6_ops;
102378 EXPORT_SYMBOL_GPL(pingv6_ops);
102379
102380 static u16 ping_port_rover;
102381 @@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102382 return -ENODEV;
102383 }
102384 }
102385 - has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102386 + has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102387 scoped);
102388 rcu_read_unlock();
102389
102390 @@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102391 }
102392 #if IS_ENABLED(CONFIG_IPV6)
102393 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102394 - harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102395 + harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102396 #endif
102397 }
102398
102399 @@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102400 info, (u8 *)icmph);
102401 #if IS_ENABLED(CONFIG_IPV6)
102402 } else if (family == AF_INET6) {
102403 - pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102404 + pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102405 info, (u8 *)icmph);
102406 #endif
102407 }
102408 @@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102409 }
102410
102411 if (inet6_sk(sk)->rxopt.all)
102412 - pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102413 + pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102414 if (skb->protocol == htons(ETH_P_IPV6) &&
102415 inet6_sk(sk)->rxopt.all)
102416 - pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102417 + pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102418 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102419 ip_cmsg_recv(msg, skb);
102420 #endif
102421 @@ -1105,7 +1105,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102422 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102423 0, sock_i_ino(sp),
102424 atomic_read(&sp->sk_refcnt), sp,
102425 - atomic_read(&sp->sk_drops));
102426 + atomic_read_unchecked(&sp->sk_drops));
102427 }
102428
102429 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102430 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102431 index 739db31..74f0210 100644
102432 --- a/net/ipv4/raw.c
102433 +++ b/net/ipv4/raw.c
102434 @@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102435 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102436 {
102437 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102438 - atomic_inc(&sk->sk_drops);
102439 + atomic_inc_unchecked(&sk->sk_drops);
102440 kfree_skb(skb);
102441 return NET_RX_DROP;
102442 }
102443 @@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102444
102445 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102446 {
102447 + struct icmp_filter filter;
102448 +
102449 if (optlen > sizeof(struct icmp_filter))
102450 optlen = sizeof(struct icmp_filter);
102451 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102452 + if (copy_from_user(&filter, optval, optlen))
102453 return -EFAULT;
102454 + raw_sk(sk)->filter = filter;
102455 return 0;
102456 }
102457
102458 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102459 {
102460 int len, ret = -EFAULT;
102461 + struct icmp_filter filter;
102462
102463 if (get_user(len, optlen))
102464 goto out;
102465 @@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102466 if (len > sizeof(struct icmp_filter))
102467 len = sizeof(struct icmp_filter);
102468 ret = -EFAULT;
102469 - if (put_user(len, optlen) ||
102470 - copy_to_user(optval, &raw_sk(sk)->filter, len))
102471 + filter = raw_sk(sk)->filter;
102472 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102473 goto out;
102474 ret = 0;
102475 out: return ret;
102476 @@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102477 0, 0L, 0,
102478 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102479 0, sock_i_ino(sp),
102480 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102481 + atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102482 }
102483
102484 static int raw_seq_show(struct seq_file *seq, void *v)
102485 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102486 index 6a2155b..d426880 100644
102487 --- a/net/ipv4/route.c
102488 +++ b/net/ipv4/route.c
102489 @@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102490
102491 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102492 {
102493 - return seq_open(file, &rt_cache_seq_ops);
102494 + return seq_open_restrict(file, &rt_cache_seq_ops);
102495 }
102496
102497 static const struct file_operations rt_cache_seq_fops = {
102498 @@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102499
102500 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102501 {
102502 - return seq_open(file, &rt_cpu_seq_ops);
102503 + return seq_open_restrict(file, &rt_cpu_seq_ops);
102504 }
102505
102506 static const struct file_operations rt_cpu_seq_fops = {
102507 @@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102508
102509 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102510 {
102511 - return single_open(file, rt_acct_proc_show, NULL);
102512 + return single_open_restrict(file, rt_acct_proc_show, NULL);
102513 }
102514
102515 static const struct file_operations rt_acct_proc_fops = {
102516 @@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102517
102518 #define IP_IDENTS_SZ 2048u
102519 struct ip_ident_bucket {
102520 - atomic_t id;
102521 + atomic_unchecked_t id;
102522 u32 stamp32;
102523 };
102524
102525 -static struct ip_ident_bucket *ip_idents __read_mostly;
102526 +static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102527
102528 /* In order to protect privacy, we add a perturbation to identifiers
102529 * if one generator is seldom used. This makes hard for an attacker
102530 @@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102531 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102532 delta = prandom_u32_max(now - old);
102533
102534 - return atomic_add_return(segs + delta, &bucket->id) - segs;
102535 + return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102536 }
102537 EXPORT_SYMBOL(ip_idents_reserve);
102538
102539 @@ -2624,34 +2624,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102540 .maxlen = sizeof(int),
102541 .mode = 0200,
102542 .proc_handler = ipv4_sysctl_rtcache_flush,
102543 + .extra1 = &init_net,
102544 },
102545 { },
102546 };
102547
102548 static __net_init int sysctl_route_net_init(struct net *net)
102549 {
102550 - struct ctl_table *tbl;
102551 + ctl_table_no_const *tbl = NULL;
102552
102553 - tbl = ipv4_route_flush_table;
102554 if (!net_eq(net, &init_net)) {
102555 - tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102556 + tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102557 if (tbl == NULL)
102558 goto err_dup;
102559
102560 /* Don't export sysctls to unprivileged users */
102561 if (net->user_ns != &init_user_ns)
102562 tbl[0].procname = NULL;
102563 - }
102564 - tbl[0].extra1 = net;
102565 + tbl[0].extra1 = net;
102566 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102567 + } else
102568 + net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102569
102570 - net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102571 if (net->ipv4.route_hdr == NULL)
102572 goto err_reg;
102573 return 0;
102574
102575 err_reg:
102576 - if (tbl != ipv4_route_flush_table)
102577 - kfree(tbl);
102578 + kfree(tbl);
102579 err_dup:
102580 return -ENOMEM;
102581 }
102582 @@ -2674,8 +2674,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102583
102584 static __net_init int rt_genid_init(struct net *net)
102585 {
102586 - atomic_set(&net->ipv4.rt_genid, 0);
102587 - atomic_set(&net->fnhe_genid, 0);
102588 + atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102589 + atomic_set_unchecked(&net->fnhe_genid, 0);
102590 get_random_bytes(&net->ipv4.dev_addr_genid,
102591 sizeof(net->ipv4.dev_addr_genid));
102592 return 0;
102593 @@ -2718,11 +2718,7 @@ int __init ip_rt_init(void)
102594 {
102595 int rc = 0;
102596
102597 - ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102598 - if (!ip_idents)
102599 - panic("IP: failed to allocate ip_idents\n");
102600 -
102601 - prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102602 + prandom_bytes(ip_idents, sizeof(ip_idents));
102603
102604 #ifdef CONFIG_IP_ROUTE_CLASSID
102605 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102606 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102607 index b3c53c8..35cc18d 100644
102608 --- a/net/ipv4/sysctl_net_ipv4.c
102609 +++ b/net/ipv4/sysctl_net_ipv4.c
102610 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102611 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102612 int ret;
102613 int range[2];
102614 - struct ctl_table tmp = {
102615 + ctl_table_no_const tmp = {
102616 .data = &range,
102617 .maxlen = sizeof(range),
102618 .mode = table->mode,
102619 @@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102620 int ret;
102621 gid_t urange[2];
102622 kgid_t low, high;
102623 - struct ctl_table tmp = {
102624 + ctl_table_no_const tmp = {
102625 .data = &urange,
102626 .maxlen = sizeof(urange),
102627 .mode = table->mode,
102628 @@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102629 void __user *buffer, size_t *lenp, loff_t *ppos)
102630 {
102631 char val[TCP_CA_NAME_MAX];
102632 - struct ctl_table tbl = {
102633 + ctl_table_no_const tbl = {
102634 .data = val,
102635 .maxlen = TCP_CA_NAME_MAX,
102636 };
102637 @@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102638 void __user *buffer, size_t *lenp,
102639 loff_t *ppos)
102640 {
102641 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102642 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102643 int ret;
102644
102645 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102646 @@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102647 void __user *buffer, size_t *lenp,
102648 loff_t *ppos)
102649 {
102650 - struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102651 + ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102652 int ret;
102653
102654 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102655 @@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102656 void __user *buffer, size_t *lenp,
102657 loff_t *ppos)
102658 {
102659 - struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102660 + ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102661 struct tcp_fastopen_context *ctxt;
102662 int ret;
102663 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102664 @@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102665
102666 static __net_init int ipv4_sysctl_init_net(struct net *net)
102667 {
102668 - struct ctl_table *table;
102669 + ctl_table_no_const *table = NULL;
102670
102671 - table = ipv4_net_table;
102672 if (!net_eq(net, &init_net)) {
102673 int i;
102674
102675 - table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
102676 + table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
102677 if (table == NULL)
102678 goto err_alloc;
102679
102680 @@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
102681 table[i].data += (void *)net - (void *)&init_net;
102682 }
102683
102684 - net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102685 + if (!net_eq(net, &init_net))
102686 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102687 + else
102688 + net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
102689 if (net->ipv4.ipv4_hdr == NULL)
102690 goto err_reg;
102691
102692 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
102693 index d107ee2..bcebf11 100644
102694 --- a/net/ipv4/tcp_input.c
102695 +++ b/net/ipv4/tcp_input.c
102696 @@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
102697 * without any lock. We want to make sure compiler wont store
102698 * intermediate values in this location.
102699 */
102700 - ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
102701 + ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
102702 sk->sk_max_pacing_rate);
102703 }
102704
102705 @@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
102706 * simplifies code)
102707 */
102708 static void
102709 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102710 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102711 struct sk_buff *head, struct sk_buff *tail,
102712 u32 start, u32 end)
102713 {
102714 @@ -5506,6 +5506,7 @@ discard:
102715 tcp_paws_reject(&tp->rx_opt, 0))
102716 goto discard_and_undo;
102717
102718 +#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
102719 if (th->syn) {
102720 /* We see SYN without ACK. It is attempt of
102721 * simultaneous connect with crossed SYNs.
102722 @@ -5556,6 +5557,7 @@ discard:
102723 goto discard;
102724 #endif
102725 }
102726 +#endif
102727 /* "fifth, if neither of the SYN or RST bits is set then
102728 * drop the segment and return."
102729 */
102730 @@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
102731 goto discard;
102732
102733 if (th->syn) {
102734 - if (th->fin)
102735 + if (th->fin || th->urg || th->psh)
102736 goto discard;
102737 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
102738 return 1;
102739 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
102740 index ef7089c..a3e65fb 100644
102741 --- a/net/ipv4/tcp_ipv4.c
102742 +++ b/net/ipv4/tcp_ipv4.c
102743 @@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
102744 int sysctl_tcp_low_latency __read_mostly;
102745 EXPORT_SYMBOL(sysctl_tcp_low_latency);
102746
102747 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102748 +extern int grsec_enable_blackhole;
102749 +#endif
102750 +
102751 #ifdef CONFIG_TCP_MD5SIG
102752 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
102753 __be32 daddr, __be32 saddr, const struct tcphdr *th);
102754 @@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
102755 return 0;
102756
102757 reset:
102758 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102759 + if (!grsec_enable_blackhole)
102760 +#endif
102761 tcp_v4_send_reset(rsk, skb);
102762 discard:
102763 kfree_skb(skb);
102764 @@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
102765 TCP_SKB_CB(skb)->sacked = 0;
102766
102767 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
102768 - if (!sk)
102769 + if (!sk) {
102770 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102771 + ret = 1;
102772 +#endif
102773 goto no_tcp_socket;
102774 -
102775 + }
102776 process:
102777 - if (sk->sk_state == TCP_TIME_WAIT)
102778 + if (sk->sk_state == TCP_TIME_WAIT) {
102779 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102780 + ret = 2;
102781 +#endif
102782 goto do_time_wait;
102783 + }
102784
102785 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
102786 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
102787 @@ -1694,6 +1708,10 @@ csum_error:
102788 bad_packet:
102789 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
102790 } else {
102791 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102792 + if (!grsec_enable_blackhole || (ret == 1 &&
102793 + (skb->dev->flags & IFF_LOOPBACK)))
102794 +#endif
102795 tcp_v4_send_reset(NULL, skb);
102796 }
102797
102798 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
102799 index 63d2680..2db9d6b 100644
102800 --- a/net/ipv4/tcp_minisocks.c
102801 +++ b/net/ipv4/tcp_minisocks.c
102802 @@ -27,6 +27,10 @@
102803 #include <net/inet_common.h>
102804 #include <net/xfrm.h>
102805
102806 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102807 +extern int grsec_enable_blackhole;
102808 +#endif
102809 +
102810 int sysctl_tcp_syncookies __read_mostly = 1;
102811 EXPORT_SYMBOL(sysctl_tcp_syncookies);
102812
102813 @@ -739,7 +743,10 @@ embryonic_reset:
102814 * avoid becoming vulnerable to outside attack aiming at
102815 * resetting legit local connections.
102816 */
102817 - req->rsk_ops->send_reset(sk, skb);
102818 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102819 + if (!grsec_enable_blackhole)
102820 +#endif
102821 + req->rsk_ops->send_reset(sk, skb);
102822 } else if (fastopen) { /* received a valid RST pkt */
102823 reqsk_fastopen_remove(sk, req, true);
102824 tcp_reset(sk);
102825 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
102826 index ebf5ff5..4d1ff32 100644
102827 --- a/net/ipv4/tcp_probe.c
102828 +++ b/net/ipv4/tcp_probe.c
102829 @@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
102830 if (cnt + width >= len)
102831 break;
102832
102833 - if (copy_to_user(buf + cnt, tbuf, width))
102834 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
102835 return -EFAULT;
102836 cnt += width;
102837 }
102838 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
102839 index 9b21ae8..4eb67df 100644
102840 --- a/net/ipv4/tcp_timer.c
102841 +++ b/net/ipv4/tcp_timer.c
102842 @@ -22,6 +22,10 @@
102843 #include <linux/gfp.h>
102844 #include <net/tcp.h>
102845
102846 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102847 +extern int grsec_lastack_retries;
102848 +#endif
102849 +
102850 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
102851 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
102852 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
102853 @@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
102854 }
102855 }
102856
102857 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102858 + if ((sk->sk_state == TCP_LAST_ACK) &&
102859 + (grsec_lastack_retries > 0) &&
102860 + (grsec_lastack_retries < retry_until))
102861 + retry_until = grsec_lastack_retries;
102862 +#endif
102863 +
102864 if (retransmits_timed_out(sk, retry_until,
102865 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
102866 /* Has it gone just too far? */
102867 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
102868 index cd0db54..93a6518 100644
102869 --- a/net/ipv4/udp.c
102870 +++ b/net/ipv4/udp.c
102871 @@ -87,6 +87,7 @@
102872 #include <linux/types.h>
102873 #include <linux/fcntl.h>
102874 #include <linux/module.h>
102875 +#include <linux/security.h>
102876 #include <linux/socket.h>
102877 #include <linux/sockios.h>
102878 #include <linux/igmp.h>
102879 @@ -114,6 +115,10 @@
102880 #include <net/busy_poll.h>
102881 #include "udp_impl.h"
102882
102883 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102884 +extern int grsec_enable_blackhole;
102885 +#endif
102886 +
102887 struct udp_table udp_table __read_mostly;
102888 EXPORT_SYMBOL(udp_table);
102889
102890 @@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
102891 return true;
102892 }
102893
102894 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
102895 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
102896 +
102897 /*
102898 * This routine is called by the ICMP module when it gets some
102899 * sort of error condition. If err < 0 then the socket should
102900 @@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102901 dport = usin->sin_port;
102902 if (dport == 0)
102903 return -EINVAL;
102904 +
102905 + err = gr_search_udp_sendmsg(sk, usin);
102906 + if (err)
102907 + return err;
102908 } else {
102909 if (sk->sk_state != TCP_ESTABLISHED)
102910 return -EDESTADDRREQ;
102911 +
102912 + err = gr_search_udp_sendmsg(sk, NULL);
102913 + if (err)
102914 + return err;
102915 +
102916 daddr = inet->inet_daddr;
102917 dport = inet->inet_dport;
102918 /* Open fast path for connected socket.
102919 @@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
102920 IS_UDPLITE(sk));
102921 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102922 IS_UDPLITE(sk));
102923 - atomic_inc(&sk->sk_drops);
102924 + atomic_inc_unchecked(&sk->sk_drops);
102925 __skb_unlink(skb, rcvq);
102926 __skb_queue_tail(&list_kill, skb);
102927 }
102928 @@ -1262,6 +1279,10 @@ try_again:
102929 if (!skb)
102930 goto out;
102931
102932 + err = gr_search_udp_recvmsg(sk, skb);
102933 + if (err)
102934 + goto out_free;
102935 +
102936 ulen = skb->len - sizeof(struct udphdr);
102937 copied = len;
102938 if (copied > ulen)
102939 @@ -1295,7 +1316,7 @@ try_again:
102940 if (unlikely(err)) {
102941 trace_kfree_skb(skb, udp_recvmsg);
102942 if (!peeked) {
102943 - atomic_inc(&sk->sk_drops);
102944 + atomic_inc_unchecked(&sk->sk_drops);
102945 UDP_INC_STATS_USER(sock_net(sk),
102946 UDP_MIB_INERRORS, is_udplite);
102947 }
102948 @@ -1592,7 +1613,7 @@ csum_error:
102949 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
102950 drop:
102951 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
102952 - atomic_inc(&sk->sk_drops);
102953 + atomic_inc_unchecked(&sk->sk_drops);
102954 kfree_skb(skb);
102955 return -1;
102956 }
102957 @@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
102958 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
102959
102960 if (!skb1) {
102961 - atomic_inc(&sk->sk_drops);
102962 + atomic_inc_unchecked(&sk->sk_drops);
102963 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
102964 IS_UDPLITE(sk));
102965 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102966 @@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
102967 goto csum_error;
102968
102969 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
102970 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102971 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102972 +#endif
102973 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
102974
102975 /*
102976 @@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
102977 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102978 0, sock_i_ino(sp),
102979 atomic_read(&sp->sk_refcnt), sp,
102980 - atomic_read(&sp->sk_drops));
102981 + atomic_read_unchecked(&sp->sk_drops));
102982 }
102983
102984 int udp4_seq_show(struct seq_file *seq, void *v)
102985 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
102986 index 6156f68..d6ab46d 100644
102987 --- a/net/ipv4/xfrm4_policy.c
102988 +++ b/net/ipv4/xfrm4_policy.c
102989 @@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
102990 fl4->flowi4_tos = iph->tos;
102991 }
102992
102993 -static inline int xfrm4_garbage_collect(struct dst_ops *ops)
102994 +static int xfrm4_garbage_collect(struct dst_ops *ops)
102995 {
102996 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
102997
102998 - xfrm4_policy_afinfo.garbage_collect(net);
102999 + xfrm_garbage_collect_deferred(net);
103000 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
103001 }
103002
103003 @@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
103004
103005 static int __net_init xfrm4_net_init(struct net *net)
103006 {
103007 - struct ctl_table *table;
103008 + ctl_table_no_const *table = NULL;
103009 struct ctl_table_header *hdr;
103010
103011 - table = xfrm4_policy_table;
103012 if (!net_eq(net, &init_net)) {
103013 - table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
103014 + table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
103015 if (!table)
103016 goto err_alloc;
103017
103018 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
103019 - }
103020 -
103021 - hdr = register_net_sysctl(net, "net/ipv4", table);
103022 + hdr = register_net_sysctl(net, "net/ipv4", table);
103023 + } else
103024 + hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
103025 if (!hdr)
103026 goto err_reg;
103027
103028 @@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
103029 return 0;
103030
103031 err_reg:
103032 - if (!net_eq(net, &init_net))
103033 - kfree(table);
103034 + kfree(table);
103035 err_alloc:
103036 return -ENOMEM;
103037 }
103038 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
103039 index 0169ccf..50d7b04 100644
103040 --- a/net/ipv6/addrconf.c
103041 +++ b/net/ipv6/addrconf.c
103042 @@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
103043 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
103044 .mtu6 = IPV6_MIN_MTU,
103045 .accept_ra = 1,
103046 - .accept_redirects = 1,
103047 + .accept_redirects = 0,
103048 .autoconf = 1,
103049 .force_mld_version = 0,
103050 .mldv1_unsolicited_report_interval = 10 * HZ,
103051 @@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
103052 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
103053 .mtu6 = IPV6_MIN_MTU,
103054 .accept_ra = 1,
103055 - .accept_redirects = 1,
103056 + .accept_redirects = 0,
103057 .autoconf = 1,
103058 .force_mld_version = 0,
103059 .mldv1_unsolicited_report_interval = 10 * HZ,
103060 @@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
103061 idx = 0;
103062 head = &net->dev_index_head[h];
103063 rcu_read_lock();
103064 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
103065 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
103066 net->dev_base_seq;
103067 hlist_for_each_entry_rcu(dev, head, index_hlist) {
103068 if (idx < s_idx)
103069 @@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
103070 p.iph.ihl = 5;
103071 p.iph.protocol = IPPROTO_IPV6;
103072 p.iph.ttl = 64;
103073 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
103074 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
103075
103076 if (ops->ndo_do_ioctl) {
103077 mm_segment_t oldfs = get_fs();
103078 @@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
103079 .release = seq_release_net,
103080 };
103081
103082 +extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
103083 +extern void unregister_ipv6_seq_ops_addr(void);
103084 +
103085 static int __net_init if6_proc_net_init(struct net *net)
103086 {
103087 - if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
103088 + register_ipv6_seq_ops_addr(&if6_seq_ops);
103089 + if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
103090 + unregister_ipv6_seq_ops_addr();
103091 return -ENOMEM;
103092 + }
103093 return 0;
103094 }
103095
103096 static void __net_exit if6_proc_net_exit(struct net *net)
103097 {
103098 remove_proc_entry("if_inet6", net->proc_net);
103099 + unregister_ipv6_seq_ops_addr();
103100 }
103101
103102 static struct pernet_operations if6_proc_net_ops = {
103103 @@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
103104 s_ip_idx = ip_idx = cb->args[2];
103105
103106 rcu_read_lock();
103107 - cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
103108 + cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
103109 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
103110 idx = 0;
103111 head = &net->dev_index_head[h];
103112 @@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
103113 rt_genid_bump_ipv6(net);
103114 break;
103115 }
103116 - atomic_inc(&net->ipv6.dev_addr_genid);
103117 + atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
103118 }
103119
103120 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
103121 @@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
103122 int *valp = ctl->data;
103123 int val = *valp;
103124 loff_t pos = *ppos;
103125 - struct ctl_table lctl;
103126 + ctl_table_no_const lctl;
103127 int ret;
103128
103129 /*
103130 @@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
103131 int *valp = ctl->data;
103132 int val = *valp;
103133 loff_t pos = *ppos;
103134 - struct ctl_table lctl;
103135 + ctl_table_no_const lctl;
103136 int ret;
103137
103138 /*
103139 diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
103140 index e8c4400..a4cd5da 100644
103141 --- a/net/ipv6/af_inet6.c
103142 +++ b/net/ipv6/af_inet6.c
103143 @@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
103144 net->ipv6.sysctl.icmpv6_time = 1*HZ;
103145 net->ipv6.sysctl.flowlabel_consistency = 1;
103146 net->ipv6.sysctl.auto_flowlabels = 0;
103147 - atomic_set(&net->ipv6.fib6_sernum, 1);
103148 + atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
103149
103150 err = ipv6_init_mibs(net);
103151 if (err)
103152 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
103153 index 2cdc383..4f1b785 100644
103154 --- a/net/ipv6/datagram.c
103155 +++ b/net/ipv6/datagram.c
103156 @@ -383,11 +383,10 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
103157
103158 memcpy(&errhdr.ee, &serr->ee, sizeof(struct sock_extended_err));
103159 sin = &errhdr.offender;
103160 - sin->sin6_family = AF_UNSPEC;
103161 + memset(sin, 0, sizeof(*sin));
103162 +
103163 if (serr->ee.ee_origin != SO_EE_ORIGIN_LOCAL) {
103164 sin->sin6_family = AF_INET6;
103165 - sin->sin6_flowinfo = 0;
103166 - sin->sin6_port = 0;
103167 if (np->rxopt.all)
103168 ip6_datagram_recv_common_ctl(sk, msg, skb);
103169 if (skb->protocol == htons(ETH_P_IPV6)) {
103170 @@ -398,12 +397,9 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
103171 ipv6_iface_scope_id(&sin->sin6_addr,
103172 IP6CB(skb)->iif);
103173 } else {
103174 - struct inet_sock *inet = inet_sk(sk);
103175 -
103176 ipv6_addr_set_v4mapped(ip_hdr(skb)->saddr,
103177 &sin->sin6_addr);
103178 - sin->sin6_scope_id = 0;
103179 - if (inet->cmsg_flags)
103180 + if (inet_sk(sk)->cmsg_flags)
103181 ip_cmsg_recv(msg, skb);
103182 }
103183 }
103184 @@ -928,5 +924,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
103185 0,
103186 sock_i_ino(sp),
103187 atomic_read(&sp->sk_refcnt), sp,
103188 - atomic_read(&sp->sk_drops));
103189 + atomic_read_unchecked(&sp->sk_drops));
103190 }
103191 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
103192 index 97ae700..18dcae0 100644
103193 --- a/net/ipv6/icmp.c
103194 +++ b/net/ipv6/icmp.c
103195 @@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
103196
103197 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
103198 {
103199 - struct ctl_table *table;
103200 + ctl_table_no_const *table;
103201
103202 table = kmemdup(ipv6_icmp_table_template,
103203 sizeof(ipv6_icmp_table_template),
103204 diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
103205 index b2d1838..0194c04 100644
103206 --- a/net/ipv6/ip6_fib.c
103207 +++ b/net/ipv6/ip6_fib.c
103208 @@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
103209 int new, old;
103210
103211 do {
103212 - old = atomic_read(&net->ipv6.fib6_sernum);
103213 + old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
103214 new = old < INT_MAX ? old + 1 : 1;
103215 - } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
103216 + } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
103217 old, new) != old);
103218 return new;
103219 }
103220 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
103221 index 0e32d2e..98cbe65 100644
103222 --- a/net/ipv6/ip6_gre.c
103223 +++ b/net/ipv6/ip6_gre.c
103224 @@ -71,8 +71,8 @@ struct ip6gre_net {
103225 struct net_device *fb_tunnel_dev;
103226 };
103227
103228 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
103229 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
103230 +static struct rtnl_link_ops ip6gre_link_ops;
103231 +static struct rtnl_link_ops ip6gre_tap_ops;
103232 static int ip6gre_tunnel_init(struct net_device *dev);
103233 static void ip6gre_tunnel_setup(struct net_device *dev);
103234 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
103235 @@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
103236 }
103237
103238
103239 -static struct inet6_protocol ip6gre_protocol __read_mostly = {
103240 +static struct inet6_protocol ip6gre_protocol = {
103241 .handler = ip6gre_rcv,
103242 .err_handler = ip6gre_err,
103243 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
103244 @@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
103245 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
103246 };
103247
103248 -static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103249 +static struct rtnl_link_ops ip6gre_link_ops = {
103250 .kind = "ip6gre",
103251 .maxtype = IFLA_GRE_MAX,
103252 .policy = ip6gre_policy,
103253 @@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103254 .fill_info = ip6gre_fill_info,
103255 };
103256
103257 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
103258 +static struct rtnl_link_ops ip6gre_tap_ops = {
103259 .kind = "ip6gretap",
103260 .maxtype = IFLA_GRE_MAX,
103261 .policy = ip6gre_policy,
103262 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
103263 index 9cb94cf..5678108 100644
103264 --- a/net/ipv6/ip6_tunnel.c
103265 +++ b/net/ipv6/ip6_tunnel.c
103266 @@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103267
103268 static int ip6_tnl_dev_init(struct net_device *dev);
103269 static void ip6_tnl_dev_setup(struct net_device *dev);
103270 -static struct rtnl_link_ops ip6_link_ops __read_mostly;
103271 +static struct rtnl_link_ops ip6_link_ops;
103272
103273 static int ip6_tnl_net_id __read_mostly;
103274 struct ip6_tnl_net {
103275 @@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103276 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103277 };
103278
103279 -static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103280 +static struct rtnl_link_ops ip6_link_ops = {
103281 .kind = "ip6tnl",
103282 .maxtype = IFLA_IPTUN_MAX,
103283 .policy = ip6_tnl_policy,
103284 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103285 index bcda14d..49378c9 100644
103286 --- a/net/ipv6/ip6_vti.c
103287 +++ b/net/ipv6/ip6_vti.c
103288 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103289
103290 static int vti6_dev_init(struct net_device *dev);
103291 static void vti6_dev_setup(struct net_device *dev);
103292 -static struct rtnl_link_ops vti6_link_ops __read_mostly;
103293 +static struct rtnl_link_ops vti6_link_ops;
103294
103295 static int vti6_net_id __read_mostly;
103296 struct vti6_net {
103297 @@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103298 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103299 };
103300
103301 -static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103302 +static struct rtnl_link_ops vti6_link_ops = {
103303 .kind = "vti6",
103304 .maxtype = IFLA_VTI_MAX,
103305 .policy = vti6_policy,
103306 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103307 index e1a9583..7dd8f4d 100644
103308 --- a/net/ipv6/ipv6_sockglue.c
103309 +++ b/net/ipv6/ipv6_sockglue.c
103310 @@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103311 if (sk->sk_type != SOCK_STREAM)
103312 return -ENOPROTOOPT;
103313
103314 - msg.msg_control = optval;
103315 + msg.msg_control = (void __force_kernel *)optval;
103316 msg.msg_controllen = len;
103317 msg.msg_flags = flags;
103318
103319 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103320 index e080fbb..412b3cf 100644
103321 --- a/net/ipv6/netfilter/ip6_tables.c
103322 +++ b/net/ipv6/netfilter/ip6_tables.c
103323 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103324 #endif
103325
103326 static int get_info(struct net *net, void __user *user,
103327 - const int *len, int compat)
103328 + int len, int compat)
103329 {
103330 char name[XT_TABLE_MAXNAMELEN];
103331 struct xt_table *t;
103332 int ret;
103333
103334 - if (*len != sizeof(struct ip6t_getinfo)) {
103335 - duprintf("length %u != %zu\n", *len,
103336 + if (len != sizeof(struct ip6t_getinfo)) {
103337 + duprintf("length %u != %zu\n", len,
103338 sizeof(struct ip6t_getinfo));
103339 return -EINVAL;
103340 }
103341 @@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103342 info.size = private->size;
103343 strcpy(info.name, name);
103344
103345 - if (copy_to_user(user, &info, *len) != 0)
103346 + if (copy_to_user(user, &info, len) != 0)
103347 ret = -EFAULT;
103348 else
103349 ret = 0;
103350 @@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103351
103352 switch (cmd) {
103353 case IP6T_SO_GET_INFO:
103354 - ret = get_info(sock_net(sk), user, len, 1);
103355 + ret = get_info(sock_net(sk), user, *len, 1);
103356 break;
103357 case IP6T_SO_GET_ENTRIES:
103358 ret = compat_get_entries(sock_net(sk), user, len);
103359 @@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103360
103361 switch (cmd) {
103362 case IP6T_SO_GET_INFO:
103363 - ret = get_info(sock_net(sk), user, len, 0);
103364 + ret = get_info(sock_net(sk), user, *len, 0);
103365 break;
103366
103367 case IP6T_SO_GET_ENTRIES:
103368 diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103369 index 6f187c8..34b367f 100644
103370 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103371 +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103372 @@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103373
103374 static int nf_ct_frag6_sysctl_register(struct net *net)
103375 {
103376 - struct ctl_table *table;
103377 + ctl_table_no_const *table = NULL;
103378 struct ctl_table_header *hdr;
103379
103380 - table = nf_ct_frag6_sysctl_table;
103381 if (!net_eq(net, &init_net)) {
103382 - table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103383 + table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103384 GFP_KERNEL);
103385 if (table == NULL)
103386 goto err_alloc;
103387 @@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103388 table[2].data = &net->nf_frag.frags.high_thresh;
103389 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103390 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103391 - }
103392 -
103393 - hdr = register_net_sysctl(net, "net/netfilter", table);
103394 + hdr = register_net_sysctl(net, "net/netfilter", table);
103395 + } else
103396 + hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103397 if (hdr == NULL)
103398 goto err_reg;
103399
103400 @@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103401 return 0;
103402
103403 err_reg:
103404 - if (!net_eq(net, &init_net))
103405 - kfree(table);
103406 + kfree(table);
103407 err_alloc:
103408 return -ENOMEM;
103409 }
103410 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103411 index 5b7a1ed..d9da205 100644
103412 --- a/net/ipv6/ping.c
103413 +++ b/net/ipv6/ping.c
103414 @@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103415 };
103416 #endif
103417
103418 +static struct pingv6_ops real_pingv6_ops = {
103419 + .ipv6_recv_error = ipv6_recv_error,
103420 + .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103421 + .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103422 + .icmpv6_err_convert = icmpv6_err_convert,
103423 + .ipv6_icmp_error = ipv6_icmp_error,
103424 + .ipv6_chk_addr = ipv6_chk_addr,
103425 +};
103426 +
103427 +static struct pingv6_ops dummy_pingv6_ops = {
103428 + .ipv6_recv_error = dummy_ipv6_recv_error,
103429 + .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103430 + .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103431 + .icmpv6_err_convert = dummy_icmpv6_err_convert,
103432 + .ipv6_icmp_error = dummy_ipv6_icmp_error,
103433 + .ipv6_chk_addr = dummy_ipv6_chk_addr,
103434 +};
103435 +
103436 int __init pingv6_init(void)
103437 {
103438 #ifdef CONFIG_PROC_FS
103439 @@ -247,13 +265,7 @@ int __init pingv6_init(void)
103440 if (ret)
103441 return ret;
103442 #endif
103443 - pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103444 - pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103445 - pingv6_ops.ip6_datagram_recv_specific_ctl =
103446 - ip6_datagram_recv_specific_ctl;
103447 - pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103448 - pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103449 - pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103450 + pingv6_ops = &real_pingv6_ops;
103451 return inet6_register_protosw(&pingv6_protosw);
103452 }
103453
103454 @@ -262,14 +274,9 @@ int __init pingv6_init(void)
103455 */
103456 void pingv6_exit(void)
103457 {
103458 - pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103459 - pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103460 - pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103461 - pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103462 - pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103463 - pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103464 #ifdef CONFIG_PROC_FS
103465 unregister_pernet_subsys(&ping_v6_net_ops);
103466 #endif
103467 + pingv6_ops = &dummy_pingv6_ops;
103468 inet6_unregister_protosw(&pingv6_protosw);
103469 }
103470 diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103471 index 1752cd0..3c6af41 100644
103472 --- a/net/ipv6/proc.c
103473 +++ b/net/ipv6/proc.c
103474 @@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103475 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103476 goto proc_snmp6_fail;
103477
103478 - net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103479 + net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103480 if (!net->mib.proc_net_devsnmp6)
103481 goto proc_dev_snmp6_fail;
103482 return 0;
103483 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103484 index 896af88..6e2ba628 100644
103485 --- a/net/ipv6/raw.c
103486 +++ b/net/ipv6/raw.c
103487 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103488 {
103489 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103490 skb_checksum_complete(skb)) {
103491 - atomic_inc(&sk->sk_drops);
103492 + atomic_inc_unchecked(&sk->sk_drops);
103493 kfree_skb(skb);
103494 return NET_RX_DROP;
103495 }
103496 @@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103497 struct raw6_sock *rp = raw6_sk(sk);
103498
103499 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103500 - atomic_inc(&sk->sk_drops);
103501 + atomic_inc_unchecked(&sk->sk_drops);
103502 kfree_skb(skb);
103503 return NET_RX_DROP;
103504 }
103505 @@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103506
103507 if (inet->hdrincl) {
103508 if (skb_checksum_complete(skb)) {
103509 - atomic_inc(&sk->sk_drops);
103510 + atomic_inc_unchecked(&sk->sk_drops);
103511 kfree_skb(skb);
103512 return NET_RX_DROP;
103513 }
103514 @@ -608,7 +608,7 @@ out:
103515 return err;
103516 }
103517
103518 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103519 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103520 struct flowi6 *fl6, struct dst_entry **dstp,
103521 unsigned int flags)
103522 {
103523 @@ -914,12 +914,15 @@ do_confirm:
103524 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103525 char __user *optval, int optlen)
103526 {
103527 + struct icmp6_filter filter;
103528 +
103529 switch (optname) {
103530 case ICMPV6_FILTER:
103531 if (optlen > sizeof(struct icmp6_filter))
103532 optlen = sizeof(struct icmp6_filter);
103533 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103534 + if (copy_from_user(&filter, optval, optlen))
103535 return -EFAULT;
103536 + raw6_sk(sk)->filter = filter;
103537 return 0;
103538 default:
103539 return -ENOPROTOOPT;
103540 @@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103541 char __user *optval, int __user *optlen)
103542 {
103543 int len;
103544 + struct icmp6_filter filter;
103545
103546 switch (optname) {
103547 case ICMPV6_FILTER:
103548 @@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103549 len = sizeof(struct icmp6_filter);
103550 if (put_user(len, optlen))
103551 return -EFAULT;
103552 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103553 + filter = raw6_sk(sk)->filter;
103554 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
103555 return -EFAULT;
103556 return 0;
103557 default:
103558 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103559 index 1a157ca..9fc05f4 100644
103560 --- a/net/ipv6/reassembly.c
103561 +++ b/net/ipv6/reassembly.c
103562 @@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103563
103564 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103565 {
103566 - struct ctl_table *table;
103567 + ctl_table_no_const *table = NULL;
103568 struct ctl_table_header *hdr;
103569
103570 - table = ip6_frags_ns_ctl_table;
103571 if (!net_eq(net, &init_net)) {
103572 - table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103573 + table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103574 if (table == NULL)
103575 goto err_alloc;
103576
103577 @@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103578 /* Don't export sysctls to unprivileged users */
103579 if (net->user_ns != &init_user_ns)
103580 table[0].procname = NULL;
103581 - }
103582 + hdr = register_net_sysctl(net, "net/ipv6", table);
103583 + } else
103584 + hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103585
103586 - hdr = register_net_sysctl(net, "net/ipv6", table);
103587 if (hdr == NULL)
103588 goto err_reg;
103589
103590 @@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103591 return 0;
103592
103593 err_reg:
103594 - if (!net_eq(net, &init_net))
103595 - kfree(table);
103596 + kfree(table);
103597 err_alloc:
103598 return -ENOMEM;
103599 }
103600 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103601 index a318dd89..42a612c 100644
103602 --- a/net/ipv6/route.c
103603 +++ b/net/ipv6/route.c
103604 @@ -1150,12 +1150,9 @@ static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
103605 struct net *net = dev_net(dst->dev);
103606
103607 rt6->rt6i_flags |= RTF_MODIFIED;
103608 - if (mtu < IPV6_MIN_MTU) {
103609 - u32 features = dst_metric(dst, RTAX_FEATURES);
103610 + if (mtu < IPV6_MIN_MTU)
103611 mtu = IPV6_MIN_MTU;
103612 - features |= RTAX_FEATURE_ALLFRAG;
103613 - dst_metric_set(dst, RTAX_FEATURES, features);
103614 - }
103615 +
103616 dst_metric_set(dst, RTAX_MTU, mtu);
103617 rt6_update_expires(rt6, net->ipv6.sysctl.ip6_rt_mtu_expires);
103618 }
103619 @@ -2965,7 +2962,7 @@ struct ctl_table ipv6_route_table_template[] = {
103620
103621 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103622 {
103623 - struct ctl_table *table;
103624 + ctl_table_no_const *table;
103625
103626 table = kmemdup(ipv6_route_table_template,
103627 sizeof(ipv6_route_table_template),
103628 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103629 index a24557a..00a9ed1 100644
103630 --- a/net/ipv6/sit.c
103631 +++ b/net/ipv6/sit.c
103632 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103633 static void ipip6_dev_free(struct net_device *dev);
103634 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103635 __be32 *v4dst);
103636 -static struct rtnl_link_ops sit_link_ops __read_mostly;
103637 +static struct rtnl_link_ops sit_link_ops;
103638
103639 static int sit_net_id __read_mostly;
103640 struct sit_net {
103641 @@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103642 unregister_netdevice_queue(dev, head);
103643 }
103644
103645 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
103646 +static struct rtnl_link_ops sit_link_ops = {
103647 .kind = "sit",
103648 .maxtype = IFLA_IPTUN_MAX,
103649 .policy = ipip6_policy,
103650 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103651 index c5c10fa..2577d51 100644
103652 --- a/net/ipv6/sysctl_net_ipv6.c
103653 +++ b/net/ipv6/sysctl_net_ipv6.c
103654 @@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103655
103656 static int __net_init ipv6_sysctl_net_init(struct net *net)
103657 {
103658 - struct ctl_table *ipv6_table;
103659 + ctl_table_no_const *ipv6_table;
103660 struct ctl_table *ipv6_route_table;
103661 struct ctl_table *ipv6_icmp_table;
103662 int err;
103663 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103664 index c277951..c7ee5bf 100644
103665 --- a/net/ipv6/tcp_ipv6.c
103666 +++ b/net/ipv6/tcp_ipv6.c
103667 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
103668 }
103669 }
103670
103671 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103672 +extern int grsec_enable_blackhole;
103673 +#endif
103674 +
103675 static void tcp_v6_hash(struct sock *sk)
103676 {
103677 if (sk->sk_state != TCP_CLOSE) {
103678 @@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
103679 return 0;
103680
103681 reset:
103682 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103683 + if (!grsec_enable_blackhole)
103684 +#endif
103685 tcp_v6_send_reset(sk, skb);
103686 discard:
103687 if (opt_skb)
103688 @@ -1434,12 +1441,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
103689
103690 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
103691 tcp_v6_iif(skb));
103692 - if (!sk)
103693 + if (!sk) {
103694 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103695 + ret = 1;
103696 +#endif
103697 goto no_tcp_socket;
103698 + }
103699
103700 process:
103701 - if (sk->sk_state == TCP_TIME_WAIT)
103702 + if (sk->sk_state == TCP_TIME_WAIT) {
103703 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103704 + ret = 2;
103705 +#endif
103706 goto do_time_wait;
103707 + }
103708
103709 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
103710 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103711 @@ -1486,6 +1501,10 @@ csum_error:
103712 bad_packet:
103713 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103714 } else {
103715 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103716 + if (!grsec_enable_blackhole || (ret == 1 &&
103717 + (skb->dev->flags & IFF_LOOPBACK)))
103718 +#endif
103719 tcp_v6_send_reset(NULL, skb);
103720 }
103721
103722 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
103723 index f6ba535..b41033f 100644
103724 --- a/net/ipv6/udp.c
103725 +++ b/net/ipv6/udp.c
103726 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
103727 udp_ipv6_hash_secret + net_hash_mix(net));
103728 }
103729
103730 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103731 +extern int grsec_enable_blackhole;
103732 +#endif
103733 +
103734 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
103735 {
103736 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
103737 @@ -434,7 +438,7 @@ try_again:
103738 if (unlikely(err)) {
103739 trace_kfree_skb(skb, udpv6_recvmsg);
103740 if (!peeked) {
103741 - atomic_inc(&sk->sk_drops);
103742 + atomic_inc_unchecked(&sk->sk_drops);
103743 if (is_udp4)
103744 UDP_INC_STATS_USER(sock_net(sk),
103745 UDP_MIB_INERRORS,
103746 @@ -701,7 +705,7 @@ csum_error:
103747 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103748 drop:
103749 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103750 - atomic_inc(&sk->sk_drops);
103751 + atomic_inc_unchecked(&sk->sk_drops);
103752 kfree_skb(skb);
103753 return -1;
103754 }
103755 @@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103756 if (likely(skb1 == NULL))
103757 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103758 if (!skb1) {
103759 - atomic_inc(&sk->sk_drops);
103760 + atomic_inc_unchecked(&sk->sk_drops);
103761 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103762 IS_UDPLITE(sk));
103763 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103764 @@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103765 goto csum_error;
103766
103767 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103768 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103769 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103770 +#endif
103771 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
103772
103773 kfree_skb(skb);
103774 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
103775 index 5f98364..5ca982a 100644
103776 --- a/net/ipv6/xfrm6_policy.c
103777 +++ b/net/ipv6/xfrm6_policy.c
103778 @@ -130,8 +130,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103779 {
103780 struct flowi6 *fl6 = &fl->u.ip6;
103781 int onlyproto = 0;
103782 - u16 offset = skb_network_header_len(skb);
103783 const struct ipv6hdr *hdr = ipv6_hdr(skb);
103784 + u16 offset = sizeof(*hdr);
103785 struct ipv6_opt_hdr *exthdr;
103786 const unsigned char *nh = skb_network_header(skb);
103787 u8 nexthdr = nh[IP6CB(skb)->nhoff];
103788 @@ -217,11 +217,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103789 }
103790 }
103791
103792 -static inline int xfrm6_garbage_collect(struct dst_ops *ops)
103793 +static int xfrm6_garbage_collect(struct dst_ops *ops)
103794 {
103795 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
103796
103797 - xfrm6_policy_afinfo.garbage_collect(net);
103798 + xfrm_garbage_collect_deferred(net);
103799 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
103800 }
103801
103802 @@ -334,19 +334,19 @@ static struct ctl_table xfrm6_policy_table[] = {
103803
103804 static int __net_init xfrm6_net_init(struct net *net)
103805 {
103806 - struct ctl_table *table;
103807 + ctl_table_no_const *table = NULL;
103808 struct ctl_table_header *hdr;
103809
103810 - table = xfrm6_policy_table;
103811 if (!net_eq(net, &init_net)) {
103812 - table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103813 + table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103814 if (!table)
103815 goto err_alloc;
103816
103817 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
103818 - }
103819 + hdr = register_net_sysctl(net, "net/ipv6", table);
103820 + } else
103821 + hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
103822
103823 - hdr = register_net_sysctl(net, "net/ipv6", table);
103824 if (!hdr)
103825 goto err_reg;
103826
103827 @@ -354,8 +354,7 @@ static int __net_init xfrm6_net_init(struct net *net)
103828 return 0;
103829
103830 err_reg:
103831 - if (!net_eq(net, &init_net))
103832 - kfree(table);
103833 + kfree(table);
103834 err_alloc:
103835 return -ENOMEM;
103836 }
103837 diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
103838 index e15c16a..7cf07aa 100644
103839 --- a/net/ipx/ipx_proc.c
103840 +++ b/net/ipx/ipx_proc.c
103841 @@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
103842 struct proc_dir_entry *p;
103843 int rc = -ENOMEM;
103844
103845 - ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
103846 + ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
103847
103848 if (!ipx_proc_dir)
103849 goto out;
103850 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
103851 index 61ceb4c..e788eb8 100644
103852 --- a/net/irda/ircomm/ircomm_tty.c
103853 +++ b/net/irda/ircomm/ircomm_tty.c
103854 @@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103855 add_wait_queue(&port->open_wait, &wait);
103856
103857 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
103858 - __FILE__, __LINE__, tty->driver->name, port->count);
103859 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103860
103861 spin_lock_irqsave(&port->lock, flags);
103862 - port->count--;
103863 + atomic_dec(&port->count);
103864 port->blocked_open++;
103865 spin_unlock_irqrestore(&port->lock, flags);
103866
103867 @@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103868 }
103869
103870 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
103871 - __FILE__, __LINE__, tty->driver->name, port->count);
103872 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103873
103874 schedule();
103875 }
103876 @@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103877
103878 spin_lock_irqsave(&port->lock, flags);
103879 if (!tty_hung_up_p(filp))
103880 - port->count++;
103881 + atomic_inc(&port->count);
103882 port->blocked_open--;
103883 spin_unlock_irqrestore(&port->lock, flags);
103884
103885 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
103886 - __FILE__, __LINE__, tty->driver->name, port->count);
103887 + __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103888
103889 if (!retval)
103890 port->flags |= ASYNC_NORMAL_ACTIVE;
103891 @@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
103892
103893 /* ++ is not atomic, so this should be protected - Jean II */
103894 spin_lock_irqsave(&self->port.lock, flags);
103895 - self->port.count++;
103896 + atomic_inc(&self->port.count);
103897 spin_unlock_irqrestore(&self->port.lock, flags);
103898 tty_port_tty_set(&self->port, tty);
103899
103900 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
103901 - self->line, self->port.count);
103902 + self->line, atomic_read(&self->port.count));
103903
103904 /* Not really used by us, but lets do it anyway */
103905 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
103906 @@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
103907 tty_kref_put(port->tty);
103908 }
103909 port->tty = NULL;
103910 - port->count = 0;
103911 + atomic_set(&port->count, 0);
103912 spin_unlock_irqrestore(&port->lock, flags);
103913
103914 wake_up_interruptible(&port->open_wait);
103915 @@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
103916 seq_putc(m, '\n');
103917
103918 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
103919 - seq_printf(m, "Open count: %d\n", self->port.count);
103920 + seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
103921 seq_printf(m, "Max data size: %d\n", self->max_data_size);
103922 seq_printf(m, "Max header size: %d\n", self->max_header_size);
103923
103924 diff --git a/net/irda/irproc.c b/net/irda/irproc.c
103925 index b9ac598..f88cc56 100644
103926 --- a/net/irda/irproc.c
103927 +++ b/net/irda/irproc.c
103928 @@ -66,7 +66,7 @@ void __init irda_proc_register(void)
103929 {
103930 int i;
103931
103932 - proc_irda = proc_mkdir("irda", init_net.proc_net);
103933 + proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
103934 if (proc_irda == NULL)
103935 return;
103936
103937 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
103938 index a089b6b..3ca3b60 100644
103939 --- a/net/iucv/af_iucv.c
103940 +++ b/net/iucv/af_iucv.c
103941 @@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
103942 {
103943 char name[12];
103944
103945 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
103946 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103947 while (__iucv_get_sock_by_name(name)) {
103948 sprintf(name, "%08x",
103949 - atomic_inc_return(&iucv_sk_list.autobind_name));
103950 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103951 }
103952 memcpy(iucv->src_name, name, 8);
103953 }
103954 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
103955 index 2a6a1fd..6c112b0 100644
103956 --- a/net/iucv/iucv.c
103957 +++ b/net/iucv/iucv.c
103958 @@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
103959 return NOTIFY_OK;
103960 }
103961
103962 -static struct notifier_block __refdata iucv_cpu_notifier = {
103963 +static struct notifier_block iucv_cpu_notifier = {
103964 .notifier_call = iucv_cpu_notify,
103965 };
103966
103967 diff --git a/net/key/af_key.c b/net/key/af_key.c
103968 index 1847ec4..26ef732 100644
103969 --- a/net/key/af_key.c
103970 +++ b/net/key/af_key.c
103971 @@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
103972 static u32 get_acqseq(void)
103973 {
103974 u32 res;
103975 - static atomic_t acqseq;
103976 + static atomic_unchecked_t acqseq;
103977
103978 do {
103979 - res = atomic_inc_return(&acqseq);
103980 + res = atomic_inc_return_unchecked(&acqseq);
103981 } while (!res);
103982 return res;
103983 }
103984 diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
103985 index edb78e6..8dc654a 100644
103986 --- a/net/l2tp/l2tp_eth.c
103987 +++ b/net/l2tp/l2tp_eth.c
103988 @@ -42,12 +42,12 @@ struct l2tp_eth {
103989 struct sock *tunnel_sock;
103990 struct l2tp_session *session;
103991 struct list_head list;
103992 - atomic_long_t tx_bytes;
103993 - atomic_long_t tx_packets;
103994 - atomic_long_t tx_dropped;
103995 - atomic_long_t rx_bytes;
103996 - atomic_long_t rx_packets;
103997 - atomic_long_t rx_errors;
103998 + atomic_long_unchecked_t tx_bytes;
103999 + atomic_long_unchecked_t tx_packets;
104000 + atomic_long_unchecked_t tx_dropped;
104001 + atomic_long_unchecked_t rx_bytes;
104002 + atomic_long_unchecked_t rx_packets;
104003 + atomic_long_unchecked_t rx_errors;
104004 };
104005
104006 /* via l2tp_session_priv() */
104007 @@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
104008 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
104009
104010 if (likely(ret == NET_XMIT_SUCCESS)) {
104011 - atomic_long_add(len, &priv->tx_bytes);
104012 - atomic_long_inc(&priv->tx_packets);
104013 + atomic_long_add_unchecked(len, &priv->tx_bytes);
104014 + atomic_long_inc_unchecked(&priv->tx_packets);
104015 } else {
104016 - atomic_long_inc(&priv->tx_dropped);
104017 + atomic_long_inc_unchecked(&priv->tx_dropped);
104018 }
104019 return NETDEV_TX_OK;
104020 }
104021 @@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
104022 {
104023 struct l2tp_eth *priv = netdev_priv(dev);
104024
104025 - stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
104026 - stats->tx_packets = atomic_long_read(&priv->tx_packets);
104027 - stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
104028 - stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
104029 - stats->rx_packets = atomic_long_read(&priv->rx_packets);
104030 - stats->rx_errors = atomic_long_read(&priv->rx_errors);
104031 + stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
104032 + stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
104033 + stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
104034 + stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
104035 + stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
104036 + stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
104037 return stats;
104038 }
104039
104040 @@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
104041 nf_reset(skb);
104042
104043 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
104044 - atomic_long_inc(&priv->rx_packets);
104045 - atomic_long_add(data_len, &priv->rx_bytes);
104046 + atomic_long_inc_unchecked(&priv->rx_packets);
104047 + atomic_long_add_unchecked(data_len, &priv->rx_bytes);
104048 } else {
104049 - atomic_long_inc(&priv->rx_errors);
104050 + atomic_long_inc_unchecked(&priv->rx_errors);
104051 }
104052 return;
104053
104054 error:
104055 - atomic_long_inc(&priv->rx_errors);
104056 + atomic_long_inc_unchecked(&priv->rx_errors);
104057 kfree_skb(skb);
104058 }
104059
104060 diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
104061 index 1a3c7e0..80f8b0c 100644
104062 --- a/net/llc/llc_proc.c
104063 +++ b/net/llc/llc_proc.c
104064 @@ -247,7 +247,7 @@ int __init llc_proc_init(void)
104065 int rc = -ENOMEM;
104066 struct proc_dir_entry *p;
104067
104068 - llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
104069 + llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
104070 if (!llc_proc_dir)
104071 goto out;
104072
104073 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
104074 index 343da1e..509873f 100644
104075 --- a/net/mac80211/cfg.c
104076 +++ b/net/mac80211/cfg.c
104077 @@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
104078 ret = ieee80211_vif_use_channel(sdata, chandef,
104079 IEEE80211_CHANCTX_EXCLUSIVE);
104080 }
104081 - } else if (local->open_count == local->monitors) {
104082 + } else if (local_read(&local->open_count) == local->monitors) {
104083 local->_oper_chandef = *chandef;
104084 ieee80211_hw_config(local, 0);
104085 }
104086 @@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
104087 else
104088 local->probe_req_reg--;
104089
104090 - if (!local->open_count)
104091 + if (!local_read(&local->open_count))
104092 break;
104093
104094 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
104095 @@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
104096 if (chanctx_conf) {
104097 *chandef = sdata->vif.bss_conf.chandef;
104098 ret = 0;
104099 - } else if (local->open_count > 0 &&
104100 - local->open_count == local->monitors &&
104101 + } else if (local_read(&local->open_count) > 0 &&
104102 + local_read(&local->open_count) == local->monitors &&
104103 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
104104 if (local->use_chanctx)
104105 *chandef = local->monitor_chandef;
104106 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
104107 index 8c68da3..0695016 100644
104108 --- a/net/mac80211/ieee80211_i.h
104109 +++ b/net/mac80211/ieee80211_i.h
104110 @@ -29,6 +29,7 @@
104111 #include <net/ieee80211_radiotap.h>
104112 #include <net/cfg80211.h>
104113 #include <net/mac80211.h>
104114 +#include <asm/local.h>
104115 #include "key.h"
104116 #include "sta_info.h"
104117 #include "debug.h"
104118 @@ -1057,7 +1058,7 @@ struct ieee80211_local {
104119 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
104120 spinlock_t queue_stop_reason_lock;
104121
104122 - int open_count;
104123 + local_t open_count;
104124 int monitors, cooked_mntrs;
104125 /* number of interfaces with corresponding FIF_ flags */
104126 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
104127 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
104128 index eeae0ab..0f24585 100644
104129 --- a/net/mac80211/iface.c
104130 +++ b/net/mac80211/iface.c
104131 @@ -533,7 +533,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104132 break;
104133 }
104134
104135 - if (local->open_count == 0) {
104136 + if (local_read(&local->open_count) == 0) {
104137 res = drv_start(local);
104138 if (res)
104139 goto err_del_bss;
104140 @@ -580,7 +580,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104141 res = drv_add_interface(local, sdata);
104142 if (res)
104143 goto err_stop;
104144 - } else if (local->monitors == 0 && local->open_count == 0) {
104145 + } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
104146 res = ieee80211_add_virtual_monitor(local);
104147 if (res)
104148 goto err_stop;
104149 @@ -689,7 +689,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104150 atomic_inc(&local->iff_promiscs);
104151
104152 if (coming_up)
104153 - local->open_count++;
104154 + local_inc(&local->open_count);
104155
104156 if (hw_reconf_flags)
104157 ieee80211_hw_config(local, hw_reconf_flags);
104158 @@ -727,7 +727,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
104159 err_del_interface:
104160 drv_remove_interface(local, sdata);
104161 err_stop:
104162 - if (!local->open_count)
104163 + if (!local_read(&local->open_count))
104164 drv_stop(local);
104165 err_del_bss:
104166 sdata->bss = NULL;
104167 @@ -893,7 +893,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104168 }
104169
104170 if (going_down)
104171 - local->open_count--;
104172 + local_dec(&local->open_count);
104173
104174 switch (sdata->vif.type) {
104175 case NL80211_IFTYPE_AP_VLAN:
104176 @@ -955,7 +955,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104177 }
104178 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
104179
104180 - if (local->open_count == 0)
104181 + if (local_read(&local->open_count) == 0)
104182 ieee80211_clear_tx_pending(local);
104183
104184 /*
104185 @@ -998,7 +998,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104186 if (cancel_scan)
104187 flush_delayed_work(&local->scan_work);
104188
104189 - if (local->open_count == 0) {
104190 + if (local_read(&local->open_count) == 0) {
104191 ieee80211_stop_device(local);
104192
104193 /* no reconfiguring after stop! */
104194 @@ -1009,7 +1009,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104195 ieee80211_configure_filter(local);
104196 ieee80211_hw_config(local, hw_reconf_flags);
104197
104198 - if (local->monitors == local->open_count)
104199 + if (local->monitors == local_read(&local->open_count))
104200 ieee80211_add_virtual_monitor(local);
104201 }
104202
104203 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
104204 index 0de7c93..884b2ca 100644
104205 --- a/net/mac80211/main.c
104206 +++ b/net/mac80211/main.c
104207 @@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
104208 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
104209 IEEE80211_CONF_CHANGE_POWER);
104210
104211 - if (changed && local->open_count) {
104212 + if (changed && local_read(&local->open_count)) {
104213 ret = drv_config(local, changed);
104214 /*
104215 * Goal:
104216 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
104217 index 4c5192e..04cc0d8 100644
104218 --- a/net/mac80211/pm.c
104219 +++ b/net/mac80211/pm.c
104220 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104221 struct ieee80211_sub_if_data *sdata;
104222 struct sta_info *sta;
104223
104224 - if (!local->open_count)
104225 + if (!local_read(&local->open_count))
104226 goto suspend;
104227
104228 ieee80211_scan_cancel(local);
104229 @@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104230 cancel_work_sync(&local->dynamic_ps_enable_work);
104231 del_timer_sync(&local->dynamic_ps_timer);
104232
104233 - local->wowlan = wowlan && local->open_count;
104234 + local->wowlan = wowlan && local_read(&local->open_count);
104235 if (local->wowlan) {
104236 int err = drv_suspend(local, wowlan);
104237 if (err < 0) {
104238 @@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104239 WARN_ON(!list_empty(&local->chanctx_list));
104240
104241 /* stop hardware - this must stop RX */
104242 - if (local->open_count)
104243 + if (local_read(&local->open_count))
104244 ieee80211_stop_device(local);
104245
104246 suspend:
104247 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
104248 index 6081329..ab23834 100644
104249 --- a/net/mac80211/rate.c
104250 +++ b/net/mac80211/rate.c
104251 @@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
104252
104253 ASSERT_RTNL();
104254
104255 - if (local->open_count)
104256 + if (local_read(&local->open_count))
104257 return -EBUSY;
104258
104259 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
104260 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
104261 index 3c61060..7bed2e3 100644
104262 --- a/net/mac80211/util.c
104263 +++ b/net/mac80211/util.c
104264 @@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104265 }
104266 #endif
104267 /* everything else happens only if HW was up & running */
104268 - if (!local->open_count)
104269 + if (!local_read(&local->open_count))
104270 goto wake_up;
104271
104272 /*
104273 @@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104274 local->in_reconfig = false;
104275 barrier();
104276
104277 - if (local->monitors == local->open_count && local->monitors > 0)
104278 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
104279 ieee80211_add_virtual_monitor(local);
104280
104281 /*
104282 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
104283 index ae5096ab..e5aa70a 100644
104284 --- a/net/netfilter/Kconfig
104285 +++ b/net/netfilter/Kconfig
104286 @@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104287
104288 To compile it as a module, choose M here. If unsure, say N.
104289
104290 +config NETFILTER_XT_MATCH_GRADM
104291 + tristate '"gradm" match support'
104292 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104293 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104294 + ---help---
104295 + The gradm match allows to match on grsecurity RBAC being enabled.
104296 + It is useful when iptables rules are applied early on bootup to
104297 + prevent connections to the machine (except from a trusted host)
104298 + while the RBAC system is disabled.
104299 +
104300 config NETFILTER_XT_MATCH_HASHLIMIT
104301 tristate '"hashlimit" match support'
104302 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104303 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104304 index a9571be..c59e173 100644
104305 --- a/net/netfilter/Makefile
104306 +++ b/net/netfilter/Makefile
104307 @@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104308 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104309 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104310 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104311 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104312 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104313 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104314 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104315 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104316 index d259da3..6a32b2c 100644
104317 --- a/net/netfilter/ipset/ip_set_core.c
104318 +++ b/net/netfilter/ipset/ip_set_core.c
104319 @@ -1952,7 +1952,7 @@ done:
104320 return ret;
104321 }
104322
104323 -static struct nf_sockopt_ops so_set __read_mostly = {
104324 +static struct nf_sockopt_ops so_set = {
104325 .pf = PF_INET,
104326 .get_optmin = SO_IP_SET,
104327 .get_optmax = SO_IP_SET + 1,
104328 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104329 index b0f7b62..0541842 100644
104330 --- a/net/netfilter/ipvs/ip_vs_conn.c
104331 +++ b/net/netfilter/ipvs/ip_vs_conn.c
104332 @@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104333 /* Increase the refcnt counter of the dest */
104334 ip_vs_dest_hold(dest);
104335
104336 - conn_flags = atomic_read(&dest->conn_flags);
104337 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
104338 if (cp->protocol != IPPROTO_UDP)
104339 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104340 flags = cp->flags;
104341 @@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104342
104343 cp->control = NULL;
104344 atomic_set(&cp->n_control, 0);
104345 - atomic_set(&cp->in_pkts, 0);
104346 + atomic_set_unchecked(&cp->in_pkts, 0);
104347
104348 cp->packet_xmit = NULL;
104349 cp->app = NULL;
104350 @@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104351
104352 /* Don't drop the entry if its number of incoming packets is not
104353 located in [0, 8] */
104354 - i = atomic_read(&cp->in_pkts);
104355 + i = atomic_read_unchecked(&cp->in_pkts);
104356 if (i > 8 || i < 0) return 0;
104357
104358 if (!todrop_rate[i]) return 0;
104359 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104360 index 990decb..5075248 100644
104361 --- a/net/netfilter/ipvs/ip_vs_core.c
104362 +++ b/net/netfilter/ipvs/ip_vs_core.c
104363 @@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104364 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104365 /* do not touch skb anymore */
104366
104367 - atomic_inc(&cp->in_pkts);
104368 + atomic_inc_unchecked(&cp->in_pkts);
104369 ip_vs_conn_put(cp);
104370 return ret;
104371 }
104372 @@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104373 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104374 pkts = sysctl_sync_threshold(ipvs);
104375 else
104376 - pkts = atomic_add_return(1, &cp->in_pkts);
104377 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104378
104379 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104380 ip_vs_sync_conn(net, cp, pkts);
104381 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104382 index ac7ba68..9735acb9 100644
104383 --- a/net/netfilter/ipvs/ip_vs_ctl.c
104384 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
104385 @@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104386 */
104387 ip_vs_rs_hash(ipvs, dest);
104388 }
104389 - atomic_set(&dest->conn_flags, conn_flags);
104390 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
104391
104392 /* bind the service */
104393 old_svc = rcu_dereference_protected(dest->svc, 1);
104394 @@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104395 * align with netns init in ip_vs_control_net_init()
104396 */
104397
104398 -static struct ctl_table vs_vars[] = {
104399 +static ctl_table_no_const vs_vars[] __read_only = {
104400 {
104401 .procname = "amemthresh",
104402 .maxlen = sizeof(int),
104403 @@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104404 " %-7s %-6d %-10d %-10d\n",
104405 &dest->addr.in6,
104406 ntohs(dest->port),
104407 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104408 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104409 atomic_read(&dest->weight),
104410 atomic_read(&dest->activeconns),
104411 atomic_read(&dest->inactconns));
104412 @@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104413 "%-7s %-6d %-10d %-10d\n",
104414 ntohl(dest->addr.ip),
104415 ntohs(dest->port),
104416 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104417 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104418 atomic_read(&dest->weight),
104419 atomic_read(&dest->activeconns),
104420 atomic_read(&dest->inactconns));
104421 @@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104422
104423 entry.addr = dest->addr.ip;
104424 entry.port = dest->port;
104425 - entry.conn_flags = atomic_read(&dest->conn_flags);
104426 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104427 entry.weight = atomic_read(&dest->weight);
104428 entry.u_threshold = dest->u_threshold;
104429 entry.l_threshold = dest->l_threshold;
104430 @@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104431 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104432 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104433 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104434 - (atomic_read(&dest->conn_flags) &
104435 + (atomic_read_unchecked(&dest->conn_flags) &
104436 IP_VS_CONN_F_FWD_MASK)) ||
104437 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104438 atomic_read(&dest->weight)) ||
104439 @@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104440 {
104441 int idx;
104442 struct netns_ipvs *ipvs = net_ipvs(net);
104443 - struct ctl_table *tbl;
104444 + ctl_table_no_const *tbl;
104445
104446 atomic_set(&ipvs->dropentry, 0);
104447 spin_lock_init(&ipvs->dropentry_lock);
104448 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104449 index 127f140..553d652 100644
104450 --- a/net/netfilter/ipvs/ip_vs_lblc.c
104451 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
104452 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104453 * IPVS LBLC sysctl table
104454 */
104455 #ifdef CONFIG_SYSCTL
104456 -static struct ctl_table vs_vars_table[] = {
104457 +static ctl_table_no_const vs_vars_table[] __read_only = {
104458 {
104459 .procname = "lblc_expiration",
104460 .data = NULL,
104461 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104462 index 2229d2d..b32b785 100644
104463 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
104464 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104465 @@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104466 * IPVS LBLCR sysctl table
104467 */
104468
104469 -static struct ctl_table vs_vars_table[] = {
104470 +static ctl_table_no_const vs_vars_table[] __read_only = {
104471 {
104472 .procname = "lblcr_expiration",
104473 .data = NULL,
104474 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104475 index 7162c86..9eeb60e 100644
104476 --- a/net/netfilter/ipvs/ip_vs_sync.c
104477 +++ b/net/netfilter/ipvs/ip_vs_sync.c
104478 @@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104479 cp = cp->control;
104480 if (cp) {
104481 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104482 - pkts = atomic_add_return(1, &cp->in_pkts);
104483 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104484 else
104485 pkts = sysctl_sync_threshold(ipvs);
104486 ip_vs_sync_conn(net, cp->control, pkts);
104487 @@ -771,7 +771,7 @@ control:
104488 if (!cp)
104489 return;
104490 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104491 - pkts = atomic_add_return(1, &cp->in_pkts);
104492 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104493 else
104494 pkts = sysctl_sync_threshold(ipvs);
104495 goto sloop;
104496 @@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104497
104498 if (opt)
104499 memcpy(&cp->in_seq, opt, sizeof(*opt));
104500 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104501 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104502 cp->state = state;
104503 cp->old_state = cp->state;
104504 /*
104505 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104506 index bd90bf8..816a020d 100644
104507 --- a/net/netfilter/ipvs/ip_vs_xmit.c
104508 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
104509 @@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104510 else
104511 rc = NF_ACCEPT;
104512 /* do not touch skb anymore */
104513 - atomic_inc(&cp->in_pkts);
104514 + atomic_inc_unchecked(&cp->in_pkts);
104515 goto out;
104516 }
104517
104518 @@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104519 else
104520 rc = NF_ACCEPT;
104521 /* do not touch skb anymore */
104522 - atomic_inc(&cp->in_pkts);
104523 + atomic_inc_unchecked(&cp->in_pkts);
104524 goto out;
104525 }
104526
104527 diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104528 index a4b5e2a..13b1de3 100644
104529 --- a/net/netfilter/nf_conntrack_acct.c
104530 +++ b/net/netfilter/nf_conntrack_acct.c
104531 @@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104532 #ifdef CONFIG_SYSCTL
104533 static int nf_conntrack_acct_init_sysctl(struct net *net)
104534 {
104535 - struct ctl_table *table;
104536 + ctl_table_no_const *table;
104537
104538 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104539 GFP_KERNEL);
104540 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104541 index 5016a69..594f8e9 100644
104542 --- a/net/netfilter/nf_conntrack_core.c
104543 +++ b/net/netfilter/nf_conntrack_core.c
104544 @@ -1739,6 +1739,10 @@ void nf_conntrack_init_end(void)
104545 #define DYING_NULLS_VAL ((1<<30)+1)
104546 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104547
104548 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104549 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104550 +#endif
104551 +
104552 int nf_conntrack_init_net(struct net *net)
104553 {
104554 int ret = -ENOMEM;
104555 @@ -1764,7 +1768,11 @@ int nf_conntrack_init_net(struct net *net)
104556 if (!net->ct.stat)
104557 goto err_pcpu_lists;
104558
104559 +#ifdef CONFIG_GRKERNSEC_HIDESYM
104560 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104561 +#else
104562 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104563 +#endif
104564 if (!net->ct.slabname)
104565 goto err_slabname;
104566
104567 diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104568 index 4e78c57..ec8fb74 100644
104569 --- a/net/netfilter/nf_conntrack_ecache.c
104570 +++ b/net/netfilter/nf_conntrack_ecache.c
104571 @@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104572 #ifdef CONFIG_SYSCTL
104573 static int nf_conntrack_event_init_sysctl(struct net *net)
104574 {
104575 - struct ctl_table *table;
104576 + ctl_table_no_const *table;
104577
104578 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104579 GFP_KERNEL);
104580 diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104581 index 5b3eae7..dd4b8fe 100644
104582 --- a/net/netfilter/nf_conntrack_helper.c
104583 +++ b/net/netfilter/nf_conntrack_helper.c
104584 @@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104585
104586 static int nf_conntrack_helper_init_sysctl(struct net *net)
104587 {
104588 - struct ctl_table *table;
104589 + ctl_table_no_const *table;
104590
104591 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104592 GFP_KERNEL);
104593 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104594 index b65d586..beec902 100644
104595 --- a/net/netfilter/nf_conntrack_proto.c
104596 +++ b/net/netfilter/nf_conntrack_proto.c
104597 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104598
104599 static void
104600 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104601 - struct ctl_table **table,
104602 + ctl_table_no_const **table,
104603 unsigned int users)
104604 {
104605 if (users > 0)
104606 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104607 index cf65a1e..2f291e9 100644
104608 --- a/net/netfilter/nf_conntrack_standalone.c
104609 +++ b/net/netfilter/nf_conntrack_standalone.c
104610 @@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104611
104612 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104613 {
104614 - struct ctl_table *table;
104615 + ctl_table_no_const *table;
104616
104617 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104618 GFP_KERNEL);
104619 diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104620 index 7a394df..bd91a8a 100644
104621 --- a/net/netfilter/nf_conntrack_timestamp.c
104622 +++ b/net/netfilter/nf_conntrack_timestamp.c
104623 @@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104624 #ifdef CONFIG_SYSCTL
104625 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104626 {
104627 - struct ctl_table *table;
104628 + ctl_table_no_const *table;
104629
104630 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104631 GFP_KERNEL);
104632 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104633 index d719764..311bc60 100644
104634 --- a/net/netfilter/nf_log.c
104635 +++ b/net/netfilter/nf_log.c
104636 @@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104637
104638 #ifdef CONFIG_SYSCTL
104639 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104640 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104641 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104642
104643 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104644 void __user *buffer, size_t *lenp, loff_t *ppos)
104645 @@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104646 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104647 mutex_unlock(&nf_log_mutex);
104648 } else {
104649 + ctl_table_no_const nf_log_table = *table;
104650 +
104651 mutex_lock(&nf_log_mutex);
104652 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104653 lockdep_is_held(&nf_log_mutex));
104654 if (!logger)
104655 - table->data = "NONE";
104656 + nf_log_table.data = "NONE";
104657 else
104658 - table->data = logger->name;
104659 - r = proc_dostring(table, write, buffer, lenp, ppos);
104660 + nf_log_table.data = logger->name;
104661 + r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
104662 mutex_unlock(&nf_log_mutex);
104663 }
104664
104665 diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
104666 index c68c1e5..8b5d670 100644
104667 --- a/net/netfilter/nf_sockopt.c
104668 +++ b/net/netfilter/nf_sockopt.c
104669 @@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
104670 }
104671 }
104672
104673 - list_add(&reg->list, &nf_sockopts);
104674 + pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
104675 out:
104676 mutex_unlock(&nf_sockopt_mutex);
104677 return ret;
104678 @@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
104679 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
104680 {
104681 mutex_lock(&nf_sockopt_mutex);
104682 - list_del(&reg->list);
104683 + pax_list_del((struct list_head *)&reg->list);
104684 mutex_unlock(&nf_sockopt_mutex);
104685 }
104686 EXPORT_SYMBOL(nf_unregister_sockopt);
104687 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
104688 index 5f1be5b..2cba8cd 100644
104689 --- a/net/netfilter/nfnetlink_log.c
104690 +++ b/net/netfilter/nfnetlink_log.c
104691 @@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
104692 struct nfnl_log_net {
104693 spinlock_t instances_lock;
104694 struct hlist_head instance_table[INSTANCE_BUCKETS];
104695 - atomic_t global_seq;
104696 + atomic_unchecked_t global_seq;
104697 };
104698
104699 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
104700 @@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
104701 /* global sequence number */
104702 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
104703 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
104704 - htonl(atomic_inc_return(&log->global_seq))))
104705 + htonl(atomic_inc_return_unchecked(&log->global_seq))))
104706 goto nla_put_failure;
104707
104708 if (data_len) {
104709 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
104710 new file mode 100644
104711 index 0000000..c566332
104712 --- /dev/null
104713 +++ b/net/netfilter/xt_gradm.c
104714 @@ -0,0 +1,51 @@
104715 +/*
104716 + * gradm match for netfilter
104717 + * Copyright © Zbigniew Krzystolik, 2010
104718 + *
104719 + * This program is free software; you can redistribute it and/or modify
104720 + * it under the terms of the GNU General Public License; either version
104721 + * 2 or 3 as published by the Free Software Foundation.
104722 + */
104723 +#include <linux/module.h>
104724 +#include <linux/moduleparam.h>
104725 +#include <linux/skbuff.h>
104726 +#include <linux/netfilter/x_tables.h>
104727 +#include <linux/grsecurity.h>
104728 +#include <linux/netfilter/xt_gradm.h>
104729 +
104730 +static bool
104731 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
104732 +{
104733 + const struct xt_gradm_mtinfo *info = par->matchinfo;
104734 + bool retval = false;
104735 + if (gr_acl_is_enabled())
104736 + retval = true;
104737 + return retval ^ info->invflags;
104738 +}
104739 +
104740 +static struct xt_match gradm_mt_reg __read_mostly = {
104741 + .name = "gradm",
104742 + .revision = 0,
104743 + .family = NFPROTO_UNSPEC,
104744 + .match = gradm_mt,
104745 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
104746 + .me = THIS_MODULE,
104747 +};
104748 +
104749 +static int __init gradm_mt_init(void)
104750 +{
104751 + return xt_register_match(&gradm_mt_reg);
104752 +}
104753 +
104754 +static void __exit gradm_mt_exit(void)
104755 +{
104756 + xt_unregister_match(&gradm_mt_reg);
104757 +}
104758 +
104759 +module_init(gradm_mt_init);
104760 +module_exit(gradm_mt_exit);
104761 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
104762 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
104763 +MODULE_LICENSE("GPL");
104764 +MODULE_ALIAS("ipt_gradm");
104765 +MODULE_ALIAS("ip6t_gradm");
104766 diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
104767 index 05fbc2a..4424b5c 100644
104768 --- a/net/netfilter/xt_hashlimit.c
104769 +++ b/net/netfilter/xt_hashlimit.c
104770 @@ -871,11 +871,11 @@ static int __net_init hashlimit_proc_net_init(struct net *net)
104771 {
104772 struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
104773
104774 - hashlimit_net->ipt_hashlimit = proc_mkdir("ipt_hashlimit", net->proc_net);
104775 + hashlimit_net->ipt_hashlimit = proc_mkdir_restrict("ipt_hashlimit", net->proc_net);
104776 if (!hashlimit_net->ipt_hashlimit)
104777 return -ENOMEM;
104778 #if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
104779 - hashlimit_net->ip6t_hashlimit = proc_mkdir("ip6t_hashlimit", net->proc_net);
104780 + hashlimit_net->ip6t_hashlimit = proc_mkdir_restrict("ip6t_hashlimit", net->proc_net);
104781 if (!hashlimit_net->ip6t_hashlimit) {
104782 remove_proc_entry("ipt_hashlimit", net->proc_net);
104783 return -ENOMEM;
104784 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
104785 index a9faae8..1ea30e0 100644
104786 --- a/net/netfilter/xt_recent.c
104787 +++ b/net/netfilter/xt_recent.c
104788 @@ -615,7 +615,7 @@ static int __net_init recent_proc_net_init(struct net *net)
104789 {
104790 struct recent_net *recent_net = recent_pernet(net);
104791
104792 - recent_net->xt_recent = proc_mkdir("xt_recent", net->proc_net);
104793 + recent_net->xt_recent = proc_mkdir_restrict("xt_recent", net->proc_net);
104794 if (!recent_net->xt_recent)
104795 return -ENOMEM;
104796 return 0;
104797 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
104798 index 11de55e..f25e448 100644
104799 --- a/net/netfilter/xt_statistic.c
104800 +++ b/net/netfilter/xt_statistic.c
104801 @@ -19,7 +19,7 @@
104802 #include <linux/module.h>
104803
104804 struct xt_statistic_priv {
104805 - atomic_t count;
104806 + atomic_unchecked_t count;
104807 } ____cacheline_aligned_in_smp;
104808
104809 MODULE_LICENSE("GPL");
104810 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
104811 break;
104812 case XT_STATISTIC_MODE_NTH:
104813 do {
104814 - oval = atomic_read(&info->master->count);
104815 + oval = atomic_read_unchecked(&info->master->count);
104816 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
104817 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
104818 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
104819 if (nval == 0)
104820 ret = !ret;
104821 break;
104822 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
104823 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
104824 if (info->master == NULL)
104825 return -ENOMEM;
104826 - atomic_set(&info->master->count, info->u.nth.count);
104827 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
104828
104829 return 0;
104830 }
104831 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
104832 index b6bf8e8..7884ddf 100644
104833 --- a/net/netlink/af_netlink.c
104834 +++ b/net/netlink/af_netlink.c
104835 @@ -273,7 +273,7 @@ static void netlink_overrun(struct sock *sk)
104836 sk->sk_error_report(sk);
104837 }
104838 }
104839 - atomic_inc(&sk->sk_drops);
104840 + atomic_inc_unchecked(&sk->sk_drops);
104841 }
104842
104843 static void netlink_rcv_wake(struct sock *sk)
104844 @@ -3010,7 +3010,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
104845 sk_wmem_alloc_get(s),
104846 nlk->cb_running,
104847 atomic_read(&s->sk_refcnt),
104848 - atomic_read(&s->sk_drops),
104849 + atomic_read_unchecked(&s->sk_drops),
104850 sock_i_ino(s)
104851 );
104852
104853 diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
104854 index 8451612..c8872bc 100644
104855 --- a/net/openvswitch/vport-internal_dev.c
104856 +++ b/net/openvswitch/vport-internal_dev.c
104857 @@ -122,7 +122,7 @@ static const struct net_device_ops internal_dev_netdev_ops = {
104858 .ndo_get_stats64 = internal_dev_get_stats,
104859 };
104860
104861 -static struct rtnl_link_ops internal_dev_link_ops __read_mostly = {
104862 +static struct rtnl_link_ops internal_dev_link_ops = {
104863 .kind = "openvswitch",
104864 };
104865
104866 diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
104867 index 6015802..e81e8bf 100644
104868 --- a/net/openvswitch/vport.c
104869 +++ b/net/openvswitch/vport.c
104870 @@ -269,10 +269,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
104871 * netdev-stats can be directly read over netlink-ioctl.
104872 */
104873
104874 - stats->rx_errors = atomic_long_read(&vport->err_stats.rx_errors);
104875 - stats->tx_errors = atomic_long_read(&vport->err_stats.tx_errors);
104876 - stats->tx_dropped = atomic_long_read(&vport->err_stats.tx_dropped);
104877 - stats->rx_dropped = atomic_long_read(&vport->err_stats.rx_dropped);
104878 + stats->rx_errors = atomic_long_read_unchecked(&vport->err_stats.rx_errors);
104879 + stats->tx_errors = atomic_long_read_unchecked(&vport->err_stats.tx_errors);
104880 + stats->tx_dropped = atomic_long_read_unchecked(&vport->err_stats.tx_dropped);
104881 + stats->rx_dropped = atomic_long_read_unchecked(&vport->err_stats.rx_dropped);
104882
104883 for_each_possible_cpu(i) {
104884 const struct pcpu_sw_netstats *percpu_stats;
104885 @@ -503,19 +503,19 @@ static void ovs_vport_record_error(struct vport *vport,
104886 {
104887 switch (err_type) {
104888 case VPORT_E_RX_DROPPED:
104889 - atomic_long_inc(&vport->err_stats.rx_dropped);
104890 + atomic_long_inc_unchecked(&vport->err_stats.rx_dropped);
104891 break;
104892
104893 case VPORT_E_RX_ERROR:
104894 - atomic_long_inc(&vport->err_stats.rx_errors);
104895 + atomic_long_inc_unchecked(&vport->err_stats.rx_errors);
104896 break;
104897
104898 case VPORT_E_TX_DROPPED:
104899 - atomic_long_inc(&vport->err_stats.tx_dropped);
104900 + atomic_long_inc_unchecked(&vport->err_stats.tx_dropped);
104901 break;
104902
104903 case VPORT_E_TX_ERROR:
104904 - atomic_long_inc(&vport->err_stats.tx_errors);
104905 + atomic_long_inc_unchecked(&vport->err_stats.tx_errors);
104906 break;
104907 }
104908
104909 diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
104910 index 8942125..03ed887 100644
104911 --- a/net/openvswitch/vport.h
104912 +++ b/net/openvswitch/vport.h
104913 @@ -61,10 +61,10 @@ int ovs_vport_send(struct vport *, struct sk_buff *);
104914 /* The following definitions are for implementers of vport devices: */
104915
104916 struct vport_err_stats {
104917 - atomic_long_t rx_dropped;
104918 - atomic_long_t rx_errors;
104919 - atomic_long_t tx_dropped;
104920 - atomic_long_t tx_errors;
104921 + atomic_long_unchecked_t rx_dropped;
104922 + atomic_long_unchecked_t rx_errors;
104923 + atomic_long_unchecked_t tx_dropped;
104924 + atomic_long_unchecked_t tx_errors;
104925 };
104926 /**
104927 * struct vport_portids - array of netlink portids of a vport.
104928 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
104929 index 07c04a8..3ca11eb 100644
104930 --- a/net/packet/af_packet.c
104931 +++ b/net/packet/af_packet.c
104932 @@ -269,7 +269,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
104933
104934 return ret;
104935 drop:
104936 - atomic_long_inc(&dev->tx_dropped);
104937 + atomic_long_inc_unchecked(&dev->tx_dropped);
104938 kfree_skb(skb);
104939 return NET_XMIT_DROP;
104940 }
104941 @@ -1836,7 +1836,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104942
104943 spin_lock(&sk->sk_receive_queue.lock);
104944 po->stats.stats1.tp_packets++;
104945 - skb->dropcount = atomic_read(&sk->sk_drops);
104946 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
104947 __skb_queue_tail(&sk->sk_receive_queue, skb);
104948 spin_unlock(&sk->sk_receive_queue.lock);
104949 sk->sk_data_ready(sk);
104950 @@ -1845,7 +1845,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
104951 drop_n_acct:
104952 spin_lock(&sk->sk_receive_queue.lock);
104953 po->stats.stats1.tp_drops++;
104954 - atomic_inc(&sk->sk_drops);
104955 + atomic_inc_unchecked(&sk->sk_drops);
104956 spin_unlock(&sk->sk_receive_queue.lock);
104957
104958 drop_n_restore:
104959 @@ -3460,7 +3460,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104960 case PACKET_HDRLEN:
104961 if (len > sizeof(int))
104962 len = sizeof(int);
104963 - if (copy_from_user(&val, optval, len))
104964 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
104965 return -EFAULT;
104966 switch (val) {
104967 case TPACKET_V1:
104968 @@ -3506,7 +3506,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
104969 len = lv;
104970 if (put_user(len, optlen))
104971 return -EFAULT;
104972 - if (copy_to_user(optval, data, len))
104973 + if (len > sizeof(st) || copy_to_user(optval, data, len))
104974 return -EFAULT;
104975 return 0;
104976 }
104977 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
104978 index 70a547e..23477fe 100644
104979 --- a/net/phonet/pep.c
104980 +++ b/net/phonet/pep.c
104981 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104982
104983 case PNS_PEP_CTRL_REQ:
104984 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
104985 - atomic_inc(&sk->sk_drops);
104986 + atomic_inc_unchecked(&sk->sk_drops);
104987 break;
104988 }
104989 __skb_pull(skb, 4);
104990 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
104991 }
104992
104993 if (pn->rx_credits == 0) {
104994 - atomic_inc(&sk->sk_drops);
104995 + atomic_inc_unchecked(&sk->sk_drops);
104996 err = -ENOBUFS;
104997 break;
104998 }
104999 @@ -579,7 +579,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
105000 }
105001
105002 if (pn->rx_credits == 0) {
105003 - atomic_inc(&sk->sk_drops);
105004 + atomic_inc_unchecked(&sk->sk_drops);
105005 err = NET_RX_DROP;
105006 break;
105007 }
105008 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
105009 index 008214a..bb68240 100644
105010 --- a/net/phonet/socket.c
105011 +++ b/net/phonet/socket.c
105012 @@ -611,7 +611,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
105013 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sk)),
105014 sock_i_ino(sk),
105015 atomic_read(&sk->sk_refcnt), sk,
105016 - atomic_read(&sk->sk_drops));
105017 + atomic_read_unchecked(&sk->sk_drops));
105018 }
105019 seq_pad(seq, '\n');
105020 return 0;
105021 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
105022 index c02a8c4..3c5b600 100644
105023 --- a/net/phonet/sysctl.c
105024 +++ b/net/phonet/sysctl.c
105025 @@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
105026 {
105027 int ret;
105028 int range[2] = {local_port_range[0], local_port_range[1]};
105029 - struct ctl_table tmp = {
105030 + ctl_table_no_const tmp = {
105031 .data = &range,
105032 .maxlen = sizeof(range),
105033 .mode = table->mode,
105034 diff --git a/net/rds/cong.c b/net/rds/cong.c
105035 index e5b65ac..f3b6fb7 100644
105036 --- a/net/rds/cong.c
105037 +++ b/net/rds/cong.c
105038 @@ -78,7 +78,7 @@
105039 * finds that the saved generation number is smaller than the global generation
105040 * number, it wakes up the process.
105041 */
105042 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
105043 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
105044
105045 /*
105046 * Congestion monitoring
105047 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
105048 rdsdebug("waking map %p for %pI4\n",
105049 map, &map->m_addr);
105050 rds_stats_inc(s_cong_update_received);
105051 - atomic_inc(&rds_cong_generation);
105052 + atomic_inc_unchecked(&rds_cong_generation);
105053 if (waitqueue_active(&map->m_waitq))
105054 wake_up(&map->m_waitq);
105055 if (waitqueue_active(&rds_poll_waitq))
105056 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
105057
105058 int rds_cong_updated_since(unsigned long *recent)
105059 {
105060 - unsigned long gen = atomic_read(&rds_cong_generation);
105061 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
105062
105063 if (likely(*recent == gen))
105064 return 0;
105065 diff --git a/net/rds/ib.h b/net/rds/ib.h
105066 index 7280ab8..e04f4ea 100644
105067 --- a/net/rds/ib.h
105068 +++ b/net/rds/ib.h
105069 @@ -128,7 +128,7 @@ struct rds_ib_connection {
105070 /* sending acks */
105071 unsigned long i_ack_flags;
105072 #ifdef KERNEL_HAS_ATOMIC64
105073 - atomic64_t i_ack_next; /* next ACK to send */
105074 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
105075 #else
105076 spinlock_t i_ack_lock; /* protect i_ack_next */
105077 u64 i_ack_next; /* next ACK to send */
105078 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
105079 index 31b74f5..dc1fbfa 100644
105080 --- a/net/rds/ib_cm.c
105081 +++ b/net/rds/ib_cm.c
105082 @@ -717,7 +717,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
105083 /* Clear the ACK state */
105084 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
105085 #ifdef KERNEL_HAS_ATOMIC64
105086 - atomic64_set(&ic->i_ack_next, 0);
105087 + atomic64_set_unchecked(&ic->i_ack_next, 0);
105088 #else
105089 ic->i_ack_next = 0;
105090 #endif
105091 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
105092 index d67de45..73dbf51 100644
105093 --- a/net/rds/ib_recv.c
105094 +++ b/net/rds/ib_recv.c
105095 @@ -596,7 +596,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
105096 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
105097 int ack_required)
105098 {
105099 - atomic64_set(&ic->i_ack_next, seq);
105100 + atomic64_set_unchecked(&ic->i_ack_next, seq);
105101 if (ack_required) {
105102 smp_mb__before_atomic();
105103 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
105104 @@ -608,7 +608,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
105105 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
105106 smp_mb__after_atomic();
105107
105108 - return atomic64_read(&ic->i_ack_next);
105109 + return atomic64_read_unchecked(&ic->i_ack_next);
105110 }
105111 #endif
105112
105113 diff --git a/net/rds/iw.h b/net/rds/iw.h
105114 index 04ce3b1..48119a6 100644
105115 --- a/net/rds/iw.h
105116 +++ b/net/rds/iw.h
105117 @@ -134,7 +134,7 @@ struct rds_iw_connection {
105118 /* sending acks */
105119 unsigned long i_ack_flags;
105120 #ifdef KERNEL_HAS_ATOMIC64
105121 - atomic64_t i_ack_next; /* next ACK to send */
105122 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
105123 #else
105124 spinlock_t i_ack_lock; /* protect i_ack_next */
105125 u64 i_ack_next; /* next ACK to send */
105126 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
105127 index a91e1db..cf3053f 100644
105128 --- a/net/rds/iw_cm.c
105129 +++ b/net/rds/iw_cm.c
105130 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
105131 /* Clear the ACK state */
105132 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
105133 #ifdef KERNEL_HAS_ATOMIC64
105134 - atomic64_set(&ic->i_ack_next, 0);
105135 + atomic64_set_unchecked(&ic->i_ack_next, 0);
105136 #else
105137 ic->i_ack_next = 0;
105138 #endif
105139 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
105140 index aa8bf67..b70133c 100644
105141 --- a/net/rds/iw_recv.c
105142 +++ b/net/rds/iw_recv.c
105143 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
105144 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
105145 int ack_required)
105146 {
105147 - atomic64_set(&ic->i_ack_next, seq);
105148 + atomic64_set_unchecked(&ic->i_ack_next, seq);
105149 if (ack_required) {
105150 smp_mb__before_atomic();
105151 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
105152 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
105153 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
105154 smp_mb__after_atomic();
105155
105156 - return atomic64_read(&ic->i_ack_next);
105157 + return atomic64_read_unchecked(&ic->i_ack_next);
105158 }
105159 #endif
105160
105161 diff --git a/net/rds/rds.h b/net/rds/rds.h
105162 index 48f8ffc..0ef3eec 100644
105163 --- a/net/rds/rds.h
105164 +++ b/net/rds/rds.h
105165 @@ -449,7 +449,7 @@ struct rds_transport {
105166 void (*sync_mr)(void *trans_private, int direction);
105167 void (*free_mr)(void *trans_private, int invalidate);
105168 void (*flush_mrs)(void);
105169 -};
105170 +} __do_const;
105171
105172 struct rds_sock {
105173 struct sock rs_sk;
105174 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
105175 index edac9ef..16bcb98 100644
105176 --- a/net/rds/tcp.c
105177 +++ b/net/rds/tcp.c
105178 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
105179 int val = 1;
105180
105181 set_fs(KERNEL_DS);
105182 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
105183 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
105184 sizeof(val));
105185 set_fs(oldfs);
105186 }
105187 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
105188 index 53b17ca..45463e7 100644
105189 --- a/net/rds/tcp_send.c
105190 +++ b/net/rds/tcp_send.c
105191 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
105192
105193 oldfs = get_fs();
105194 set_fs(KERNEL_DS);
105195 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
105196 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
105197 sizeof(val));
105198 set_fs(oldfs);
105199 }
105200 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
105201 index 7b16704..9628ec6 100644
105202 --- a/net/rxrpc/af_rxrpc.c
105203 +++ b/net/rxrpc/af_rxrpc.c
105204 @@ -40,7 +40,7 @@ static const struct proto_ops rxrpc_rpc_ops;
105205 __be32 rxrpc_epoch;
105206
105207 /* current debugging ID */
105208 -atomic_t rxrpc_debug_id;
105209 +atomic_unchecked_t rxrpc_debug_id;
105210
105211 /* count of skbs currently in use */
105212 atomic_t rxrpc_n_skbs;
105213 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
105214 index c6be17a..2a6200a 100644
105215 --- a/net/rxrpc/ar-ack.c
105216 +++ b/net/rxrpc/ar-ack.c
105217 @@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
105218
105219 _enter("{%d,%d,%d,%d},",
105220 call->acks_hard, call->acks_unacked,
105221 - atomic_read(&call->sequence),
105222 + atomic_read_unchecked(&call->sequence),
105223 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
105224
105225 stop = 0;
105226 @@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
105227
105228 /* each Tx packet has a new serial number */
105229 sp->hdr.serial =
105230 - htonl(atomic_inc_return(&call->conn->serial));
105231 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
105232
105233 hdr = (struct rxrpc_header *) txb->head;
105234 hdr->serial = sp->hdr.serial;
105235 @@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
105236 */
105237 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
105238 {
105239 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
105240 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
105241 }
105242
105243 /*
105244 @@ -677,7 +677,7 @@ process_further:
105245
105246 latest = ntohl(sp->hdr.serial);
105247 hard = ntohl(ack.firstPacket);
105248 - tx = atomic_read(&call->sequence);
105249 + tx = atomic_read_unchecked(&call->sequence);
105250
105251 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
105252 latest,
105253 @@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
105254 goto maybe_reschedule;
105255
105256 send_ACK_with_skew:
105257 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
105258 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
105259 ntohl(ack.serial));
105260 send_ACK:
105261 mtu = call->conn->trans->peer->if_mtu;
105262 @@ -1221,7 +1221,7 @@ send_ACK:
105263 ackinfo.rxMTU = htonl(rxrpc_rx_mtu);
105264 ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
105265
105266 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
105267 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
105268 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
105269 ntohl(hdr.serial),
105270 ntohs(ack.maxSkew),
105271 @@ -1239,7 +1239,7 @@ send_ACK:
105272 send_message:
105273 _debug("send message");
105274
105275 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
105276 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
105277 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
105278 send_message_2:
105279
105280 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
105281 index a9e05db..194e793 100644
105282 --- a/net/rxrpc/ar-call.c
105283 +++ b/net/rxrpc/ar-call.c
105284 @@ -232,7 +232,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
105285 spin_lock_init(&call->lock);
105286 rwlock_init(&call->state_lock);
105287 atomic_set(&call->usage, 1);
105288 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
105289 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105290 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
105291
105292 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
105293 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
105294 index 6631f4f..bfdf056 100644
105295 --- a/net/rxrpc/ar-connection.c
105296 +++ b/net/rxrpc/ar-connection.c
105297 @@ -210,7 +210,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
105298 rwlock_init(&conn->lock);
105299 spin_lock_init(&conn->state_lock);
105300 atomic_set(&conn->usage, 1);
105301 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
105302 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105303 conn->avail_calls = RXRPC_MAXCALLS;
105304 conn->size_align = 4;
105305 conn->header_size = sizeof(struct rxrpc_header);
105306 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
105307 index e7ed43a..6afa140 100644
105308 --- a/net/rxrpc/ar-connevent.c
105309 +++ b/net/rxrpc/ar-connevent.c
105310 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
105311
105312 len = iov[0].iov_len + iov[1].iov_len;
105313
105314 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105315 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105316 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
105317
105318 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105319 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
105320 index 481f89f..ceeaf8d 100644
105321 --- a/net/rxrpc/ar-input.c
105322 +++ b/net/rxrpc/ar-input.c
105323 @@ -331,9 +331,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
105324 /* track the latest serial number on this connection for ACK packet
105325 * information */
105326 serial = ntohl(sp->hdr.serial);
105327 - hi_serial = atomic_read(&call->conn->hi_serial);
105328 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
105329 while (serial > hi_serial)
105330 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
105331 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
105332 serial);
105333
105334 /* request ACK generation for any ACK or DATA packet that requests
105335 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
105336 index ba9fd36..9bbfe01 100644
105337 --- a/net/rxrpc/ar-internal.h
105338 +++ b/net/rxrpc/ar-internal.h
105339 @@ -272,8 +272,8 @@ struct rxrpc_connection {
105340 int error; /* error code for local abort */
105341 int debug_id; /* debug ID for printks */
105342 unsigned int call_counter; /* call ID counter */
105343 - atomic_t serial; /* packet serial number counter */
105344 - atomic_t hi_serial; /* highest serial number received */
105345 + atomic_unchecked_t serial; /* packet serial number counter */
105346 + atomic_unchecked_t hi_serial; /* highest serial number received */
105347 u8 avail_calls; /* number of calls available */
105348 u8 size_align; /* data size alignment (for security) */
105349 u8 header_size; /* rxrpc + security header size */
105350 @@ -346,7 +346,7 @@ struct rxrpc_call {
105351 spinlock_t lock;
105352 rwlock_t state_lock; /* lock for state transition */
105353 atomic_t usage;
105354 - atomic_t sequence; /* Tx data packet sequence counter */
105355 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
105356 u32 abort_code; /* local/remote abort code */
105357 enum { /* current state of call */
105358 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
105359 @@ -431,7 +431,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
105360 */
105361 extern atomic_t rxrpc_n_skbs;
105362 extern __be32 rxrpc_epoch;
105363 -extern atomic_t rxrpc_debug_id;
105364 +extern atomic_unchecked_t rxrpc_debug_id;
105365 extern struct workqueue_struct *rxrpc_workqueue;
105366
105367 /*
105368 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
105369 index 87f7135..74d3703 100644
105370 --- a/net/rxrpc/ar-local.c
105371 +++ b/net/rxrpc/ar-local.c
105372 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
105373 spin_lock_init(&local->lock);
105374 rwlock_init(&local->services_lock);
105375 atomic_set(&local->usage, 1);
105376 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
105377 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105378 memcpy(&local->srx, srx, sizeof(*srx));
105379 }
105380
105381 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
105382 index 0b4b9a7..966ffbb 100644
105383 --- a/net/rxrpc/ar-output.c
105384 +++ b/net/rxrpc/ar-output.c
105385 @@ -682,14 +682,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
105386 memset(skb_put(skb, pad), 0, pad);
105387 }
105388
105389 - seq = atomic_inc_return(&call->sequence);
105390 + seq = atomic_inc_return_unchecked(&call->sequence);
105391
105392 sp->hdr.epoch = conn->epoch;
105393 sp->hdr.cid = call->cid;
105394 sp->hdr.callNumber = call->call_id;
105395 sp->hdr.seq = htonl(seq);
105396 sp->hdr.serial =
105397 - htonl(atomic_inc_return(&conn->serial));
105398 + htonl(atomic_inc_return_unchecked(&conn->serial));
105399 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
105400 sp->hdr.userStatus = 0;
105401 sp->hdr.securityIndex = conn->security_ix;
105402 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
105403 index bebaa43..2644591 100644
105404 --- a/net/rxrpc/ar-peer.c
105405 +++ b/net/rxrpc/ar-peer.c
105406 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
105407 INIT_LIST_HEAD(&peer->error_targets);
105408 spin_lock_init(&peer->lock);
105409 atomic_set(&peer->usage, 1);
105410 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
105411 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105412 memcpy(&peer->srx, srx, sizeof(*srx));
105413
105414 rxrpc_assess_MTU_size(peer);
105415 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
105416 index 38047f7..9f48511 100644
105417 --- a/net/rxrpc/ar-proc.c
105418 +++ b/net/rxrpc/ar-proc.c
105419 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
105420 atomic_read(&conn->usage),
105421 rxrpc_conn_states[conn->state],
105422 key_serial(conn->key),
105423 - atomic_read(&conn->serial),
105424 - atomic_read(&conn->hi_serial));
105425 + atomic_read_unchecked(&conn->serial),
105426 + atomic_read_unchecked(&conn->hi_serial));
105427
105428 return 0;
105429 }
105430 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
105431 index 1976dec..aa70be5 100644
105432 --- a/net/rxrpc/ar-transport.c
105433 +++ b/net/rxrpc/ar-transport.c
105434 @@ -51,7 +51,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
105435 spin_lock_init(&trans->client_lock);
105436 rwlock_init(&trans->conn_lock);
105437 atomic_set(&trans->usage, 1);
105438 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
105439 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
105440
105441 if (peer->srx.transport.family == AF_INET) {
105442 switch (peer->srx.transport_type) {
105443 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
105444 index f226709..0e735a8 100644
105445 --- a/net/rxrpc/rxkad.c
105446 +++ b/net/rxrpc/rxkad.c
105447 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
105448
105449 len = iov[0].iov_len + iov[1].iov_len;
105450
105451 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
105452 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105453 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
105454
105455 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
105456 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
105457
105458 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
105459
105460 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
105461 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
105462 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
105463
105464 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
105465 diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
105466 index 6efca30..1259f82 100644
105467 --- a/net/sched/sch_generic.c
105468 +++ b/net/sched/sch_generic.c
105469 @@ -349,7 +349,7 @@ void netif_carrier_on(struct net_device *dev)
105470 if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105471 if (dev->reg_state == NETREG_UNINITIALIZED)
105472 return;
105473 - atomic_inc(&dev->carrier_changes);
105474 + atomic_inc_unchecked(&dev->carrier_changes);
105475 linkwatch_fire_event(dev);
105476 if (netif_running(dev))
105477 __netdev_watchdog_up(dev);
105478 @@ -368,7 +368,7 @@ void netif_carrier_off(struct net_device *dev)
105479 if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
105480 if (dev->reg_state == NETREG_UNINITIALIZED)
105481 return;
105482 - atomic_inc(&dev->carrier_changes);
105483 + atomic_inc_unchecked(&dev->carrier_changes);
105484 linkwatch_fire_event(dev);
105485 }
105486 }
105487 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
105488 index 0e4198e..f94193e 100644
105489 --- a/net/sctp/ipv6.c
105490 +++ b/net/sctp/ipv6.c
105491 @@ -972,7 +972,7 @@ static const struct inet6_protocol sctpv6_protocol = {
105492 .flags = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
105493 };
105494
105495 -static struct sctp_af sctp_af_inet6 = {
105496 +static struct sctp_af sctp_af_inet6 __read_only = {
105497 .sa_family = AF_INET6,
105498 .sctp_xmit = sctp_v6_xmit,
105499 .setsockopt = ipv6_setsockopt,
105500 @@ -1002,7 +1002,7 @@ static struct sctp_af sctp_af_inet6 = {
105501 #endif
105502 };
105503
105504 -static struct sctp_pf sctp_pf_inet6 = {
105505 +static struct sctp_pf sctp_pf_inet6 __read_only = {
105506 .event_msgname = sctp_inet6_event_msgname,
105507 .skb_msgname = sctp_inet6_skb_msgname,
105508 .af_supported = sctp_inet6_af_supported,
105509 @@ -1029,7 +1029,7 @@ void sctp_v6_pf_init(void)
105510
105511 void sctp_v6_pf_exit(void)
105512 {
105513 - list_del(&sctp_af_inet6.list);
105514 + pax_list_del(&sctp_af_inet6.list);
105515 }
105516
105517 /* Initialize IPv6 support and register with socket layer. */
105518 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
105519 index 8f34b27..b105385 100644
105520 --- a/net/sctp/protocol.c
105521 +++ b/net/sctp/protocol.c
105522 @@ -836,8 +836,10 @@ int sctp_register_af(struct sctp_af *af)
105523 return 0;
105524 }
105525
105526 + pax_open_kernel();
105527 INIT_LIST_HEAD(&af->list);
105528 - list_add_tail(&af->list, &sctp_address_families);
105529 + pax_close_kernel();
105530 + pax_list_add_tail(&af->list, &sctp_address_families);
105531 return 1;
105532 }
105533
105534 @@ -967,7 +969,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
105535
105536 static struct sctp_af sctp_af_inet;
105537
105538 -static struct sctp_pf sctp_pf_inet = {
105539 +static struct sctp_pf sctp_pf_inet __read_only = {
105540 .event_msgname = sctp_inet_event_msgname,
105541 .skb_msgname = sctp_inet_skb_msgname,
105542 .af_supported = sctp_inet_af_supported,
105543 @@ -1039,7 +1041,7 @@ static const struct net_protocol sctp_protocol = {
105544 };
105545
105546 /* IPv4 address related functions. */
105547 -static struct sctp_af sctp_af_inet = {
105548 +static struct sctp_af sctp_af_inet __read_only = {
105549 .sa_family = AF_INET,
105550 .sctp_xmit = sctp_v4_xmit,
105551 .setsockopt = ip_setsockopt,
105552 @@ -1123,7 +1125,7 @@ static void sctp_v4_pf_init(void)
105553
105554 static void sctp_v4_pf_exit(void)
105555 {
105556 - list_del(&sctp_af_inet.list);
105557 + pax_list_del(&sctp_af_inet.list);
105558 }
105559
105560 static int sctp_v4_protosw_init(void)
105561 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
105562 index fef2acd..c705c4f 100644
105563 --- a/net/sctp/sm_sideeffect.c
105564 +++ b/net/sctp/sm_sideeffect.c
105565 @@ -439,7 +439,7 @@ static void sctp_generate_sack_event(unsigned long data)
105566 sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
105567 }
105568
105569 -sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105570 +sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES] = {
105571 NULL,
105572 sctp_generate_t1_cookie_event,
105573 sctp_generate_t1_init_event,
105574 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
105575 index 634a2ab..8e93929 100644
105576 --- a/net/sctp/socket.c
105577 +++ b/net/sctp/socket.c
105578 @@ -2199,11 +2199,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
105579 {
105580 struct sctp_association *asoc;
105581 struct sctp_ulpevent *event;
105582 + struct sctp_event_subscribe subscribe;
105583
105584 if (optlen > sizeof(struct sctp_event_subscribe))
105585 return -EINVAL;
105586 - if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
105587 + if (copy_from_user(&subscribe, optval, optlen))
105588 return -EFAULT;
105589 + sctp_sk(sk)->subscribe = subscribe;
105590
105591 if (sctp_sk(sk)->subscribe.sctp_data_io_event)
105592 pr_warn_ratelimited(DEPRECATED "%s (pid %d) "
105593 @@ -4372,13 +4374,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
105594 static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105595 int __user *optlen)
105596 {
105597 + struct sctp_event_subscribe subscribe;
105598 +
105599 if (len <= 0)
105600 return -EINVAL;
105601 if (len > sizeof(struct sctp_event_subscribe))
105602 len = sizeof(struct sctp_event_subscribe);
105603 if (put_user(len, optlen))
105604 return -EFAULT;
105605 - if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
105606 + subscribe = sctp_sk(sk)->subscribe;
105607 + if (copy_to_user(optval, &subscribe, len))
105608 return -EFAULT;
105609 return 0;
105610 }
105611 @@ -4396,6 +4401,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
105612 */
105613 static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
105614 {
105615 + __u32 autoclose;
105616 +
105617 /* Applicable to UDP-style socket only */
105618 if (sctp_style(sk, TCP))
105619 return -EOPNOTSUPP;
105620 @@ -4404,7 +4411,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
105621 len = sizeof(int);
105622 if (put_user(len, optlen))
105623 return -EFAULT;
105624 - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int)))
105625 + autoclose = sctp_sk(sk)->autoclose;
105626 + if (copy_to_user(optval, &autoclose, sizeof(int)))
105627 return -EFAULT;
105628 return 0;
105629 }
105630 @@ -4778,12 +4786,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
105631 */
105632 static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
105633 {
105634 + struct sctp_initmsg initmsg;
105635 +
105636 if (len < sizeof(struct sctp_initmsg))
105637 return -EINVAL;
105638 len = sizeof(struct sctp_initmsg);
105639 if (put_user(len, optlen))
105640 return -EFAULT;
105641 - if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len))
105642 + initmsg = sctp_sk(sk)->initmsg;
105643 + if (copy_to_user(optval, &initmsg, len))
105644 return -EFAULT;
105645 return 0;
105646 }
105647 @@ -4824,6 +4835,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
105648 ->addr_to_user(sp, &temp);
105649 if (space_left < addrlen)
105650 return -ENOMEM;
105651 + if (addrlen > sizeof(temp) || addrlen < 0)
105652 + return -EFAULT;
105653 if (copy_to_user(to, &temp, addrlen))
105654 return -EFAULT;
105655 to += addrlen;
105656 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
105657 index 2e9ada1..40f425d 100644
105658 --- a/net/sctp/sysctl.c
105659 +++ b/net/sctp/sysctl.c
105660 @@ -321,7 +321,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl, int write,
105661 loff_t *ppos)
105662 {
105663 struct net *net = current->nsproxy->net_ns;
105664 - struct ctl_table tbl;
105665 + ctl_table_no_const tbl;
105666 bool changed = false;
105667 char *none = "none";
105668 char tmp[8];
105669 @@ -369,7 +369,7 @@ static int proc_sctp_do_rto_min(struct ctl_table *ctl, int write,
105670 struct net *net = current->nsproxy->net_ns;
105671 unsigned int min = *(unsigned int *) ctl->extra1;
105672 unsigned int max = *(unsigned int *) ctl->extra2;
105673 - struct ctl_table tbl;
105674 + ctl_table_no_const tbl;
105675 int ret, new_value;
105676
105677 memset(&tbl, 0, sizeof(struct ctl_table));
105678 @@ -398,7 +398,7 @@ static int proc_sctp_do_rto_max(struct ctl_table *ctl, int write,
105679 struct net *net = current->nsproxy->net_ns;
105680 unsigned int min = *(unsigned int *) ctl->extra1;
105681 unsigned int max = *(unsigned int *) ctl->extra2;
105682 - struct ctl_table tbl;
105683 + ctl_table_no_const tbl;
105684 int ret, new_value;
105685
105686 memset(&tbl, 0, sizeof(struct ctl_table));
105687 @@ -436,7 +436,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105688 loff_t *ppos)
105689 {
105690 struct net *net = current->nsproxy->net_ns;
105691 - struct ctl_table tbl;
105692 + ctl_table_no_const tbl;
105693 int new_value, ret;
105694
105695 memset(&tbl, 0, sizeof(struct ctl_table));
105696 @@ -463,7 +463,7 @@ static int proc_sctp_do_auth(struct ctl_table *ctl, int write,
105697
105698 int sctp_sysctl_net_register(struct net *net)
105699 {
105700 - struct ctl_table *table;
105701 + ctl_table_no_const *table;
105702 int i;
105703
105704 table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
105705 diff --git a/net/socket.c b/net/socket.c
105706 index fe20c31..83a0ed6 100644
105707 --- a/net/socket.c
105708 +++ b/net/socket.c
105709 @@ -89,6 +89,7 @@
105710 #include <linux/magic.h>
105711 #include <linux/slab.h>
105712 #include <linux/xattr.h>
105713 +#include <linux/in.h>
105714
105715 #include <asm/uaccess.h>
105716 #include <asm/unistd.h>
105717 @@ -113,6 +114,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
105718 unsigned int sysctl_net_busy_poll __read_mostly;
105719 #endif
105720
105721 +#include <linux/grsock.h>
105722 +
105723 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
105724 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
105725 unsigned long nr_segs, loff_t pos);
105726 @@ -164,7 +167,7 @@ static const struct file_operations socket_file_ops = {
105727 */
105728
105729 static DEFINE_SPINLOCK(net_family_lock);
105730 -static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105731 +const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
105732
105733 /*
105734 * Statistics counters of the socket lists
105735 @@ -330,7 +333,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
105736 &sockfs_dentry_operations, SOCKFS_MAGIC);
105737 }
105738
105739 -static struct vfsmount *sock_mnt __read_mostly;
105740 +struct vfsmount *sock_mnt __read_mostly;
105741
105742 static struct file_system_type sock_fs_type = {
105743 .name = "sockfs",
105744 @@ -1263,6 +1266,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105745 return -EAFNOSUPPORT;
105746 if (type < 0 || type >= SOCK_MAX)
105747 return -EINVAL;
105748 + if (protocol < 0)
105749 + return -EINVAL;
105750
105751 /* Compatibility.
105752
105753 @@ -1283,6 +1288,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
105754 if (err)
105755 return err;
105756
105757 + if(!kern && !gr_search_socket(family, type, protocol)) {
105758 + if (rcu_access_pointer(net_families[family]) == NULL)
105759 + return -EAFNOSUPPORT;
105760 + else
105761 + return -EACCES;
105762 + }
105763 +
105764 + if (!kern && gr_handle_sock_all(family, type, protocol)) {
105765 + if (rcu_access_pointer(net_families[family]) == NULL)
105766 + return -EAFNOSUPPORT;
105767 + else
105768 + return -EACCES;
105769 + }
105770 +
105771 /*
105772 * Allocate the socket and allow the family to set things up. if
105773 * the protocol is 0, the family is instructed to select an appropriate
105774 @@ -1534,6 +1553,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105775 if (sock) {
105776 err = move_addr_to_kernel(umyaddr, addrlen, &address);
105777 if (err >= 0) {
105778 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
105779 + err = -EACCES;
105780 + goto error;
105781 + }
105782 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
105783 + if (err)
105784 + goto error;
105785 +
105786 err = security_socket_bind(sock,
105787 (struct sockaddr *)&address,
105788 addrlen);
105789 @@ -1542,6 +1569,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
105790 (struct sockaddr *)
105791 &address, addrlen);
105792 }
105793 +error:
105794 fput_light(sock->file, fput_needed);
105795 }
105796 return err;
105797 @@ -1565,10 +1593,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
105798 if ((unsigned int)backlog > somaxconn)
105799 backlog = somaxconn;
105800
105801 + if (gr_handle_sock_server_other(sock->sk)) {
105802 + err = -EPERM;
105803 + goto error;
105804 + }
105805 +
105806 + err = gr_search_listen(sock);
105807 + if (err)
105808 + goto error;
105809 +
105810 err = security_socket_listen(sock, backlog);
105811 if (!err)
105812 err = sock->ops->listen(sock, backlog);
105813
105814 +error:
105815 fput_light(sock->file, fput_needed);
105816 }
105817 return err;
105818 @@ -1612,6 +1650,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105819 newsock->type = sock->type;
105820 newsock->ops = sock->ops;
105821
105822 + if (gr_handle_sock_server_other(sock->sk)) {
105823 + err = -EPERM;
105824 + sock_release(newsock);
105825 + goto out_put;
105826 + }
105827 +
105828 + err = gr_search_accept(sock);
105829 + if (err) {
105830 + sock_release(newsock);
105831 + goto out_put;
105832 + }
105833 +
105834 /*
105835 * We don't need try_module_get here, as the listening socket (sock)
105836 * has the protocol module (sock->ops->owner) held.
105837 @@ -1657,6 +1707,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
105838 fd_install(newfd, newfile);
105839 err = newfd;
105840
105841 + gr_attach_curr_ip(newsock->sk);
105842 +
105843 out_put:
105844 fput_light(sock->file, fput_needed);
105845 out:
105846 @@ -1689,6 +1741,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105847 int, addrlen)
105848 {
105849 struct socket *sock;
105850 + struct sockaddr *sck;
105851 struct sockaddr_storage address;
105852 int err, fput_needed;
105853
105854 @@ -1699,6 +1752,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
105855 if (err < 0)
105856 goto out_put;
105857
105858 + sck = (struct sockaddr *)&address;
105859 +
105860 + if (gr_handle_sock_client(sck)) {
105861 + err = -EACCES;
105862 + goto out_put;
105863 + }
105864 +
105865 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
105866 + if (err)
105867 + goto out_put;
105868 +
105869 err =
105870 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
105871 if (err)
105872 @@ -1780,6 +1844,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
105873 * the protocol.
105874 */
105875
105876 +asmlinkage long sys_sendto(int, void __user *, size_t, unsigned, struct sockaddr __user *, int);
105877 +
105878 SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
105879 unsigned int, flags, struct sockaddr __user *, addr,
105880 int, addr_len)
105881 @@ -1846,7 +1912,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
105882 struct socket *sock;
105883 struct iovec iov;
105884 struct msghdr msg;
105885 - struct sockaddr_storage address;
105886 + struct sockaddr_storage address = { };
105887 int err, err2;
105888 int fput_needed;
105889
105890 @@ -2075,7 +2141,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
105891 * checking falls down on this.
105892 */
105893 if (copy_from_user(ctl_buf,
105894 - (void __user __force *)msg_sys->msg_control,
105895 + (void __force_user *)msg_sys->msg_control,
105896 ctl_len))
105897 goto out_freectl;
105898 msg_sys->msg_control = ctl_buf;
105899 @@ -2226,7 +2292,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105900 int err, total_len, len;
105901
105902 /* kernel mode address */
105903 - struct sockaddr_storage addr;
105904 + struct sockaddr_storage addr = { };
105905
105906 /* user mode address pointers */
105907 struct sockaddr __user *uaddr;
105908 @@ -2255,7 +2321,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
105909 /* Save the user-mode address (verify_iovec will change the
105910 * kernel msghdr to use the kernel address space)
105911 */
105912 - uaddr = (__force void __user *)msg_sys->msg_name;
105913 + uaddr = (void __force_user *)msg_sys->msg_name;
105914 uaddr_len = COMPAT_NAMELEN(msg);
105915 if (MSG_CMSG_COMPAT & flags)
105916 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
105917 @@ -2896,7 +2962,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
105918 ifr = compat_alloc_user_space(buf_size);
105919 rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
105920
105921 - if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
105922 + if (copy_in_user(ifr->ifr_name, ifr32->ifr_name, IFNAMSIZ))
105923 return -EFAULT;
105924
105925 if (put_user(convert_in ? rxnfc : compat_ptr(data),
105926 @@ -3007,7 +3073,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
105927 old_fs = get_fs();
105928 set_fs(KERNEL_DS);
105929 err = dev_ioctl(net, cmd,
105930 - (struct ifreq __user __force *) &kifr);
105931 + (struct ifreq __force_user *) &kifr);
105932 set_fs(old_fs);
105933
105934 return err;
105935 @@ -3100,7 +3166,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
105936
105937 old_fs = get_fs();
105938 set_fs(KERNEL_DS);
105939 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
105940 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
105941 set_fs(old_fs);
105942
105943 if (cmd == SIOCGIFMAP && !err) {
105944 @@ -3184,7 +3250,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
105945 ret |= get_user(rtdev, &(ur4->rt_dev));
105946 if (rtdev) {
105947 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
105948 - r4.rt_dev = (char __user __force *)devname;
105949 + r4.rt_dev = (char __force_user *)devname;
105950 devname[15] = 0;
105951 } else
105952 r4.rt_dev = NULL;
105953 @@ -3411,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
105954 int __user *uoptlen;
105955 int err;
105956
105957 - uoptval = (char __user __force *) optval;
105958 - uoptlen = (int __user __force *) optlen;
105959 + uoptval = (char __force_user *) optval;
105960 + uoptlen = (int __force_user *) optlen;
105961
105962 set_fs(KERNEL_DS);
105963 if (level == SOL_SOCKET)
105964 @@ -3432,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
105965 char __user *uoptval;
105966 int err;
105967
105968 - uoptval = (char __user __force *) optval;
105969 + uoptval = (char __force_user *) optval;
105970
105971 set_fs(KERNEL_DS);
105972 if (level == SOL_SOCKET)
105973 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
105974 index c548ab2..4e1b68b 100644
105975 --- a/net/sunrpc/auth_gss/svcauth_gss.c
105976 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
105977 @@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105978 uint64_t *handle)
105979 {
105980 struct rsc rsci, *rscp = NULL;
105981 - static atomic64_t ctxhctr;
105982 + static atomic64_unchecked_t ctxhctr = ATOMIC64_INIT(0);
105983 long long ctxh;
105984 struct gss_api_mech *gm = NULL;
105985 time_t expiry;
105986 @@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
105987 status = -ENOMEM;
105988 /* the handle needs to be just a unique id,
105989 * use a static counter */
105990 - ctxh = atomic64_inc_return(&ctxhctr);
105991 + ctxh = atomic64_inc_return_unchecked(&ctxhctr);
105992
105993 /* make a copy for the caller */
105994 *handle = ctxh;
105995 diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
105996 index 0663621..c4928d4 100644
105997 --- a/net/sunrpc/cache.c
105998 +++ b/net/sunrpc/cache.c
105999 @@ -1609,7 +1609,7 @@ static int create_cache_proc_entries(struct cache_detail *cd, struct net *net)
106000 struct sunrpc_net *sn;
106001
106002 sn = net_generic(net, sunrpc_net_id);
106003 - cd->u.procfs.proc_ent = proc_mkdir(cd->name, sn->proc_net_rpc);
106004 + cd->u.procfs.proc_ent = proc_mkdir_restrict(cd->name, sn->proc_net_rpc);
106005 if (cd->u.procfs.proc_ent == NULL)
106006 goto out_nomem;
106007 cd->u.procfs.channel_ent = NULL;
106008 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
106009 index 9acd6ce..4353a72 100644
106010 --- a/net/sunrpc/clnt.c
106011 +++ b/net/sunrpc/clnt.c
106012 @@ -1428,7 +1428,9 @@ call_start(struct rpc_task *task)
106013 (RPC_IS_ASYNC(task) ? "async" : "sync"));
106014
106015 /* Increment call count */
106016 - task->tk_msg.rpc_proc->p_count++;
106017 + pax_open_kernel();
106018 + (*(unsigned int *)&task->tk_msg.rpc_proc->p_count)++;
106019 + pax_close_kernel();
106020 clnt->cl_stats->rpccnt++;
106021 task->tk_action = call_reserve;
106022 }
106023 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
106024 index fe3441a..922c29e 100644
106025 --- a/net/sunrpc/sched.c
106026 +++ b/net/sunrpc/sched.c
106027 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
106028 #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
106029 static void rpc_task_set_debuginfo(struct rpc_task *task)
106030 {
106031 - static atomic_t rpc_pid;
106032 + static atomic_unchecked_t rpc_pid;
106033
106034 - task->tk_pid = atomic_inc_return(&rpc_pid);
106035 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
106036 }
106037 #else
106038 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
106039 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
106040 index 5453049..465669a 100644
106041 --- a/net/sunrpc/stats.c
106042 +++ b/net/sunrpc/stats.c
106043 @@ -267,7 +267,7 @@ int rpc_proc_init(struct net *net)
106044
106045 dprintk("RPC: registering /proc/net/rpc\n");
106046 sn = net_generic(net, sunrpc_net_id);
106047 - sn->proc_net_rpc = proc_mkdir("rpc", net->proc_net);
106048 + sn->proc_net_rpc = proc_mkdir_restrict("rpc", net->proc_net);
106049 if (sn->proc_net_rpc == NULL)
106050 return -ENOMEM;
106051
106052 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
106053 index ca8a795..ddfc41b 100644
106054 --- a/net/sunrpc/svc.c
106055 +++ b/net/sunrpc/svc.c
106056 @@ -1165,7 +1165,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
106057 svc_putnl(resv, RPC_SUCCESS);
106058
106059 /* Bump per-procedure stats counter */
106060 - procp->pc_count++;
106061 + pax_open_kernel();
106062 + (*(unsigned int *)&procp->pc_count)++;
106063 + pax_close_kernel();
106064
106065 /* Initialize storage for argp and resp */
106066 memset(rqstp->rq_argp, 0, procp->pc_argsize);
106067 diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
106068 index 621ca7b..59421dd 100644
106069 --- a/net/sunrpc/svcauth_unix.c
106070 +++ b/net/sunrpc/svcauth_unix.c
106071 @@ -414,7 +414,7 @@ struct unix_gid {
106072 struct group_info *gi;
106073 };
106074
106075 -static int unix_gid_hash(kuid_t uid)
106076 +static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
106077 {
106078 return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
106079 }
106080 @@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
106081 (*bpp)[-1] = '\n';
106082 }
106083
106084 -static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
106085 +static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
106086
106087 static int unix_gid_parse(struct cache_detail *cd,
106088 char *mesg, int mlen)
106089 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
106090 index c1b6270..05089c1 100644
106091 --- a/net/sunrpc/xprtrdma/svc_rdma.c
106092 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
106093 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
106094 static unsigned int min_max_inline = 4096;
106095 static unsigned int max_max_inline = 65536;
106096
106097 -atomic_t rdma_stat_recv;
106098 -atomic_t rdma_stat_read;
106099 -atomic_t rdma_stat_write;
106100 -atomic_t rdma_stat_sq_starve;
106101 -atomic_t rdma_stat_rq_starve;
106102 -atomic_t rdma_stat_rq_poll;
106103 -atomic_t rdma_stat_rq_prod;
106104 -atomic_t rdma_stat_sq_poll;
106105 -atomic_t rdma_stat_sq_prod;
106106 +atomic_unchecked_t rdma_stat_recv;
106107 +atomic_unchecked_t rdma_stat_read;
106108 +atomic_unchecked_t rdma_stat_write;
106109 +atomic_unchecked_t rdma_stat_sq_starve;
106110 +atomic_unchecked_t rdma_stat_rq_starve;
106111 +atomic_unchecked_t rdma_stat_rq_poll;
106112 +atomic_unchecked_t rdma_stat_rq_prod;
106113 +atomic_unchecked_t rdma_stat_sq_poll;
106114 +atomic_unchecked_t rdma_stat_sq_prod;
106115
106116 /* Temporary NFS request map and context caches */
106117 struct kmem_cache *svc_rdma_map_cachep;
106118 @@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
106119 len -= *ppos;
106120 if (len > *lenp)
106121 len = *lenp;
106122 - if (len && copy_to_user(buffer, str_buf, len))
106123 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
106124 return -EFAULT;
106125 *lenp = len;
106126 *ppos += len;
106127 @@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
106128 {
106129 .procname = "rdma_stat_read",
106130 .data = &rdma_stat_read,
106131 - .maxlen = sizeof(atomic_t),
106132 + .maxlen = sizeof(atomic_unchecked_t),
106133 .mode = 0644,
106134 .proc_handler = read_reset_stat,
106135 },
106136 {
106137 .procname = "rdma_stat_recv",
106138 .data = &rdma_stat_recv,
106139 - .maxlen = sizeof(atomic_t),
106140 + .maxlen = sizeof(atomic_unchecked_t),
106141 .mode = 0644,
106142 .proc_handler = read_reset_stat,
106143 },
106144 {
106145 .procname = "rdma_stat_write",
106146 .data = &rdma_stat_write,
106147 - .maxlen = sizeof(atomic_t),
106148 + .maxlen = sizeof(atomic_unchecked_t),
106149 .mode = 0644,
106150 .proc_handler = read_reset_stat,
106151 },
106152 {
106153 .procname = "rdma_stat_sq_starve",
106154 .data = &rdma_stat_sq_starve,
106155 - .maxlen = sizeof(atomic_t),
106156 + .maxlen = sizeof(atomic_unchecked_t),
106157 .mode = 0644,
106158 .proc_handler = read_reset_stat,
106159 },
106160 {
106161 .procname = "rdma_stat_rq_starve",
106162 .data = &rdma_stat_rq_starve,
106163 - .maxlen = sizeof(atomic_t),
106164 + .maxlen = sizeof(atomic_unchecked_t),
106165 .mode = 0644,
106166 .proc_handler = read_reset_stat,
106167 },
106168 {
106169 .procname = "rdma_stat_rq_poll",
106170 .data = &rdma_stat_rq_poll,
106171 - .maxlen = sizeof(atomic_t),
106172 + .maxlen = sizeof(atomic_unchecked_t),
106173 .mode = 0644,
106174 .proc_handler = read_reset_stat,
106175 },
106176 {
106177 .procname = "rdma_stat_rq_prod",
106178 .data = &rdma_stat_rq_prod,
106179 - .maxlen = sizeof(atomic_t),
106180 + .maxlen = sizeof(atomic_unchecked_t),
106181 .mode = 0644,
106182 .proc_handler = read_reset_stat,
106183 },
106184 {
106185 .procname = "rdma_stat_sq_poll",
106186 .data = &rdma_stat_sq_poll,
106187 - .maxlen = sizeof(atomic_t),
106188 + .maxlen = sizeof(atomic_unchecked_t),
106189 .mode = 0644,
106190 .proc_handler = read_reset_stat,
106191 },
106192 {
106193 .procname = "rdma_stat_sq_prod",
106194 .data = &rdma_stat_sq_prod,
106195 - .maxlen = sizeof(atomic_t),
106196 + .maxlen = sizeof(atomic_unchecked_t),
106197 .mode = 0644,
106198 .proc_handler = read_reset_stat,
106199 },
106200 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106201 index e011027..9d3c4e1 100644
106202 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106203 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
106204 @@ -220,7 +220,7 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
106205 *page_no = pg_no;
106206 *page_offset = pg_off;
106207 ret = read;
106208 - atomic_inc(&rdma_stat_read);
106209 + atomic_inc_unchecked(&rdma_stat_read);
106210 return ret;
106211 err:
106212 svc_rdma_unmap_dma(ctxt);
106213 @@ -356,7 +356,7 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
106214 *page_no = pg_no;
106215 *page_offset = pg_off;
106216 ret = read;
106217 - atomic_inc(&rdma_stat_read);
106218 + atomic_inc_unchecked(&rdma_stat_read);
106219 return ret;
106220 err:
106221 svc_rdma_unmap_dma(ctxt);
106222 @@ -540,7 +540,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
106223 dto_q);
106224 list_del_init(&ctxt->dto_q);
106225 } else {
106226 - atomic_inc(&rdma_stat_rq_starve);
106227 + atomic_inc_unchecked(&rdma_stat_rq_starve);
106228 clear_bit(XPT_DATA, &xprt->xpt_flags);
106229 ctxt = NULL;
106230 }
106231 @@ -559,7 +559,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
106232 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
106233 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
106234 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
106235 - atomic_inc(&rdma_stat_recv);
106236 + atomic_inc_unchecked(&rdma_stat_recv);
106237
106238 /* Build up the XDR from the receive buffers. */
106239 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
106240 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106241 index 9f1b506..2e0b321 100644
106242 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106243 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
106244 @@ -208,7 +208,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
106245 write_wr.wr.rdma.remote_addr = to;
106246
106247 /* Post It */
106248 - atomic_inc(&rdma_stat_write);
106249 + atomic_inc_unchecked(&rdma_stat_write);
106250 if (svc_rdma_send(xprt, &write_wr))
106251 goto err;
106252 return write_len - bc;
106253 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
106254 index 4e61880..1f0d963 100644
106255 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
106256 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
106257 @@ -295,7 +295,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
106258 return;
106259
106260 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
106261 - atomic_inc(&rdma_stat_rq_poll);
106262 + atomic_inc_unchecked(&rdma_stat_rq_poll);
106263
106264 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
106265 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
106266 @@ -317,7 +317,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
106267 }
106268
106269 if (ctxt)
106270 - atomic_inc(&rdma_stat_rq_prod);
106271 + atomic_inc_unchecked(&rdma_stat_rq_prod);
106272
106273 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
106274 /*
106275 @@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
106276 return;
106277
106278 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
106279 - atomic_inc(&rdma_stat_sq_poll);
106280 + atomic_inc_unchecked(&rdma_stat_sq_poll);
106281 while ((ret = ib_poll_cq(cq, ARRAY_SIZE(wc_a), wc_a)) > 0) {
106282 int i;
106283
106284 @@ -420,7 +420,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
106285 }
106286
106287 if (ctxt)
106288 - atomic_inc(&rdma_stat_sq_prod);
106289 + atomic_inc_unchecked(&rdma_stat_sq_prod);
106290 }
106291
106292 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
106293 @@ -1264,7 +1264,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
106294 spin_lock_bh(&xprt->sc_lock);
106295 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
106296 spin_unlock_bh(&xprt->sc_lock);
106297 - atomic_inc(&rdma_stat_sq_starve);
106298 + atomic_inc_unchecked(&rdma_stat_sq_starve);
106299
106300 /* See if we can opportunistically reap SQ WR to make room */
106301 sq_cq_reap(xprt);
106302 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
106303 index e7000be..e3b0ba7 100644
106304 --- a/net/sysctl_net.c
106305 +++ b/net/sysctl_net.c
106306 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_header *head,
106307 kgid_t root_gid = make_kgid(net->user_ns, 0);
106308
106309 /* Allow network administrator to have same access as root. */
106310 - if (ns_capable(net->user_ns, CAP_NET_ADMIN) ||
106311 + if (ns_capable_nolog(net->user_ns, CAP_NET_ADMIN) ||
106312 uid_eq(root_uid, current_euid())) {
106313 int mode = (table->mode >> 6) & 7;
106314 return (mode << 6) | (mode << 3) | mode;
106315 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
106316 index 31b5cb2..566ff01 100644
106317 --- a/net/tipc/subscr.c
106318 +++ b/net/tipc/subscr.c
106319 @@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
106320 struct tipc_subscriber *subscriber = sub->subscriber;
106321 struct kvec msg_sect;
106322
106323 - msg_sect.iov_base = (void *)&sub->evt;
106324 + msg_sect.iov_base = &sub->evt;
106325 msg_sect.iov_len = sizeof(struct tipc_event);
106326 sub->evt.event = htohl(event, sub->swap);
106327 sub->evt.found_lower = htohl(found_lower, sub->swap);
106328 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
106329 index e968843..bc95776 100644
106330 --- a/net/unix/af_unix.c
106331 +++ b/net/unix/af_unix.c
106332 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
106333 err = -ECONNREFUSED;
106334 if (!S_ISSOCK(inode->i_mode))
106335 goto put_fail;
106336 +
106337 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
106338 + err = -EACCES;
106339 + goto put_fail;
106340 + }
106341 +
106342 u = unix_find_socket_byinode(inode);
106343 if (!u)
106344 goto put_fail;
106345 @@ -811,6 +817,13 @@ static struct sock *unix_find_other(struct net *net,
106346 if (u) {
106347 struct dentry *dentry;
106348 dentry = unix_sk(u)->path.dentry;
106349 +
106350 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
106351 + err = -EPERM;
106352 + sock_put(u);
106353 + goto fail;
106354 + }
106355 +
106356 if (dentry)
106357 touch_atime(&unix_sk(u)->path);
106358 } else
106359 @@ -844,12 +857,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
106360 */
106361 err = security_path_mknod(&path, dentry, mode, 0);
106362 if (!err) {
106363 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
106364 + err = -EACCES;
106365 + goto out;
106366 + }
106367 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
106368 if (!err) {
106369 res->mnt = mntget(path.mnt);
106370 res->dentry = dget(dentry);
106371 + gr_handle_create(dentry, path.mnt);
106372 }
106373 }
106374 +out:
106375 done_path_create(&path, dentry);
106376 return err;
106377 }
106378 @@ -2350,9 +2369,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106379 seq_puts(seq, "Num RefCount Protocol Flags Type St "
106380 "Inode Path\n");
106381 else {
106382 - struct sock *s = v;
106383 + struct sock *s = v, *peer;
106384 struct unix_sock *u = unix_sk(s);
106385 unix_state_lock(s);
106386 + peer = unix_peer(s);
106387 + unix_state_unlock(s);
106388 +
106389 + unix_state_double_lock(s, peer);
106390
106391 seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
106392 s,
106393 @@ -2379,8 +2402,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
106394 }
106395 for ( ; i < len; i++)
106396 seq_putc(seq, u->addr->name->sun_path[i]);
106397 - }
106398 - unix_state_unlock(s);
106399 + } else if (peer)
106400 + seq_printf(seq, " P%lu", sock_i_ino(peer));
106401 +
106402 + unix_state_double_unlock(s, peer);
106403 seq_putc(seq, '\n');
106404 }
106405
106406 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
106407 index b3d5150..ff3a837 100644
106408 --- a/net/unix/sysctl_net_unix.c
106409 +++ b/net/unix/sysctl_net_unix.c
106410 @@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
106411
106412 int __net_init unix_sysctl_register(struct net *net)
106413 {
106414 - struct ctl_table *table;
106415 + ctl_table_no_const *table;
106416
106417 table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
106418 if (table == NULL)
106419 diff --git a/net/vmw_vsock/vmci_transport_notify.c b/net/vmw_vsock/vmci_transport_notify.c
106420 index 9b7f207..2596621 100644
106421 --- a/net/vmw_vsock/vmci_transport_notify.c
106422 +++ b/net/vmw_vsock/vmci_transport_notify.c
106423 @@ -662,19 +662,19 @@ static void vmci_transport_notify_pkt_process_negotiate(struct sock *sk)
106424
106425 /* Socket control packet based operations. */
106426 struct vmci_transport_notify_ops vmci_transport_notify_pkt_ops = {
106427 - vmci_transport_notify_pkt_socket_init,
106428 - vmci_transport_notify_pkt_socket_destruct,
106429 - vmci_transport_notify_pkt_poll_in,
106430 - vmci_transport_notify_pkt_poll_out,
106431 - vmci_transport_notify_pkt_handle_pkt,
106432 - vmci_transport_notify_pkt_recv_init,
106433 - vmci_transport_notify_pkt_recv_pre_block,
106434 - vmci_transport_notify_pkt_recv_pre_dequeue,
106435 - vmci_transport_notify_pkt_recv_post_dequeue,
106436 - vmci_transport_notify_pkt_send_init,
106437 - vmci_transport_notify_pkt_send_pre_block,
106438 - vmci_transport_notify_pkt_send_pre_enqueue,
106439 - vmci_transport_notify_pkt_send_post_enqueue,
106440 - vmci_transport_notify_pkt_process_request,
106441 - vmci_transport_notify_pkt_process_negotiate,
106442 + .socket_init = vmci_transport_notify_pkt_socket_init,
106443 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106444 + .poll_in = vmci_transport_notify_pkt_poll_in,
106445 + .poll_out = vmci_transport_notify_pkt_poll_out,
106446 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106447 + .recv_init = vmci_transport_notify_pkt_recv_init,
106448 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106449 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106450 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106451 + .send_init = vmci_transport_notify_pkt_send_init,
106452 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106453 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106454 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106455 + .process_request = vmci_transport_notify_pkt_process_request,
106456 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106457 };
106458 diff --git a/net/vmw_vsock/vmci_transport_notify_qstate.c b/net/vmw_vsock/vmci_transport_notify_qstate.c
106459 index dc9c792..3089de0 100644
106460 --- a/net/vmw_vsock/vmci_transport_notify_qstate.c
106461 +++ b/net/vmw_vsock/vmci_transport_notify_qstate.c
106462 @@ -420,19 +420,19 @@ vmci_transport_notify_pkt_send_pre_enqueue(
106463
106464 /* Socket always on control packet based operations. */
106465 struct vmci_transport_notify_ops vmci_transport_notify_pkt_q_state_ops = {
106466 - vmci_transport_notify_pkt_socket_init,
106467 - vmci_transport_notify_pkt_socket_destruct,
106468 - vmci_transport_notify_pkt_poll_in,
106469 - vmci_transport_notify_pkt_poll_out,
106470 - vmci_transport_notify_pkt_handle_pkt,
106471 - vmci_transport_notify_pkt_recv_init,
106472 - vmci_transport_notify_pkt_recv_pre_block,
106473 - vmci_transport_notify_pkt_recv_pre_dequeue,
106474 - vmci_transport_notify_pkt_recv_post_dequeue,
106475 - vmci_transport_notify_pkt_send_init,
106476 - vmci_transport_notify_pkt_send_pre_block,
106477 - vmci_transport_notify_pkt_send_pre_enqueue,
106478 - vmci_transport_notify_pkt_send_post_enqueue,
106479 - vmci_transport_notify_pkt_process_request,
106480 - vmci_transport_notify_pkt_process_negotiate,
106481 + .socket_init = vmci_transport_notify_pkt_socket_init,
106482 + .socket_destruct = vmci_transport_notify_pkt_socket_destruct,
106483 + .poll_in = vmci_transport_notify_pkt_poll_in,
106484 + .poll_out = vmci_transport_notify_pkt_poll_out,
106485 + .handle_notify_pkt = vmci_transport_notify_pkt_handle_pkt,
106486 + .recv_init = vmci_transport_notify_pkt_recv_init,
106487 + .recv_pre_block = vmci_transport_notify_pkt_recv_pre_block,
106488 + .recv_pre_dequeue = vmci_transport_notify_pkt_recv_pre_dequeue,
106489 + .recv_post_dequeue = vmci_transport_notify_pkt_recv_post_dequeue,
106490 + .send_init = vmci_transport_notify_pkt_send_init,
106491 + .send_pre_block = vmci_transport_notify_pkt_send_pre_block,
106492 + .send_pre_enqueue = vmci_transport_notify_pkt_send_pre_enqueue,
106493 + .send_post_enqueue = vmci_transport_notify_pkt_send_post_enqueue,
106494 + .process_request = vmci_transport_notify_pkt_process_request,
106495 + .process_negotiate = vmci_transport_notify_pkt_process_negotiate,
106496 };
106497 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
106498 index c8717c1..08539f5 100644
106499 --- a/net/wireless/wext-core.c
106500 +++ b/net/wireless/wext-core.c
106501 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106502 */
106503
106504 /* Support for very large requests */
106505 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
106506 - (user_length > descr->max_tokens)) {
106507 + if (user_length > descr->max_tokens) {
106508 /* Allow userspace to GET more than max so
106509 * we can support any size GET requests.
106510 * There is still a limit : -ENOMEM.
106511 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
106512 }
106513 }
106514
106515 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
106516 - /*
106517 - * If this is a GET, but not NOMAX, it means that the extra
106518 - * data is not bounded by userspace, but by max_tokens. Thus
106519 - * set the length to max_tokens. This matches the extra data
106520 - * allocation.
106521 - * The driver should fill it with the number of tokens it
106522 - * provided, and it may check iwp->length rather than having
106523 - * knowledge of max_tokens. If the driver doesn't change the
106524 - * iwp->length, this ioctl just copies back max_token tokens
106525 - * filled with zeroes. Hopefully the driver isn't claiming
106526 - * them to be valid data.
106527 - */
106528 - iwp->length = descr->max_tokens;
106529 - }
106530 -
106531 err = handler(dev, info, (union iwreq_data *) iwp, extra);
106532
106533 iwp->length += essid_compat;
106534 diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
106535 index 4323952..a06dfe1 100644
106536 --- a/net/x25/sysctl_net_x25.c
106537 +++ b/net/x25/sysctl_net_x25.c
106538 @@ -70,7 +70,7 @@ static struct ctl_table x25_table[] = {
106539 .mode = 0644,
106540 .proc_handler = proc_dointvec,
106541 },
106542 - { 0, },
106543 + { },
106544 };
106545
106546 void __init x25_register_sysctl(void)
106547 diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
106548 index 0917f04..f4e3d8c 100644
106549 --- a/net/x25/x25_proc.c
106550 +++ b/net/x25/x25_proc.c
106551 @@ -209,7 +209,7 @@ static const struct file_operations x25_seq_forward_fops = {
106552
106553 int __init x25_proc_init(void)
106554 {
106555 - if (!proc_mkdir("x25", init_net.proc_net))
106556 + if (!proc_mkdir_restrict("x25", init_net.proc_net))
106557 return -ENOMEM;
106558
106559 if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
106560 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
106561 index 88bf289..7b0741b 100644
106562 --- a/net/xfrm/xfrm_policy.c
106563 +++ b/net/xfrm/xfrm_policy.c
106564 @@ -330,7 +330,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
106565 {
106566 policy->walk.dead = 1;
106567
106568 - atomic_inc(&policy->genid);
106569 + atomic_inc_unchecked(&policy->genid);
106570
106571 if (del_timer(&policy->polq.hold_timer))
106572 xfrm_pol_put(policy);
106573 @@ -781,7 +781,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
106574 hlist_add_head(&policy->bydst, chain);
106575 xfrm_pol_hold(policy);
106576 net->xfrm.policy_count[dir]++;
106577 - atomic_inc(&net->xfrm.flow_cache_genid);
106578 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
106579
106580 /* After previous checking, family can either be AF_INET or AF_INET6 */
106581 if (policy->family == AF_INET)
106582 @@ -1871,7 +1871,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
106583
106584 xdst->num_pols = num_pols;
106585 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy *) * num_pols);
106586 - xdst->policy_genid = atomic_read(&pols[0]->genid);
106587 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
106588
106589 return xdst;
106590 }
106591 @@ -2685,10 +2685,11 @@ void xfrm_garbage_collect(struct net *net)
106592 }
106593 EXPORT_SYMBOL(xfrm_garbage_collect);
106594
106595 -static void xfrm_garbage_collect_deferred(struct net *net)
106596 +void xfrm_garbage_collect_deferred(struct net *net)
106597 {
106598 flow_cache_flush_deferred(net);
106599 }
106600 +EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
106601
106602 static void xfrm_init_pmtu(struct dst_entry *dst)
106603 {
106604 @@ -2738,7 +2739,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
106605 if (xdst->xfrm_genid != dst->xfrm->genid)
106606 return 0;
106607 if (xdst->num_pols > 0 &&
106608 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
106609 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
106610 return 0;
106611
106612 mtu = dst_mtu(dst->child);
106613 @@ -2826,8 +2827,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
106614 dst_ops->link_failure = xfrm_link_failure;
106615 if (likely(dst_ops->neigh_lookup == NULL))
106616 dst_ops->neigh_lookup = xfrm_neigh_lookup;
106617 - if (likely(afinfo->garbage_collect == NULL))
106618 - afinfo->garbage_collect = xfrm_garbage_collect_deferred;
106619 rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
106620 }
106621 spin_unlock(&xfrm_policy_afinfo_lock);
106622 @@ -2881,7 +2880,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
106623 dst_ops->check = NULL;
106624 dst_ops->negative_advice = NULL;
106625 dst_ops->link_failure = NULL;
106626 - afinfo->garbage_collect = NULL;
106627 }
106628 return err;
106629 }
106630 @@ -3277,7 +3275,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
106631 sizeof(pol->xfrm_vec[i].saddr));
106632 pol->xfrm_vec[i].encap_family = mp->new_family;
106633 /* flush bundles */
106634 - atomic_inc(&pol->genid);
106635 + atomic_inc_unchecked(&pol->genid);
106636 }
106637 }
106638
106639 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
106640 index de971b6..b843409 100644
106641 --- a/net/xfrm/xfrm_state.c
106642 +++ b/net/xfrm/xfrm_state.c
106643 @@ -166,12 +166,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
106644
106645 if (unlikely(afinfo == NULL))
106646 return -EAFNOSUPPORT;
106647 - typemap = afinfo->type_map;
106648 + typemap = (const struct xfrm_type **)afinfo->type_map;
106649 spin_lock_bh(&xfrm_type_lock);
106650
106651 - if (likely(typemap[type->proto] == NULL))
106652 + if (likely(typemap[type->proto] == NULL)) {
106653 + pax_open_kernel();
106654 typemap[type->proto] = type;
106655 - else
106656 + pax_close_kernel();
106657 + } else
106658 err = -EEXIST;
106659 spin_unlock_bh(&xfrm_type_lock);
106660 xfrm_state_put_afinfo(afinfo);
106661 @@ -187,13 +189,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
106662
106663 if (unlikely(afinfo == NULL))
106664 return -EAFNOSUPPORT;
106665 - typemap = afinfo->type_map;
106666 + typemap = (const struct xfrm_type **)afinfo->type_map;
106667 spin_lock_bh(&xfrm_type_lock);
106668
106669 if (unlikely(typemap[type->proto] != type))
106670 err = -ENOENT;
106671 - else
106672 + else {
106673 + pax_open_kernel();
106674 typemap[type->proto] = NULL;
106675 + pax_close_kernel();
106676 + }
106677 spin_unlock_bh(&xfrm_type_lock);
106678 xfrm_state_put_afinfo(afinfo);
106679 return err;
106680 @@ -203,7 +208,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
106681 static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
106682 {
106683 struct xfrm_state_afinfo *afinfo;
106684 - const struct xfrm_type **typemap;
106685 const struct xfrm_type *type;
106686 int modload_attempted = 0;
106687
106688 @@ -211,9 +215,8 @@ retry:
106689 afinfo = xfrm_state_get_afinfo(family);
106690 if (unlikely(afinfo == NULL))
106691 return NULL;
106692 - typemap = afinfo->type_map;
106693
106694 - type = typemap[proto];
106695 + type = afinfo->type_map[proto];
106696 if (unlikely(type && !try_module_get(type->owner)))
106697 type = NULL;
106698 if (!type && !modload_attempted) {
106699 @@ -247,7 +250,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106700 return -EAFNOSUPPORT;
106701
106702 err = -EEXIST;
106703 - modemap = afinfo->mode_map;
106704 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106705 spin_lock_bh(&xfrm_mode_lock);
106706 if (modemap[mode->encap])
106707 goto out;
106708 @@ -256,8 +259,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
106709 if (!try_module_get(afinfo->owner))
106710 goto out;
106711
106712 - mode->afinfo = afinfo;
106713 + pax_open_kernel();
106714 + *(const void **)&mode->afinfo = afinfo;
106715 modemap[mode->encap] = mode;
106716 + pax_close_kernel();
106717 err = 0;
106718
106719 out:
106720 @@ -281,10 +286,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
106721 return -EAFNOSUPPORT;
106722
106723 err = -ENOENT;
106724 - modemap = afinfo->mode_map;
106725 + modemap = (struct xfrm_mode **)afinfo->mode_map;
106726 spin_lock_bh(&xfrm_mode_lock);
106727 if (likely(modemap[mode->encap] == mode)) {
106728 + pax_open_kernel();
106729 modemap[mode->encap] = NULL;
106730 + pax_close_kernel();
106731 module_put(mode->afinfo->owner);
106732 err = 0;
106733 }
106734 @@ -1505,10 +1512,10 @@ EXPORT_SYMBOL(xfrm_find_acq_byseq);
106735 u32 xfrm_get_acqseq(void)
106736 {
106737 u32 res;
106738 - static atomic_t acqseq;
106739 + static atomic_unchecked_t acqseq;
106740
106741 do {
106742 - res = atomic_inc_return(&acqseq);
106743 + res = atomic_inc_return_unchecked(&acqseq);
106744 } while (!res);
106745
106746 return res;
106747 diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c
106748 index 05a6e3d..6716ec9 100644
106749 --- a/net/xfrm/xfrm_sysctl.c
106750 +++ b/net/xfrm/xfrm_sysctl.c
106751 @@ -42,7 +42,7 @@ static struct ctl_table xfrm_table[] = {
106752
106753 int __net_init xfrm_sysctl_init(struct net *net)
106754 {
106755 - struct ctl_table *table;
106756 + ctl_table_no_const *table;
106757
106758 __xfrm_sysctl_init(net);
106759
106760 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
106761 index 649ce68..f6bc05c 100644
106762 --- a/scripts/Makefile.build
106763 +++ b/scripts/Makefile.build
106764 @@ -60,7 +60,7 @@ endif
106765 endif
106766
106767 # Do not include host rules unless needed
106768 -ifneq ($(hostprogs-y)$(hostprogs-m),)
106769 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
106770 include scripts/Makefile.host
106771 endif
106772
106773 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
106774 index b1c668d..638055f 100644
106775 --- a/scripts/Makefile.clean
106776 +++ b/scripts/Makefile.clean
106777 @@ -41,7 +41,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
106778 __clean-files := $(extra-y) $(extra-m) $(extra-) \
106779 $(always) $(targets) $(clean-files) \
106780 $(host-progs) \
106781 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
106782 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
106783 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
106784
106785 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
106786
106787 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
106788 index 133edfa..c9aa07f 100644
106789 --- a/scripts/Makefile.host
106790 +++ b/scripts/Makefile.host
106791 @@ -20,7 +20,19 @@
106792 # Will compile qconf as a C++ program, and menu as a C program.
106793 # They are linked as C++ code to the executable qconf
106794
106795 +# hostprogs-y := conf
106796 +# conf-objs := conf.o libkconfig.so
106797 +# libkconfig-objs := expr.o type.o
106798 +# Will create a shared library named libkconfig.so that consists of
106799 +# expr.o and type.o (they are both compiled as C code and the object files
106800 +# are made as position independent code).
106801 +# conf.c is compiled as a C program, and conf.o is linked together with
106802 +# libkconfig.so as the executable conf.
106803 +# Note: Shared libraries consisting of C++ files are not supported
106804 +
106805 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
106806 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
106807 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
106808
106809 # C code
106810 # Executables compiled from a single .c file
106811 @@ -42,6 +54,19 @@ host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m)))
106812 # C++ Object (.o) files compiled from .cc files
106813 host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
106814
106815 +# Shared libaries (only .c supported)
106816 +# Shared libraries (.so) - all .so files referenced in "xxx-objs"
106817 +host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
106818 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
106819 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
106820 +# Remove .so files from "xxx-objs"
106821 +host-cobjs := $(filter-out %.so,$(host-cobjs))
106822 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
106823 +
106824 +# Object (.o) files used by the shared libaries
106825 +host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
106826 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
106827 +
106828 # output directory for programs/.o files
106829 # hostprogs-y := tools/build may have been specified.
106830 # Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation
106831 @@ -56,6 +81,10 @@ host-cmulti := $(addprefix $(obj)/,$(host-cmulti))
106832 host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
106833 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
106834 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
106835 +host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
106836 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
106837 +host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
106838 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
106839 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
106840
106841 obj-dirs += $(host-objdirs)
106842 @@ -124,5 +153,37 @@ quiet_cmd_host-cxxobjs = HOSTCXX $@
106843 $(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE
106844 $(call if_changed_dep,host-cxxobjs)
106845
106846 +# Compile .c file, create position independent .o file
106847 +# host-cshobjs -> .o
106848 +quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
106849 + cmd_host-cshobjs = $(HOSTCC) $(hostc_flags) -fPIC -c -o $@ $<
106850 +$(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
106851 + $(call if_changed_dep,host-cshobjs)
106852 +
106853 +# Compile .c file, create position independent .o file
106854 +# host-cxxshobjs -> .o
106855 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
106856 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
106857 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
106858 + $(call if_changed_dep,host-cxxshobjs)
106859 +
106860 +# Link a shared library, based on position independent .o files
106861 +# *.o -> .so shared library (host-cshlib)
106862 +quiet_cmd_host-cshlib = HOSTLLD -shared $@
106863 + cmd_host-cshlib = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
106864 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106865 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106866 +$(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
106867 + $(call if_changed,host-cshlib)
106868 +
106869 +# Link a shared library, based on position independent .o files
106870 +# *.o -> .so shared library (host-cxxshlib)
106871 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
106872 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
106873 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
106874 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
106875 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
106876 + $(call if_changed,host-cxxshlib)
106877 +
106878 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
106879 - $(host-cxxmulti) $(host-cxxobjs)
106880 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
106881 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
106882 index b304068..462d24e 100644
106883 --- a/scripts/basic/fixdep.c
106884 +++ b/scripts/basic/fixdep.c
106885 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
106886 /*
106887 * Lookup a value in the configuration string.
106888 */
106889 -static int is_defined_config(const char *name, int len, unsigned int hash)
106890 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
106891 {
106892 struct item *aux;
106893
106894 @@ -211,10 +211,10 @@ static void clear_config(void)
106895 /*
106896 * Record the use of a CONFIG_* word.
106897 */
106898 -static void use_config(const char *m, int slen)
106899 +static void use_config(const char *m, unsigned int slen)
106900 {
106901 unsigned int hash = strhash(m, slen);
106902 - int c, i;
106903 + unsigned int c, i;
106904
106905 if (is_defined_config(m, slen, hash))
106906 return;
106907 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
106908
106909 static void parse_config_file(const char *map, size_t len)
106910 {
106911 - const int *end = (const int *) (map + len);
106912 + const unsigned int *end = (const unsigned int *) (map + len);
106913 /* start at +1, so that p can never be < map */
106914 - const int *m = (const int *) map + 1;
106915 + const unsigned int *m = (const unsigned int *) map + 1;
106916 const char *p, *q;
106917
106918 for (; m < end; m++) {
106919 @@ -435,7 +435,7 @@ static void print_deps(void)
106920 static void traps(void)
106921 {
106922 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
106923 - int *p = (int *)test;
106924 + unsigned int *p = (unsigned int *)test;
106925
106926 if (*p != INT_CONF) {
106927 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianness? %#x\n",
106928 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
106929 new file mode 100644
106930 index 0000000..42018ed
106931 --- /dev/null
106932 +++ b/scripts/gcc-plugin.sh
106933 @@ -0,0 +1,51 @@
106934 +#!/bin/sh
106935 +srctree=$(dirname "$0")
106936 +gccplugins_dir=$($3 -print-file-name=plugin)
106937 +plugincc=$($1 -E - -o /dev/null -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106938 +#include "gcc-common.h"
106939 +#if BUILDING_GCC_VERSION >= 4008 || defined(ENABLE_BUILD_WITH_CXX)
106940 +#warning $2 CXX
106941 +#else
106942 +#warning $1 CC
106943 +#endif
106944 +EOF
106945 +)
106946 +
106947 +if [ $? -ne 0 ]
106948 +then
106949 + exit 1
106950 +fi
106951 +
106952 +case "$plugincc" in
106953 + *"$1 CC"*)
106954 + echo "$1"
106955 + exit 0
106956 + ;;
106957 +
106958 + *"$2 CXX"*)
106959 + # the c++ compiler needs another test, see below
106960 + ;;
106961 +
106962 + *)
106963 + exit 1
106964 + ;;
106965 +esac
106966 +
106967 +# we need a c++ compiler that supports the designated initializer GNU extension
106968 +plugincc=$($2 -c -x c++ -std=gnu++98 - -fsyntax-only -I${srctree}/../tools/gcc -I${gccplugins_dir}/include 2>&1 <<EOF
106969 +#include "gcc-common.h"
106970 +class test {
106971 +public:
106972 + int test;
106973 +} test = {
106974 + .test = 1
106975 +};
106976 +EOF
106977 +)
106978 +
106979 +if [ $? -eq 0 ]
106980 +then
106981 + echo "$2"
106982 + exit 0
106983 +fi
106984 +exit 1
106985 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
106986 index fdebd66..a349e33 100755
106987 --- a/scripts/headers_install.sh
106988 +++ b/scripts/headers_install.sh
106989 @@ -32,6 +32,7 @@ do
106990 FILE="$(basename "$i")"
106991 sed -r \
106992 -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
106993 + -e 's/__intentional_overflow\([- \t,0-9]*\)//g' \
106994 -e 's/__attribute_const__([ \t]|$)/\1/g' \
106995 -e 's@^#include <linux/compiler.h>@@' \
106996 -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
106997 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
106998 index 86a4fe7..99e91f9 100755
106999 --- a/scripts/link-vmlinux.sh
107000 +++ b/scripts/link-vmlinux.sh
107001 @@ -166,7 +166,7 @@ else
107002 fi;
107003
107004 # final build of init/
107005 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
107006 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
107007
107008 kallsymso=""
107009 kallsyms_vmlinux=""
107010 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
107011 index e614ef6..d9d2b01 100644
107012 --- a/scripts/mod/file2alias.c
107013 +++ b/scripts/mod/file2alias.c
107014 @@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
107015 unsigned long size, unsigned long id_size,
107016 void *symval)
107017 {
107018 - int i;
107019 + unsigned int i;
107020
107021 if (size % id_size || size < id_size) {
107022 fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
107023 @@ -171,7 +171,7 @@ static void device_id_check(const char *modname, const char *device_id,
107024 /* USB is special because the bcdDevice can be matched against a numeric range */
107025 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
107026 static void do_usb_entry(void *symval,
107027 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
107028 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
107029 unsigned char range_lo, unsigned char range_hi,
107030 unsigned char max, struct module *mod)
107031 {
107032 @@ -281,7 +281,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
107033 {
107034 unsigned int devlo, devhi;
107035 unsigned char chi, clo, max;
107036 - int ndigits;
107037 + unsigned int ndigits;
107038
107039 DEF_FIELD(symval, usb_device_id, match_flags);
107040 DEF_FIELD(symval, usb_device_id, idVendor);
107041 @@ -534,7 +534,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
107042 for (i = 0; i < count; i++) {
107043 DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
107044 char acpi_id[sizeof(*id)];
107045 - int j;
107046 + unsigned int j;
107047
107048 buf_printf(&mod->dev_table_buf,
107049 "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
107050 @@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
107051
107052 for (j = 0; j < PNP_MAX_DEVICES; j++) {
107053 const char *id = (char *)(*devs)[j].id;
107054 - int i2, j2;
107055 + unsigned int i2, j2;
107056 int dup = 0;
107057
107058 if (!id[0])
107059 @@ -589,7 +589,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
107060 /* add an individual alias for every device entry */
107061 if (!dup) {
107062 char acpi_id[PNP_ID_LEN];
107063 - int k;
107064 + unsigned int k;
107065
107066 buf_printf(&mod->dev_table_buf,
107067 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
107068 @@ -939,7 +939,7 @@ static void dmi_ascii_filter(char *d, const char *s)
107069 static int do_dmi_entry(const char *filename, void *symval,
107070 char *alias)
107071 {
107072 - int i, j;
107073 + unsigned int i, j;
107074 DEF_FIELD_ADDR(symval, dmi_system_id, matches);
107075 sprintf(alias, "dmi*");
107076
107077 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
107078 index d439856..10c1eac 100644
107079 --- a/scripts/mod/modpost.c
107080 +++ b/scripts/mod/modpost.c
107081 @@ -921,6 +921,7 @@ enum mismatch {
107082 ANY_INIT_TO_ANY_EXIT,
107083 ANY_EXIT_TO_ANY_INIT,
107084 EXPORT_TO_INIT_EXIT,
107085 + DATA_TO_TEXT
107086 };
107087
107088 struct sectioncheck {
107089 @@ -1007,6 +1008,12 @@ static const struct sectioncheck sectioncheck[] = {
107090 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
107091 .mismatch = EXPORT_TO_INIT_EXIT,
107092 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
107093 +},
107094 +/* Do not reference code from writable data */
107095 +{
107096 + .fromsec = { DATA_SECTIONS, NULL },
107097 + .tosec = { TEXT_SECTIONS, NULL },
107098 + .mismatch = DATA_TO_TEXT
107099 }
107100 };
107101
107102 @@ -1127,10 +1134,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
107103 continue;
107104 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
107105 continue;
107106 - if (sym->st_value == addr)
107107 - return sym;
107108 /* Find a symbol nearby - addr are maybe negative */
107109 d = sym->st_value - addr;
107110 + if (d == 0)
107111 + return sym;
107112 if (d < 0)
107113 d = addr - sym->st_value;
107114 if (d < distance) {
107115 @@ -1408,6 +1415,14 @@ static void report_sec_mismatch(const char *modname,
107116 tosym, prl_to, prl_to, tosym);
107117 free(prl_to);
107118 break;
107119 + case DATA_TO_TEXT:
107120 +#if 0
107121 + fprintf(stderr,
107122 + "The %s %s:%s references\n"
107123 + "the %s %s:%s%s\n",
107124 + from, fromsec, fromsym, to, tosec, tosym, to_p);
107125 +#endif
107126 + break;
107127 }
107128 fprintf(stderr, "\n");
107129 }
107130 @@ -1659,7 +1674,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
107131 static void check_sec_ref(struct module *mod, const char *modname,
107132 struct elf_info *elf)
107133 {
107134 - int i;
107135 + unsigned int i;
107136 Elf_Shdr *sechdrs = elf->sechdrs;
107137
107138 /* Walk through all sections */
107139 @@ -1790,7 +1805,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
107140 va_end(ap);
107141 }
107142
107143 -void buf_write(struct buffer *buf, const char *s, int len)
107144 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
107145 {
107146 if (buf->size - buf->pos < len) {
107147 buf->size += len + SZ;
107148 @@ -2009,7 +2024,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
107149 if (fstat(fileno(file), &st) < 0)
107150 goto close_write;
107151
107152 - if (st.st_size != b->pos)
107153 + if (st.st_size != (off_t)b->pos)
107154 goto close_write;
107155
107156 tmp = NOFAIL(malloc(b->pos));
107157 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
107158 index 168b43d..77914bf 100644
107159 --- a/scripts/mod/modpost.h
107160 +++ b/scripts/mod/modpost.h
107161 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
107162
107163 struct buffer {
107164 char *p;
107165 - int pos;
107166 - int size;
107167 + unsigned int pos;
107168 + unsigned int size;
107169 };
107170
107171 void __attribute__((format(printf, 2, 3)))
107172 buf_printf(struct buffer *buf, const char *fmt, ...);
107173
107174 void
107175 -buf_write(struct buffer *buf, const char *s, int len);
107176 +buf_write(struct buffer *buf, const char *s, unsigned int len);
107177
107178 struct module {
107179 struct module *next;
107180 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
107181 index 944418d..15291e4 100644
107182 --- a/scripts/mod/sumversion.c
107183 +++ b/scripts/mod/sumversion.c
107184 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
107185 goto out;
107186 }
107187
107188 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
107189 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
107190 warn("writing sum in %s failed: %s\n",
107191 filename, strerror(errno));
107192 goto out;
107193 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
107194 index 0865b3e..7235dd4 100644
107195 --- a/scripts/module-common.lds
107196 +++ b/scripts/module-common.lds
107197 @@ -6,6 +6,10 @@
107198 SECTIONS {
107199 /DISCARD/ : { *(.discard) }
107200
107201 + .rodata : {
107202 + *(.rodata) *(.rodata.*)
107203 + *(.data..read_only)
107204 + }
107205 __ksymtab : { *(SORT(___ksymtab+*)) }
107206 __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) }
107207 __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) }
107208 diff --git a/scripts/package/Makefile b/scripts/package/Makefile
107209 index 99ca6e7..3a1a1a1 100644
107210 --- a/scripts/package/Makefile
107211 +++ b/scripts/package/Makefile
107212 @@ -46,7 +46,7 @@ rpm-pkg rpm: FORCE
107213 ln -sf $(srctree) $(KERNELPATH)
107214 $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
107215 $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
107216 - tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
107217 + tar --owner=root --group=root -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)
107218 rm $(KERNELPATH)
107219 rm -f $(objtree)/.scmversion
107220 $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
107221 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
107222 index 5972624..4028795 100755
107223 --- a/scripts/package/builddeb
107224 +++ b/scripts/package/builddeb
107225 @@ -293,6 +293,7 @@ fi
107226 (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
107227 (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
107228 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
107229 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
107230 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
107231 mkdir -p "$destdir"
107232 (cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
107233 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
107234 index 1395760..bca2734 100755
107235 --- a/scripts/package/mkspec
107236 +++ b/scripts/package/mkspec
107237 @@ -121,29 +121,40 @@ echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
107238 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
107239 echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
107240 echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE;tar xvf -)"
107241 -echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
107242 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
107243 -echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
107244
107245 echo ""
107246 echo "%clean"
107247 echo 'rm -rf $RPM_BUILD_ROOT'
107248 echo ""
107249 +echo "%pre"
107250 +echo 'chmod -f 0500 /boot'
107251 +echo 'if [ -d /lib/modules ]; then'
107252 +echo 'chmod -f 0500 /lib/modules'
107253 +echo 'fi'
107254 +echo 'if [ -d /lib32/modules ]; then'
107255 +echo 'chmod -f 0500 /lib32/modules'
107256 +echo 'fi'
107257 +echo 'if [ -d /lib64/modules ]; then'
107258 +echo 'chmod -f 0500 /lib64/modules'
107259 +echo 'fi'
107260 +echo ""
107261 +echo "%post devel"
107262 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/build"
107263 +echo "ln -sf /usr/src/kernels/$KERNELRELEASE /lib/modules/$KERNELRELEASE/source"
107264 +echo ""
107265 echo "%post"
107266 -echo "if [ -x /sbin/installkernel -a -r /boot/vmlinuz-$KERNELRELEASE -a -r /boot/System.map-$KERNELRELEASE ]; then"
107267 -echo "cp /boot/vmlinuz-$KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm"
107268 -echo "cp /boot/System.map-$KERNELRELEASE /boot/System.map-$KERNELRELEASE-rpm"
107269 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE /boot/System.map-$KERNELRELEASE"
107270 -echo "/sbin/installkernel $KERNELRELEASE /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
107271 -echo "rm -f /boot/vmlinuz-$KERNELRELEASE-rpm /boot/System.map-$KERNELRELEASE-rpm"
107272 +echo "if [ -x /sbin/dracut ]; then"
107273 +echo '/sbin/new-kernel-pkg --dracut --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
107274 +echo "else"
107275 +echo '/sbin/new-kernel-pkg --mkinitrd --depmod --install --make-default '"$KERNELRELEASE"' || exit $?'
107276 echo "fi"
107277 echo ""
107278 echo "%files"
107279 -echo '%defattr (-, root, root)'
107280 +echo '%defattr (400, root, root, 500)'
107281 echo "%dir /lib/modules"
107282 -echo "/lib/modules/$KERNELRELEASE"
107283 echo "%exclude /lib/modules/$KERNELRELEASE/build"
107284 echo "%exclude /lib/modules/$KERNELRELEASE/source"
107285 +echo "/lib/modules/$KERNELRELEASE"
107286 echo "/lib/firmware/$KERNELRELEASE"
107287 echo "/boot/*"
107288 echo ""
107289 @@ -152,8 +163,7 @@ echo '%defattr (-, root, root)'
107290 echo "/usr/include"
107291 echo ""
107292 echo "%files devel"
107293 -echo '%defattr (-, root, root)'
107294 +echo '%defattr (400, root, root, 500)'
107295 +echo "%dir /lib/modules/$KERNELRELEASE"
107296 echo "/usr/src/kernels/$KERNELRELEASE"
107297 -echo "/lib/modules/$KERNELRELEASE/build"
107298 -echo "/lib/modules/$KERNELRELEASE/source"
107299 echo ""
107300 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
107301 index 4718d78..9220d58 100644
107302 --- a/scripts/pnmtologo.c
107303 +++ b/scripts/pnmtologo.c
107304 @@ -244,14 +244,14 @@ static void write_header(void)
107305 fprintf(out, " * Linux logo %s\n", logoname);
107306 fputs(" */\n\n", out);
107307 fputs("#include <linux/linux_logo.h>\n\n", out);
107308 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
107309 + fprintf(out, "static unsigned char %s_data[] = {\n",
107310 logoname);
107311 }
107312
107313 static void write_footer(void)
107314 {
107315 fputs("\n};\n\n", out);
107316 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
107317 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
107318 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
107319 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
107320 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
107321 @@ -381,7 +381,7 @@ static void write_logo_clut224(void)
107322 fputs("\n};\n\n", out);
107323
107324 /* write logo clut */
107325 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
107326 + fprintf(out, "static unsigned char %s_clut[] = {\n",
107327 logoname);
107328 write_hex_cnt = 0;
107329 for (i = 0; i < logo_clutsize; i++) {
107330 diff --git a/scripts/sortextable.h b/scripts/sortextable.h
107331 index ba87004..3f4852c 100644
107332 --- a/scripts/sortextable.h
107333 +++ b/scripts/sortextable.h
107334 @@ -108,9 +108,9 @@ do_func(Elf_Ehdr *ehdr, char const *const fname, table_sort_t custom_sort)
107335 const char *secstrtab;
107336 const char *strtab;
107337 char *extab_image;
107338 - int extab_index = 0;
107339 - int i;
107340 - int idx;
107341 + unsigned int extab_index = 0;
107342 + unsigned int i;
107343 + unsigned int idx;
107344 unsigned int num_sections;
107345 unsigned int secindex_strings;
107346
107347 diff --git a/scripts/tags.sh b/scripts/tags.sh
107348 index cdb491d..8d32bfc 100755
107349 --- a/scripts/tags.sh
107350 +++ b/scripts/tags.sh
107351 @@ -26,7 +26,7 @@ else
107352 fi
107353
107354 # ignore userspace tools
107355 -ignore="$ignore ( -path ${tree}tools ) -prune -o"
107356 +ignore="$ignore ( -path \"${tree}tools/[^g]*\" ) -prune -o"
107357
107358 # Find all available archs
107359 find_all_archs()
107360 diff --git a/security/Kconfig b/security/Kconfig
107361 index beb86b5..1a953b1 100644
107362 --- a/security/Kconfig
107363 +++ b/security/Kconfig
107364 @@ -4,6 +4,974 @@
107365
107366 menu "Security options"
107367
107368 +menu "Grsecurity"
107369 +
107370 + config ARCH_TRACK_EXEC_LIMIT
107371 + bool
107372 +
107373 + config PAX_KERNEXEC_PLUGIN
107374 + bool
107375 +
107376 + config PAX_PER_CPU_PGD
107377 + bool
107378 +
107379 + config TASK_SIZE_MAX_SHIFT
107380 + int
107381 + depends on X86_64
107382 + default 47 if !PAX_PER_CPU_PGD
107383 + default 42 if PAX_PER_CPU_PGD
107384 +
107385 + config PAX_ENABLE_PAE
107386 + bool
107387 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
107388 +
107389 + config PAX_USERCOPY_SLABS
107390 + bool
107391 +
107392 +config GRKERNSEC
107393 + bool "Grsecurity"
107394 + select CRYPTO
107395 + select CRYPTO_SHA256
107396 + select PROC_FS
107397 + select STOP_MACHINE
107398 + select TTY
107399 + select DEBUG_KERNEL
107400 + select DEBUG_LIST
107401 + help
107402 + If you say Y here, you will be able to configure many features
107403 + that will enhance the security of your system. It is highly
107404 + recommended that you say Y here and read through the help
107405 + for each option so that you fully understand the features and
107406 + can evaluate their usefulness for your machine.
107407 +
107408 +choice
107409 + prompt "Configuration Method"
107410 + depends on GRKERNSEC
107411 + default GRKERNSEC_CONFIG_CUSTOM
107412 + help
107413 +
107414 +config GRKERNSEC_CONFIG_AUTO
107415 + bool "Automatic"
107416 + help
107417 + If you choose this configuration method, you'll be able to answer a small
107418 + number of simple questions about how you plan to use this kernel.
107419 + The settings of grsecurity and PaX will be automatically configured for
107420 + the highest commonly-used settings within the provided constraints.
107421 +
107422 + If you require additional configuration, custom changes can still be made
107423 + from the "custom configuration" menu.
107424 +
107425 +config GRKERNSEC_CONFIG_CUSTOM
107426 + bool "Custom"
107427 + help
107428 + If you choose this configuration method, you'll be able to configure all
107429 + grsecurity and PaX settings manually. Via this method, no options are
107430 + automatically enabled.
107431 +
107432 +endchoice
107433 +
107434 +choice
107435 + prompt "Usage Type"
107436 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107437 + default GRKERNSEC_CONFIG_SERVER
107438 + help
107439 +
107440 +config GRKERNSEC_CONFIG_SERVER
107441 + bool "Server"
107442 + help
107443 + Choose this option if you plan to use this kernel on a server.
107444 +
107445 +config GRKERNSEC_CONFIG_DESKTOP
107446 + bool "Desktop"
107447 + help
107448 + Choose this option if you plan to use this kernel on a desktop.
107449 +
107450 +endchoice
107451 +
107452 +choice
107453 + prompt "Virtualization Type"
107454 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
107455 + default GRKERNSEC_CONFIG_VIRT_NONE
107456 + help
107457 +
107458 +config GRKERNSEC_CONFIG_VIRT_NONE
107459 + bool "None"
107460 + help
107461 + Choose this option if this kernel will be run on bare metal.
107462 +
107463 +config GRKERNSEC_CONFIG_VIRT_GUEST
107464 + bool "Guest"
107465 + help
107466 + Choose this option if this kernel will be run as a VM guest.
107467 +
107468 +config GRKERNSEC_CONFIG_VIRT_HOST
107469 + bool "Host"
107470 + help
107471 + Choose this option if this kernel will be run as a VM host.
107472 +
107473 +endchoice
107474 +
107475 +choice
107476 + prompt "Virtualization Hardware"
107477 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107478 + help
107479 +
107480 +config GRKERNSEC_CONFIG_VIRT_EPT
107481 + bool "EPT/RVI Processor Support"
107482 + depends on X86
107483 + help
107484 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
107485 + hardware virtualization. This allows for additional kernel hardening protections
107486 + to operate without additional performance impact.
107487 +
107488 + To see if your Intel processor supports EPT, see:
107489 + http://ark.intel.com/Products/VirtualizationTechnology
107490 + (Most Core i3/5/7 support EPT)
107491 +
107492 + To see if your AMD processor supports RVI, see:
107493 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
107494 +
107495 +config GRKERNSEC_CONFIG_VIRT_SOFT
107496 + bool "First-gen/No Hardware Virtualization"
107497 + help
107498 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
107499 + support hardware virtualization or doesn't support the EPT/RVI extensions.
107500 +
107501 +endchoice
107502 +
107503 +choice
107504 + prompt "Virtualization Software"
107505 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
107506 + help
107507 +
107508 +config GRKERNSEC_CONFIG_VIRT_XEN
107509 + bool "Xen"
107510 + help
107511 + Choose this option if this kernel is running as a Xen guest or host.
107512 +
107513 +config GRKERNSEC_CONFIG_VIRT_VMWARE
107514 + bool "VMWare"
107515 + help
107516 + Choose this option if this kernel is running as a VMWare guest or host.
107517 +
107518 +config GRKERNSEC_CONFIG_VIRT_KVM
107519 + bool "KVM"
107520 + help
107521 + Choose this option if this kernel is running as a KVM guest or host.
107522 +
107523 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
107524 + bool "VirtualBox"
107525 + help
107526 + Choose this option if this kernel is running as a VirtualBox guest or host.
107527 +
107528 +config GRKERNSEC_CONFIG_VIRT_HYPERV
107529 + bool "Hyper-V"
107530 + help
107531 + Choose this option if this kernel is running as a Hyper-V guest.
107532 +
107533 +endchoice
107534 +
107535 +choice
107536 + prompt "Required Priorities"
107537 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107538 + default GRKERNSEC_CONFIG_PRIORITY_PERF
107539 + help
107540 +
107541 +config GRKERNSEC_CONFIG_PRIORITY_PERF
107542 + bool "Performance"
107543 + help
107544 + Choose this option if performance is of highest priority for this deployment
107545 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
107546 + clearing of structures intended for userland, and freed memory sanitizing will
107547 + be disabled.
107548 +
107549 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
107550 + bool "Security"
107551 + help
107552 + Choose this option if security is of highest priority for this deployment of
107553 + grsecurity. UDEREF, kernel stack clearing, clearing of structures intended
107554 + for userland, and freed memory sanitizing will be enabled for this kernel.
107555 + In a worst-case scenario, these features can introduce a 20% performance hit
107556 + (UDEREF on x64 contributing half of this hit).
107557 +
107558 +endchoice
107559 +
107560 +menu "Default Special Groups"
107561 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
107562 +
107563 +config GRKERNSEC_PROC_GID
107564 + int "GID exempted from /proc restrictions"
107565 + default 1001
107566 + help
107567 + Setting this GID determines which group will be exempted from
107568 + grsecurity's /proc restrictions, allowing users of the specified
107569 + group to view network statistics and the existence of other users'
107570 + processes on the system. This GID may also be chosen at boot time
107571 + via "grsec_proc_gid=" on the kernel commandline.
107572 +
107573 +config GRKERNSEC_TPE_UNTRUSTED_GID
107574 + int "GID for TPE-untrusted users"
107575 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
107576 + default 1005
107577 + help
107578 + Setting this GID determines which group untrusted users should
107579 + be added to. These users will be placed under grsecurity's Trusted Path
107580 + Execution mechanism, preventing them from executing their own binaries.
107581 + The users will only be able to execute binaries in directories owned and
107582 + writable only by the root user. If the sysctl option is enabled, a sysctl
107583 + option with name "tpe_gid" is created.
107584 +
107585 +config GRKERNSEC_TPE_TRUSTED_GID
107586 + int "GID for TPE-trusted users"
107587 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
107588 + default 1005
107589 + help
107590 + Setting this GID determines what group TPE restrictions will be
107591 + *disabled* for. If the sysctl option is enabled, a sysctl option
107592 + with name "tpe_gid" is created.
107593 +
107594 +config GRKERNSEC_SYMLINKOWN_GID
107595 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
107596 + depends on GRKERNSEC_CONFIG_SERVER
107597 + default 1006
107598 + help
107599 + Setting this GID determines what group kernel-enforced
107600 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
107601 + is enabled, a sysctl option with name "symlinkown_gid" is created.
107602 +
107603 +
107604 +endmenu
107605 +
107606 +menu "Customize Configuration"
107607 +depends on GRKERNSEC
107608 +
107609 +menu "PaX"
107610 +
107611 +config PAX
107612 + bool "Enable various PaX features"
107613 + default y if GRKERNSEC_CONFIG_AUTO
107614 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
107615 + help
107616 + This allows you to enable various PaX features. PaX adds
107617 + intrusion prevention mechanisms to the kernel that reduce
107618 + the risks posed by exploitable memory corruption bugs.
107619 +
107620 +menu "PaX Control"
107621 + depends on PAX
107622 +
107623 +config PAX_SOFTMODE
107624 + bool 'Support soft mode'
107625 + help
107626 + Enabling this option will allow you to run PaX in soft mode, that
107627 + is, PaX features will not be enforced by default, only on executables
107628 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
107629 + support as they are the only way to mark executables for soft mode use.
107630 +
107631 + Soft mode can be activated by using the "pax_softmode=1" kernel command
107632 + line option on boot. Furthermore you can control various PaX features
107633 + at runtime via the entries in /proc/sys/kernel/pax.
107634 +
107635 +config PAX_EI_PAX
107636 + bool 'Use legacy ELF header marking'
107637 + default y if GRKERNSEC_CONFIG_AUTO
107638 + help
107639 + Enabling this option will allow you to control PaX features on
107640 + a per executable basis via the 'chpax' utility available at
107641 + http://pax.grsecurity.net/. The control flags will be read from
107642 + an otherwise reserved part of the ELF header. This marking has
107643 + numerous drawbacks (no support for soft-mode, toolchain does not
107644 + know about the non-standard use of the ELF header) therefore it
107645 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
107646 + support.
107647 +
107648 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
107649 + support as well, they will override the legacy EI_PAX marks.
107650 +
107651 + If you enable none of the marking options then all applications
107652 + will run with PaX enabled on them by default.
107653 +
107654 +config PAX_PT_PAX_FLAGS
107655 + bool 'Use ELF program header marking'
107656 + default y if GRKERNSEC_CONFIG_AUTO
107657 + help
107658 + Enabling this option will allow you to control PaX features on
107659 + a per executable basis via the 'paxctl' utility available at
107660 + http://pax.grsecurity.net/. The control flags will be read from
107661 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
107662 + has the benefits of supporting both soft mode and being fully
107663 + integrated into the toolchain (the binutils patch is available
107664 + from http://pax.grsecurity.net).
107665 +
107666 + Note that if you enable the legacy EI_PAX marking support as well,
107667 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
107668 +
107669 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107670 + must make sure that the marks are the same if a binary has both marks.
107671 +
107672 + If you enable none of the marking options then all applications
107673 + will run with PaX enabled on them by default.
107674 +
107675 +config PAX_XATTR_PAX_FLAGS
107676 + bool 'Use filesystem extended attributes marking'
107677 + default y if GRKERNSEC_CONFIG_AUTO
107678 + select CIFS_XATTR if CIFS
107679 + select F2FS_FS_XATTR if F2FS_FS
107680 + select EXT2_FS_XATTR if EXT2_FS
107681 + select EXT3_FS_XATTR if EXT3_FS
107682 + select JFFS2_FS_XATTR if JFFS2_FS
107683 + select REISERFS_FS_XATTR if REISERFS_FS
107684 + select SQUASHFS_XATTR if SQUASHFS
107685 + select TMPFS_XATTR if TMPFS
107686 + help
107687 + Enabling this option will allow you to control PaX features on
107688 + a per executable basis via the 'setfattr' utility. The control
107689 + flags will be read from the user.pax.flags extended attribute of
107690 + the file. This marking has the benefit of supporting binary-only
107691 + applications that self-check themselves (e.g., skype) and would
107692 + not tolerate chpax/paxctl changes. The main drawback is that
107693 + extended attributes are not supported by some filesystems (e.g.,
107694 + isofs, udf, vfat) so copying files through such filesystems will
107695 + lose the extended attributes and these PaX markings.
107696 +
107697 + Note that if you enable the legacy EI_PAX marking support as well,
107698 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
107699 +
107700 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
107701 + must make sure that the marks are the same if a binary has both marks.
107702 +
107703 + If you enable none of the marking options then all applications
107704 + will run with PaX enabled on them by default.
107705 +
107706 +choice
107707 + prompt 'MAC system integration'
107708 + default PAX_HAVE_ACL_FLAGS
107709 + help
107710 + Mandatory Access Control systems have the option of controlling
107711 + PaX flags on a per executable basis, choose the method supported
107712 + by your particular system.
107713 +
107714 + - "none": if your MAC system does not interact with PaX,
107715 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
107716 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
107717 +
107718 + NOTE: this option is for developers/integrators only.
107719 +
107720 + config PAX_NO_ACL_FLAGS
107721 + bool 'none'
107722 +
107723 + config PAX_HAVE_ACL_FLAGS
107724 + bool 'direct'
107725 +
107726 + config PAX_HOOK_ACL_FLAGS
107727 + bool 'hook'
107728 +endchoice
107729 +
107730 +endmenu
107731 +
107732 +menu "Non-executable pages"
107733 + depends on PAX
107734 +
107735 +config PAX_NOEXEC
107736 + bool "Enforce non-executable pages"
107737 + default y if GRKERNSEC_CONFIG_AUTO
107738 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
107739 + help
107740 + By design some architectures do not allow for protecting memory
107741 + pages against execution or even if they do, Linux does not make
107742 + use of this feature. In practice this means that if a page is
107743 + readable (such as the stack or heap) it is also executable.
107744 +
107745 + There is a well known exploit technique that makes use of this
107746 + fact and a common programming mistake where an attacker can
107747 + introduce code of his choice somewhere in the attacked program's
107748 + memory (typically the stack or the heap) and then execute it.
107749 +
107750 + If the attacked program was running with different (typically
107751 + higher) privileges than that of the attacker, then he can elevate
107752 + his own privilege level (e.g. get a root shell, write to files for
107753 + which he does not have write access to, etc).
107754 +
107755 + Enabling this option will let you choose from various features
107756 + that prevent the injection and execution of 'foreign' code in
107757 + a program.
107758 +
107759 + This will also break programs that rely on the old behaviour and
107760 + expect that dynamically allocated memory via the malloc() family
107761 + of functions is executable (which it is not). Notable examples
107762 + are the XFree86 4.x server, the java runtime and wine.
107763 +
107764 +config PAX_PAGEEXEC
107765 + bool "Paging based non-executable pages"
107766 + default y if GRKERNSEC_CONFIG_AUTO
107767 + 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)
107768 + select ARCH_TRACK_EXEC_LIMIT if X86_32
107769 + help
107770 + This implementation is based on the paging feature of the CPU.
107771 + On i386 without hardware non-executable bit support there is a
107772 + variable but usually low performance impact, however on Intel's
107773 + P4 core based CPUs it is very high so you should not enable this
107774 + for kernels meant to be used on such CPUs.
107775 +
107776 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
107777 + with hardware non-executable bit support there is no performance
107778 + impact, on ppc the impact is negligible.
107779 +
107780 + Note that several architectures require various emulations due to
107781 + badly designed userland ABIs, this will cause a performance impact
107782 + but will disappear as soon as userland is fixed. For example, ppc
107783 + userland MUST have been built with secure-plt by a recent toolchain.
107784 +
107785 +config PAX_SEGMEXEC
107786 + bool "Segmentation based non-executable pages"
107787 + default y if GRKERNSEC_CONFIG_AUTO
107788 + depends on PAX_NOEXEC && X86_32
107789 + help
107790 + This implementation is based on the segmentation feature of the
107791 + CPU and has a very small performance impact, however applications
107792 + will be limited to a 1.5 GB address space instead of the normal
107793 + 3 GB.
107794 +
107795 +config PAX_EMUTRAMP
107796 + bool "Emulate trampolines"
107797 + default y if PARISC || GRKERNSEC_CONFIG_AUTO
107798 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
107799 + help
107800 + There are some programs and libraries that for one reason or
107801 + another attempt to execute special small code snippets from
107802 + non-executable memory pages. Most notable examples are the
107803 + signal handler return code generated by the kernel itself and
107804 + the GCC trampolines.
107805 +
107806 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
107807 + such programs will no longer work under your kernel.
107808 +
107809 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
107810 + utilities to enable trampoline emulation for the affected programs
107811 + yet still have the protection provided by the non-executable pages.
107812 +
107813 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
107814 + your system will not even boot.
107815 +
107816 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
107817 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
107818 + for the affected files.
107819 +
107820 + NOTE: enabling this feature *may* open up a loophole in the
107821 + protection provided by non-executable pages that an attacker
107822 + could abuse. Therefore the best solution is to not have any
107823 + files on your system that would require this option. This can
107824 + be achieved by not using libc5 (which relies on the kernel
107825 + signal handler return code) and not using or rewriting programs
107826 + that make use of the nested function implementation of GCC.
107827 + Skilled users can just fix GCC itself so that it implements
107828 + nested function calls in a way that does not interfere with PaX.
107829 +
107830 +config PAX_EMUSIGRT
107831 + bool "Automatically emulate sigreturn trampolines"
107832 + depends on PAX_EMUTRAMP && PARISC
107833 + default y
107834 + help
107835 + Enabling this option will have the kernel automatically detect
107836 + and emulate signal return trampolines executing on the stack
107837 + that would otherwise lead to task termination.
107838 +
107839 + This solution is intended as a temporary one for users with
107840 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
107841 + Modula-3 runtime, etc) or executables linked to such, basically
107842 + everything that does not specify its own SA_RESTORER function in
107843 + normal executable memory like glibc 2.1+ does.
107844 +
107845 + On parisc you MUST enable this option, otherwise your system will
107846 + not even boot.
107847 +
107848 + NOTE: this feature cannot be disabled on a per executable basis
107849 + and since it *does* open up a loophole in the protection provided
107850 + by non-executable pages, the best solution is to not have any
107851 + files on your system that would require this option.
107852 +
107853 +config PAX_MPROTECT
107854 + bool "Restrict mprotect()"
107855 + default y if GRKERNSEC_CONFIG_AUTO
107856 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
107857 + help
107858 + Enabling this option will prevent programs from
107859 + - changing the executable status of memory pages that were
107860 + not originally created as executable,
107861 + - making read-only executable pages writable again,
107862 + - creating executable pages from anonymous memory,
107863 + - making read-only-after-relocations (RELRO) data pages writable again.
107864 +
107865 + You should say Y here to complete the protection provided by
107866 + the enforcement of non-executable pages.
107867 +
107868 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
107869 + this feature on a per file basis.
107870 +
107871 +config PAX_MPROTECT_COMPAT
107872 + bool "Use legacy/compat protection demoting (read help)"
107873 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
107874 + depends on PAX_MPROTECT
107875 + help
107876 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
107877 + by sending the proper error code to the application. For some broken
107878 + userland, this can cause problems with Python or other applications. The
107879 + current implementation however allows for applications like clamav to
107880 + detect if JIT compilation/execution is allowed and to fall back gracefully
107881 + to an interpreter-based mode if it does not. While we encourage everyone
107882 + to use the current implementation as-is and push upstream to fix broken
107883 + userland (note that the RWX logging option can assist with this), in some
107884 + environments this may not be possible. Having to disable MPROTECT
107885 + completely on certain binaries reduces the security benefit of PaX,
107886 + so this option is provided for those environments to revert to the old
107887 + behavior.
107888 +
107889 +config PAX_ELFRELOCS
107890 + bool "Allow ELF text relocations (read help)"
107891 + depends on PAX_MPROTECT
107892 + default n
107893 + help
107894 + Non-executable pages and mprotect() restrictions are effective
107895 + in preventing the introduction of new executable code into an
107896 + attacked task's address space. There remain only two venues
107897 + for this kind of attack: if the attacker can execute already
107898 + existing code in the attacked task then he can either have it
107899 + create and mmap() a file containing his code or have it mmap()
107900 + an already existing ELF library that does not have position
107901 + independent code in it and use mprotect() on it to make it
107902 + writable and copy his code there. While protecting against
107903 + the former approach is beyond PaX, the latter can be prevented
107904 + by having only PIC ELF libraries on one's system (which do not
107905 + need to relocate their code). If you are sure this is your case,
107906 + as is the case with all modern Linux distributions, then leave
107907 + this option disabled. You should say 'n' here.
107908 +
107909 +config PAX_ETEXECRELOCS
107910 + bool "Allow ELF ET_EXEC text relocations"
107911 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
107912 + select PAX_ELFRELOCS
107913 + default y
107914 + help
107915 + On some architectures there are incorrectly created applications
107916 + that require text relocations and would not work without enabling
107917 + this option. If you are an alpha, ia64 or parisc user, you should
107918 + enable this option and disable it once you have made sure that
107919 + none of your applications need it.
107920 +
107921 +config PAX_EMUPLT
107922 + bool "Automatically emulate ELF PLT"
107923 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
107924 + default y
107925 + help
107926 + Enabling this option will have the kernel automatically detect
107927 + and emulate the Procedure Linkage Table entries in ELF files.
107928 + On some architectures such entries are in writable memory, and
107929 + become non-executable leading to task termination. Therefore
107930 + it is mandatory that you enable this option on alpha, parisc,
107931 + sparc and sparc64, otherwise your system would not even boot.
107932 +
107933 + NOTE: this feature *does* open up a loophole in the protection
107934 + provided by the non-executable pages, therefore the proper
107935 + solution is to modify the toolchain to produce a PLT that does
107936 + not need to be writable.
107937 +
107938 +config PAX_DLRESOLVE
107939 + bool 'Emulate old glibc resolver stub'
107940 + depends on PAX_EMUPLT && SPARC
107941 + default n
107942 + help
107943 + This option is needed if userland has an old glibc (before 2.4)
107944 + that puts a 'save' instruction into the runtime generated resolver
107945 + stub that needs special emulation.
107946 +
107947 +config PAX_KERNEXEC
107948 + bool "Enforce non-executable kernel pages"
107949 + default y if GRKERNSEC_CONFIG_AUTO && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_GUEST) || (GRKERNSEC_CONFIG_VIRT_EPT && GRKERNSEC_CONFIG_VIRT_KVM))
107950 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !(ARM_LPAE && MODULES))) && !XEN
107951 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
107952 + select PAX_KERNEXEC_PLUGIN if X86_64
107953 + help
107954 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
107955 + that is, enabling this option will make it harder to inject
107956 + and execute 'foreign' code in kernel memory itself.
107957 +
107958 + Note that on amd64, CONFIG_EFI enabled with "efi=old_map" on
107959 + the kernel command-line will result in an RWX physical map.
107960 +
107961 + Likewise, the EFI runtime services are necessarily mapped as
107962 + RWX. If CONFIG_EFI is enabled on an EFI-capable system, it
107963 + is recommended that you boot with "noefi" on the kernel
107964 + command-line if possible to eliminate the mapping.
107965 +
107966 +choice
107967 + prompt "Return Address Instrumentation Method"
107968 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
107969 + depends on PAX_KERNEXEC_PLUGIN
107970 + help
107971 + Select the method used to instrument function pointer dereferences.
107972 + Note that binary modules cannot be instrumented by this approach.
107973 +
107974 + Note that the implementation requires a gcc with plugin support,
107975 + i.e., gcc 4.5 or newer. You may need to install the supporting
107976 + headers explicitly in addition to the normal gcc package.
107977 +
107978 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
107979 + bool "bts"
107980 + help
107981 + This method is compatible with binary only modules but has
107982 + a higher runtime overhead.
107983 +
107984 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
107985 + bool "or"
107986 + depends on !PARAVIRT
107987 + help
107988 + This method is incompatible with binary only modules but has
107989 + a lower runtime overhead.
107990 +endchoice
107991 +
107992 +config PAX_KERNEXEC_PLUGIN_METHOD
107993 + string
107994 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
107995 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
107996 + default ""
107997 +
107998 +config PAX_KERNEXEC_MODULE_TEXT
107999 + int "Minimum amount of memory reserved for module code"
108000 + default "8" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
108001 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
108002 + depends on PAX_KERNEXEC && X86_32
108003 + help
108004 + Due to implementation details the kernel must reserve a fixed
108005 + amount of memory for runtime allocated code (such as modules)
108006 + at compile time that cannot be changed at runtime. Here you
108007 + can specify the minimum amount in MB that will be reserved.
108008 + Due to the same implementation details this size will always
108009 + be rounded up to the next 2/4 MB boundary (depends on PAE) so
108010 + the actually available memory for runtime allocated code will
108011 + usually be more than this minimum.
108012 +
108013 + The default 4 MB should be enough for most users but if you have
108014 + an excessive number of modules (e.g., most distribution configs
108015 + compile many drivers as modules) or use huge modules such as
108016 + nvidia's kernel driver, you will need to adjust this amount.
108017 + A good rule of thumb is to look at your currently loaded kernel
108018 + modules and add up their sizes.
108019 +
108020 +endmenu
108021 +
108022 +menu "Address Space Layout Randomization"
108023 + depends on PAX
108024 +
108025 +config PAX_ASLR
108026 + bool "Address Space Layout Randomization"
108027 + default y if GRKERNSEC_CONFIG_AUTO
108028 + help
108029 + Many if not most exploit techniques rely on the knowledge of
108030 + certain addresses in the attacked program. The following options
108031 + will allow the kernel to apply a certain amount of randomization
108032 + to specific parts of the program thereby forcing an attacker to
108033 + guess them in most cases. Any failed guess will most likely crash
108034 + the attacked program which allows the kernel to detect such attempts
108035 + and react on them. PaX itself provides no reaction mechanisms,
108036 + instead it is strongly encouraged that you make use of grsecurity's
108037 + (http://www.grsecurity.net/) built-in crash detection features or
108038 + develop one yourself.
108039 +
108040 + By saying Y here you can choose to randomize the following areas:
108041 + - top of the task's kernel stack
108042 + - top of the task's userland stack
108043 + - base address for mmap() requests that do not specify one
108044 + (this includes all libraries)
108045 + - base address of the main executable
108046 +
108047 + It is strongly recommended to say Y here as address space layout
108048 + randomization has negligible impact on performance yet it provides
108049 + a very effective protection.
108050 +
108051 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
108052 + this feature on a per file basis.
108053 +
108054 +config PAX_RANDKSTACK
108055 + bool "Randomize kernel stack base"
108056 + default y if GRKERNSEC_CONFIG_AUTO && !(GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_VIRTUALBOX)
108057 + depends on X86_TSC && X86
108058 + help
108059 + By saying Y here the kernel will randomize every task's kernel
108060 + stack on every system call. This will not only force an attacker
108061 + to guess it but also prevent him from making use of possible
108062 + leaked information about it.
108063 +
108064 + Since the kernel stack is a rather scarce resource, randomization
108065 + may cause unexpected stack overflows, therefore you should very
108066 + carefully test your system. Note that once enabled in the kernel
108067 + configuration, this feature cannot be disabled on a per file basis.
108068 +
108069 +config PAX_RANDUSTACK
108070 + bool
108071 +
108072 +config PAX_RANDMMAP
108073 + bool "Randomize user stack and mmap() bases"
108074 + default y if GRKERNSEC_CONFIG_AUTO
108075 + depends on PAX_ASLR
108076 + select PAX_RANDUSTACK
108077 + help
108078 + By saying Y here the kernel will randomize every task's userland
108079 + stack and use a randomized base address for mmap() requests that
108080 + do not specify one themselves.
108081 +
108082 + The stack randomization is done in two steps where the second
108083 + one may apply a big amount of shift to the top of the stack and
108084 + cause problems for programs that want to use lots of memory (more
108085 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
108086 +
108087 + As a result of mmap randomization all dynamically loaded libraries
108088 + will appear at random addresses and therefore be harder to exploit
108089 + by a technique where an attacker attempts to execute library code
108090 + for his purposes (e.g. spawn a shell from an exploited program that
108091 + is running at an elevated privilege level).
108092 +
108093 + Furthermore, if a program is relinked as a dynamic ELF file, its
108094 + base address will be randomized as well, completing the full
108095 + randomization of the address space layout. Attacking such programs
108096 + becomes a guess game. You can find an example of doing this at
108097 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
108098 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
108099 +
108100 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
108101 + feature on a per file basis.
108102 +
108103 +endmenu
108104 +
108105 +menu "Miscellaneous hardening features"
108106 +
108107 +config PAX_MEMORY_SANITIZE
108108 + bool "Sanitize all freed memory"
108109 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
108110 + help
108111 + By saying Y here the kernel will erase memory pages and slab objects
108112 + as soon as they are freed. This in turn reduces the lifetime of data
108113 + stored in them, making it less likely that sensitive information such
108114 + as passwords, cryptographic secrets, etc stay in memory for too long.
108115 +
108116 + This is especially useful for programs whose runtime is short, long
108117 + lived processes and the kernel itself benefit from this as long as
108118 + they ensure timely freeing of memory that may hold sensitive
108119 + information.
108120 +
108121 + A nice side effect of the sanitization of slab objects is the
108122 + reduction of possible info leaks caused by padding bytes within the
108123 + leaky structures. Use-after-free bugs for structures containing
108124 + pointers can also be detected as dereferencing the sanitized pointer
108125 + will generate an access violation.
108126 +
108127 + The tradeoff is performance impact, on a single CPU system kernel
108128 + compilation sees a 3% slowdown, other systems and workloads may vary
108129 + and you are advised to test this feature on your expected workload
108130 + before deploying it.
108131 +
108132 + The slab sanitization feature excludes a few slab caches per default
108133 + for performance reasons. To extend the feature to cover those as
108134 + well, pass "pax_sanitize_slab=full" as kernel command line parameter.
108135 +
108136 + To reduce the performance penalty by sanitizing pages only, albeit
108137 + limiting the effectiveness of this feature at the same time, slab
108138 + sanitization can be disabled with the kernel command line parameter
108139 + "pax_sanitize_slab=off".
108140 +
108141 + Note that this feature does not protect data stored in live pages,
108142 + e.g., process memory swapped to disk may stay there for a long time.
108143 +
108144 +config PAX_MEMORY_STACKLEAK
108145 + bool "Sanitize kernel stack"
108146 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
108147 + depends on X86
108148 + help
108149 + By saying Y here the kernel will erase the kernel stack before it
108150 + returns from a system call. This in turn reduces the information
108151 + that a kernel stack leak bug can reveal.
108152 +
108153 + Note that such a bug can still leak information that was put on
108154 + the stack by the current system call (the one eventually triggering
108155 + the bug) but traces of earlier system calls on the kernel stack
108156 + cannot leak anymore.
108157 +
108158 + The tradeoff is performance impact: on a single CPU system kernel
108159 + compilation sees a 1% slowdown, other systems and workloads may vary
108160 + and you are advised to test this feature on your expected workload
108161 + before deploying it.
108162 +
108163 + Note that the full feature requires a gcc with plugin support,
108164 + i.e., gcc 4.5 or newer. You may need to install the supporting
108165 + headers explicitly in addition to the normal gcc package. Using
108166 + older gcc versions means that functions with large enough stack
108167 + frames may leave uninitialized memory behind that may be exposed
108168 + to a later syscall leaking the stack.
108169 +
108170 +config PAX_MEMORY_STRUCTLEAK
108171 + bool "Forcibly initialize local variables copied to userland"
108172 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
108173 + help
108174 + By saying Y here the kernel will zero initialize some local
108175 + variables that are going to be copied to userland. This in
108176 + turn prevents unintended information leakage from the kernel
108177 + stack should later code forget to explicitly set all parts of
108178 + the copied variable.
108179 +
108180 + The tradeoff is less performance impact than PAX_MEMORY_STACKLEAK
108181 + at a much smaller coverage.
108182 +
108183 + Note that the implementation requires a gcc with plugin support,
108184 + i.e., gcc 4.5 or newer. You may need to install the supporting
108185 + headers explicitly in addition to the normal gcc package.
108186 +
108187 +config PAX_MEMORY_UDEREF
108188 + bool "Prevent invalid userland pointer dereference"
108189 + default y if GRKERNSEC_CONFIG_AUTO && !(X86_64 && GRKERNSEC_CONFIG_PRIORITY_PERF) && (!X86 || GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
108190 + depends on (X86 || (ARM && (CPU_V6 || CPU_V6K || CPU_V7) && !ARM_LPAE)) && !UML_X86 && !XEN
108191 + select PAX_PER_CPU_PGD if X86_64
108192 + help
108193 + By saying Y here the kernel will be prevented from dereferencing
108194 + userland pointers in contexts where the kernel expects only kernel
108195 + pointers. This is both a useful runtime debugging feature and a
108196 + security measure that prevents exploiting a class of kernel bugs.
108197 +
108198 + The tradeoff is that some virtualization solutions may experience
108199 + a huge slowdown and therefore you should not enable this feature
108200 + for kernels meant to run in such environments. Whether a given VM
108201 + solution is affected or not is best determined by simply trying it
108202 + out, the performance impact will be obvious right on boot as this
108203 + mechanism engages from very early on. A good rule of thumb is that
108204 + VMs running on CPUs without hardware virtualization support (i.e.,
108205 + the majority of IA-32 CPUs) will likely experience the slowdown.
108206 +
108207 + On X86_64 the kernel will make use of PCID support when available
108208 + (Intel's Westmere, Sandy Bridge, etc) for better security (default)
108209 + or performance impact. Pass pax_weakuderef on the kernel command
108210 + line to choose the latter.
108211 +
108212 +config PAX_REFCOUNT
108213 + bool "Prevent various kernel object reference counter overflows"
108214 + default y if GRKERNSEC_CONFIG_AUTO
108215 + depends on GRKERNSEC && ((ARM && (CPU_V6 || CPU_V6K || CPU_V7)) || MIPS || PPC || SPARC64 || X86)
108216 + help
108217 + By saying Y here the kernel will detect and prevent overflowing
108218 + various (but not all) kinds of object reference counters. Such
108219 + overflows can normally occur due to bugs only and are often, if
108220 + not always, exploitable.
108221 +
108222 + The tradeoff is that data structures protected by an overflowed
108223 + refcount will never be freed and therefore will leak memory. Note
108224 + that this leak also happens even without this protection but in
108225 + that case the overflow can eventually trigger the freeing of the
108226 + data structure while it is still being used elsewhere, resulting
108227 + in the exploitable situation that this feature prevents.
108228 +
108229 + Since this has a negligible performance impact, you should enable
108230 + this feature.
108231 +
108232 +config PAX_CONSTIFY_PLUGIN
108233 + bool "Automatically constify eligible structures"
108234 + default y
108235 + depends on !UML && PAX_KERNEXEC
108236 + help
108237 + By saying Y here the compiler will automatically constify a class
108238 + of types that contain only function pointers. This reduces the
108239 + kernel's attack surface and also produces a better memory layout.
108240 +
108241 + Note that the implementation requires a gcc with plugin support,
108242 + i.e., gcc 4.5 or newer. You may need to install the supporting
108243 + headers explicitly in addition to the normal gcc package.
108244 +
108245 + Note that if some code really has to modify constified variables
108246 + then the source code will have to be patched to allow it. Examples
108247 + can be found in PaX itself (the no_const attribute) and for some
108248 + out-of-tree modules at http://www.grsecurity.net/~paxguy1/ .
108249 +
108250 +config PAX_USERCOPY
108251 + bool "Harden heap object copies between kernel and userland"
108252 + default y if GRKERNSEC_CONFIG_AUTO
108253 + depends on ARM || IA64 || PPC || SPARC || X86
108254 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
108255 + select PAX_USERCOPY_SLABS
108256 + help
108257 + By saying Y here the kernel will enforce the size of heap objects
108258 + when they are copied in either direction between the kernel and
108259 + userland, even if only a part of the heap object is copied.
108260 +
108261 + Specifically, this checking prevents information leaking from the
108262 + kernel heap during kernel to userland copies (if the kernel heap
108263 + object is otherwise fully initialized) and prevents kernel heap
108264 + overflows during userland to kernel copies.
108265 +
108266 + Note that the current implementation provides the strictest bounds
108267 + checks for the SLUB allocator.
108268 +
108269 + Enabling this option also enables per-slab cache protection against
108270 + data in a given cache being copied into/out of via userland
108271 + accessors. Though the whitelist of regions will be reduced over
108272 + time, it notably protects important data structures like task structs.
108273 +
108274 + If frame pointers are enabled on x86, this option will also restrict
108275 + copies into and out of the kernel stack to local variables within a
108276 + single frame.
108277 +
108278 + Since this has a negligible performance impact, you should enable
108279 + this feature.
108280 +
108281 +config PAX_USERCOPY_DEBUG
108282 + bool
108283 + depends on X86 && PAX_USERCOPY
108284 + default n
108285 +
108286 +config PAX_SIZE_OVERFLOW
108287 + bool "Prevent various integer overflows in function size parameters"
108288 + default y if GRKERNSEC_CONFIG_AUTO
108289 + depends on X86
108290 + help
108291 + By saying Y here the kernel recomputes expressions of function
108292 + arguments marked by a size_overflow attribute with double integer
108293 + precision (DImode/TImode for 32/64 bit integer types).
108294 +
108295 + The recomputed argument is checked against TYPE_MAX and an event
108296 + is logged on overflow and the triggering process is killed.
108297 +
108298 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
108299 +
108300 + Note that the implementation requires a gcc with plugin support,
108301 + i.e., gcc 4.5 or newer. You may need to install the supporting
108302 + headers explicitly in addition to the normal gcc package.
108303 +
108304 +config PAX_LATENT_ENTROPY
108305 + bool "Generate some entropy during boot and runtime"
108306 + default y if GRKERNSEC_CONFIG_AUTO
108307 + help
108308 + By saying Y here the kernel will instrument some kernel code to
108309 + extract some entropy from both original and artificially created
108310 + program state. This will help especially embedded systems where
108311 + there is little 'natural' source of entropy normally. The cost
108312 + is some slowdown of the boot process and fork and irq processing.
108313 +
108314 + When pax_extra_latent_entropy is passed on the kernel command line,
108315 + entropy will be extracted from up to the first 4GB of RAM while the
108316 + runtime memory allocator is being initialized. This costs even more
108317 + slowdown of the boot process.
108318 +
108319 + Note that the implementation requires a gcc with plugin support,
108320 + i.e., gcc 4.5 or newer. You may need to install the supporting
108321 + headers explicitly in addition to the normal gcc package.
108322 +
108323 + Note that entropy extracted this way is not cryptographically
108324 + secure!
108325 +
108326 +endmenu
108327 +
108328 +endmenu
108329 +
108330 +source grsecurity/Kconfig
108331 +
108332 +endmenu
108333 +
108334 +endmenu
108335 +
108336 source security/keys/Kconfig
108337
108338 config SECURITY_DMESG_RESTRICT
108339 @@ -103,7 +1071,7 @@ config INTEL_TXT
108340 config LSM_MMAP_MIN_ADDR
108341 int "Low address space for LSM to protect from user allocation"
108342 depends on SECURITY && SECURITY_SELINUX
108343 - default 32768 if ARM || (ARM64 && COMPAT)
108344 + default 32768 if ALPHA || ARM || (ARM64 && COMPAT) || PARISC || SPARC32
108345 default 65536
108346 help
108347 This is the portion of low virtual memory which should be protected
108348 diff --git a/security/apparmor/file.c b/security/apparmor/file.c
108349 index fdaa50c..2761dcb 100644
108350 --- a/security/apparmor/file.c
108351 +++ b/security/apparmor/file.c
108352 @@ -348,8 +348,8 @@ static inline bool xindex_is_subset(u32 link, u32 target)
108353 int aa_path_link(struct aa_profile *profile, struct dentry *old_dentry,
108354 struct path *new_dir, struct dentry *new_dentry)
108355 {
108356 - struct path link = { new_dir->mnt, new_dentry };
108357 - struct path target = { new_dir->mnt, old_dentry };
108358 + struct path link = { .mnt = new_dir->mnt, .dentry = new_dentry };
108359 + struct path target = { .mnt = new_dir->mnt, .dentry = old_dentry };
108360 struct path_cond cond = {
108361 old_dentry->d_inode->i_uid,
108362 old_dentry->d_inode->i_mode
108363 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
108364 index 65ca451..ad6f22d 100644
108365 --- a/security/apparmor/lsm.c
108366 +++ b/security/apparmor/lsm.c
108367 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108368 struct dentry *dentry, u32 mask,
108369 struct path_cond *cond)
108370 {
108371 - struct path path = { dir->mnt, dentry };
108372 + struct path path = { .mnt = dir->mnt, .dentry = dentry };
108373
108374 return common_perm(op, &path, mask, cond);
108375 }
108376 @@ -203,7 +203,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
108377 static int common_perm_mnt_dentry(int op, struct vfsmount *mnt,
108378 struct dentry *dentry, u32 mask)
108379 {
108380 - struct path path = { mnt, dentry };
108381 + struct path path = { .mnt = mnt, .dentry = dentry };
108382 struct path_cond cond = { dentry->d_inode->i_uid,
108383 dentry->d_inode->i_mode
108384 };
108385 @@ -325,8 +325,8 @@ static int apparmor_path_rename(struct path *old_dir, struct dentry *old_dentry,
108386
108387 profile = aa_current_profile();
108388 if (!unconfined(profile)) {
108389 - struct path old_path = { old_dir->mnt, old_dentry };
108390 - struct path new_path = { new_dir->mnt, new_dentry };
108391 + struct path old_path = { .mnt = old_dir->mnt, .dentry = old_dentry };
108392 + struct path new_path = { .mnt = new_dir->mnt, .dentry = new_dentry };
108393 struct path_cond cond = { old_dentry->d_inode->i_uid,
108394 old_dentry->d_inode->i_mode
108395 };
108396 @@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
108397 return error;
108398 }
108399
108400 -static struct security_operations apparmor_ops = {
108401 +static struct security_operations apparmor_ops __read_only = {
108402 .name = "apparmor",
108403
108404 .ptrace_access_check = apparmor_ptrace_access_check,
108405 diff --git a/security/commoncap.c b/security/commoncap.c
108406 index bab0611..f9a0ff5 100644
108407 --- a/security/commoncap.c
108408 +++ b/security/commoncap.c
108409 @@ -427,6 +427,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
108410 return 0;
108411 }
108412
108413 +/* returns:
108414 + 1 for suid privilege
108415 + 2 for sgid privilege
108416 + 3 for fscap privilege
108417 +*/
108418 +int is_privileged_binary(const struct dentry *dentry)
108419 +{
108420 + struct cpu_vfs_cap_data capdata;
108421 + struct inode *inode = dentry->d_inode;
108422 +
108423 + if (!inode || S_ISDIR(inode->i_mode))
108424 + return 0;
108425 +
108426 + if (inode->i_mode & S_ISUID)
108427 + return 1;
108428 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
108429 + return 2;
108430 +
108431 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
108432 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
108433 + return 3;
108434 + }
108435 +
108436 + return 0;
108437 +}
108438 +
108439 /*
108440 * Attempt to get the on-exec apply capability sets for an executable file from
108441 * its xattrs and, if present, apply them to the proposed credentials being
108442 @@ -595,6 +621,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
108443 const struct cred *cred = current_cred();
108444 kuid_t root_uid = make_kuid(cred->user_ns, 0);
108445
108446 + if (gr_acl_enable_at_secure())
108447 + return 1;
108448 +
108449 if (!uid_eq(cred->uid, root_uid)) {
108450 if (bprm->cap_effective)
108451 return 1;
108452 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
108453 index 8ee997d..24c174b 100644
108454 --- a/security/integrity/ima/ima.h
108455 +++ b/security/integrity/ima/ima.h
108456 @@ -116,8 +116,8 @@ int ima_init_template(void);
108457 extern spinlock_t ima_queue_lock;
108458
108459 struct ima_h_table {
108460 - atomic_long_t len; /* number of stored measurements in the list */
108461 - atomic_long_t violations;
108462 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
108463 + atomic_long_unchecked_t violations;
108464 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
108465 };
108466 extern struct ima_h_table ima_htable;
108467 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
108468 index 8688597..9fa80d2 100644
108469 --- a/security/integrity/ima/ima_api.c
108470 +++ b/security/integrity/ima/ima_api.c
108471 @@ -137,7 +137,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
108472 int result;
108473
108474 /* can overflow, only indicator */
108475 - atomic_long_inc(&ima_htable.violations);
108476 + atomic_long_inc_unchecked(&ima_htable.violations);
108477
108478 result = ima_alloc_init_template(NULL, file, filename,
108479 NULL, 0, &entry);
108480 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
108481 index da92fcc..8a5d390 100644
108482 --- a/security/integrity/ima/ima_fs.c
108483 +++ b/security/integrity/ima/ima_fs.c
108484 @@ -28,12 +28,12 @@
108485 static int valid_policy = 1;
108486 #define TMPBUFLEN 12
108487 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
108488 - loff_t *ppos, atomic_long_t *val)
108489 + loff_t *ppos, atomic_long_unchecked_t *val)
108490 {
108491 char tmpbuf[TMPBUFLEN];
108492 ssize_t len;
108493
108494 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
108495 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
108496 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
108497 }
108498
108499 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
108500 index 552705d..9920f4fb 100644
108501 --- a/security/integrity/ima/ima_queue.c
108502 +++ b/security/integrity/ima/ima_queue.c
108503 @@ -83,7 +83,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
108504 INIT_LIST_HEAD(&qe->later);
108505 list_add_tail_rcu(&qe->later, &ima_measurements);
108506
108507 - atomic_long_inc(&ima_htable.len);
108508 + atomic_long_inc_unchecked(&ima_htable.len);
108509 key = ima_hash_key(entry->digest);
108510 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
108511 return 0;
108512 diff --git a/security/keys/compat.c b/security/keys/compat.c
108513 index 3478965..ec7bb9e 100644
108514 --- a/security/keys/compat.c
108515 +++ b/security/keys/compat.c
108516 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
108517 if (ret == 0)
108518 goto no_payload_free;
108519
108520 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108521 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108522 err:
108523 if (iov != iovstack)
108524 kfree(iov);
108525 diff --git a/security/keys/internal.h b/security/keys/internal.h
108526 index 200e378..cdc74b5 100644
108527 --- a/security/keys/internal.h
108528 +++ b/security/keys/internal.h
108529 @@ -244,7 +244,7 @@ extern long keyctl_instantiate_key_iov(key_serial_t,
108530 extern long keyctl_invalidate_key(key_serial_t);
108531
108532 extern long keyctl_instantiate_key_common(key_serial_t,
108533 - const struct iovec *,
108534 + const struct iovec __user *,
108535 unsigned, size_t, key_serial_t);
108536 #ifdef CONFIG_PERSISTENT_KEYRINGS
108537 extern long keyctl_get_persistent(uid_t, key_serial_t);
108538 diff --git a/security/keys/key.c b/security/keys/key.c
108539 index e17ba6a..2cc04a6 100644
108540 --- a/security/keys/key.c
108541 +++ b/security/keys/key.c
108542 @@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
108543
108544 atomic_set(&key->usage, 1);
108545 init_rwsem(&key->sem);
108546 - lockdep_set_class(&key->sem, &type->lock_class);
108547 + lockdep_set_class(&key->sem, (struct lock_class_key *)&type->lock_class);
108548 key->index_key.type = type;
108549 key->user = user;
108550 key->quotalen = quotalen;
108551 @@ -1075,7 +1075,9 @@ int register_key_type(struct key_type *ktype)
108552 struct key_type *p;
108553 int ret;
108554
108555 - memset(&ktype->lock_class, 0, sizeof(ktype->lock_class));
108556 + pax_open_kernel();
108557 + memset((void *)&ktype->lock_class, 0, sizeof(ktype->lock_class));
108558 + pax_close_kernel();
108559
108560 ret = -EEXIST;
108561 down_write(&key_types_sem);
108562 @@ -1087,7 +1089,7 @@ int register_key_type(struct key_type *ktype)
108563 }
108564
108565 /* store the type */
108566 - list_add(&ktype->link, &key_types_list);
108567 + pax_list_add((struct list_head *)&ktype->link, &key_types_list);
108568
108569 pr_notice("Key type %s registered\n", ktype->name);
108570 ret = 0;
108571 @@ -1109,7 +1111,7 @@ EXPORT_SYMBOL(register_key_type);
108572 void unregister_key_type(struct key_type *ktype)
108573 {
108574 down_write(&key_types_sem);
108575 - list_del_init(&ktype->link);
108576 + pax_list_del_init((struct list_head *)&ktype->link);
108577 downgrade_write(&key_types_sem);
108578 key_gc_keytype(ktype);
108579 pr_notice("Key type %s unregistered\n", ktype->name);
108580 @@ -1127,10 +1129,10 @@ void __init key_init(void)
108581 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
108582
108583 /* add the special key types */
108584 - list_add_tail(&key_type_keyring.link, &key_types_list);
108585 - list_add_tail(&key_type_dead.link, &key_types_list);
108586 - list_add_tail(&key_type_user.link, &key_types_list);
108587 - list_add_tail(&key_type_logon.link, &key_types_list);
108588 + pax_list_add_tail((struct list_head *)&key_type_keyring.link, &key_types_list);
108589 + pax_list_add_tail((struct list_head *)&key_type_dead.link, &key_types_list);
108590 + pax_list_add_tail((struct list_head *)&key_type_user.link, &key_types_list);
108591 + pax_list_add_tail((struct list_head *)&key_type_logon.link, &key_types_list);
108592
108593 /* record the root user tracking */
108594 rb_link_node(&root_key_user.node,
108595 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
108596 index 4743d71..170a185 100644
108597 --- a/security/keys/keyctl.c
108598 +++ b/security/keys/keyctl.c
108599 @@ -1000,7 +1000,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
108600 /*
108601 * Copy the iovec data from userspace
108602 */
108603 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108604 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
108605 unsigned ioc)
108606 {
108607 for (; ioc > 0; ioc--) {
108608 @@ -1022,7 +1022,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
108609 * If successful, 0 will be returned.
108610 */
108611 long keyctl_instantiate_key_common(key_serial_t id,
108612 - const struct iovec *payload_iov,
108613 + const struct iovec __user *payload_iov,
108614 unsigned ioc,
108615 size_t plen,
108616 key_serial_t ringid)
108617 @@ -1117,7 +1117,7 @@ long keyctl_instantiate_key(key_serial_t id,
108618 [0].iov_len = plen
108619 };
108620
108621 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
108622 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
108623 }
108624
108625 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
108626 @@ -1150,7 +1150,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
108627 if (ret == 0)
108628 goto no_payload_free;
108629
108630 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
108631 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
108632 err:
108633 if (iov != iovstack)
108634 kfree(iov);
108635 diff --git a/security/min_addr.c b/security/min_addr.c
108636 index f728728..6457a0c 100644
108637 --- a/security/min_addr.c
108638 +++ b/security/min_addr.c
108639 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
108640 */
108641 static void update_mmap_min_addr(void)
108642 {
108643 +#ifndef SPARC
108644 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
108645 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
108646 mmap_min_addr = dac_mmap_min_addr;
108647 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
108648 #else
108649 mmap_min_addr = dac_mmap_min_addr;
108650 #endif
108651 +#endif
108652 }
108653
108654 /*
108655 diff --git a/security/security.c b/security/security.c
108656 index 18b35c6..c9fbc92 100644
108657 --- a/security/security.c
108658 +++ b/security/security.c
108659 @@ -33,8 +33,8 @@
108660 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
108661 CONFIG_DEFAULT_SECURITY;
108662
108663 -static struct security_operations *security_ops;
108664 -static struct security_operations default_security_ops = {
108665 +struct security_operations *security_ops __read_only;
108666 +struct security_operations default_security_ops __read_only = {
108667 .name = "default",
108668 };
108669
108670 @@ -73,11 +73,6 @@ int __init security_init(void)
108671 return 0;
108672 }
108673
108674 -void reset_security_ops(void)
108675 -{
108676 - security_ops = &default_security_ops;
108677 -}
108678 -
108679 /* Save user chosen LSM */
108680 static int __init choose_lsm(char *str)
108681 {
108682 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
108683 index a18f1fa..c9b9fc4 100644
108684 --- a/security/selinux/avc.c
108685 +++ b/security/selinux/avc.c
108686 @@ -59,7 +59,7 @@ struct avc_node {
108687 struct avc_cache {
108688 struct hlist_head slots[AVC_CACHE_SLOTS]; /* head for avc_node->list */
108689 spinlock_t slots_lock[AVC_CACHE_SLOTS]; /* lock for writes */
108690 - atomic_t lru_hint; /* LRU hint for reclaim scan */
108691 + atomic_unchecked_t lru_hint; /* LRU hint for reclaim scan */
108692 atomic_t active_nodes;
108693 u32 latest_notif; /* latest revocation notification */
108694 };
108695 @@ -167,7 +167,7 @@ void __init avc_init(void)
108696 spin_lock_init(&avc_cache.slots_lock[i]);
108697 }
108698 atomic_set(&avc_cache.active_nodes, 0);
108699 - atomic_set(&avc_cache.lru_hint, 0);
108700 + atomic_set_unchecked(&avc_cache.lru_hint, 0);
108701
108702 avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node),
108703 0, SLAB_PANIC, NULL);
108704 @@ -242,7 +242,7 @@ static inline int avc_reclaim_node(void)
108705 spinlock_t *lock;
108706
108707 for (try = 0, ecx = 0; try < AVC_CACHE_SLOTS; try++) {
108708 - hvalue = atomic_inc_return(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108709 + hvalue = atomic_inc_return_unchecked(&avc_cache.lru_hint) & (AVC_CACHE_SLOTS - 1);
108710 head = &avc_cache.slots[hvalue];
108711 lock = &avc_cache.slots_lock[hvalue];
108712
108713 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
108714 index c603b20..8716ec9 100644
108715 --- a/security/selinux/hooks.c
108716 +++ b/security/selinux/hooks.c
108717 @@ -95,8 +95,6 @@
108718 #include "audit.h"
108719 #include "avc_ss.h"
108720
108721 -extern struct security_operations *security_ops;
108722 -
108723 /* SECMARK reference count */
108724 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
108725
108726 @@ -5809,7 +5807,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
108727
108728 #endif
108729
108730 -static struct security_operations selinux_ops = {
108731 +static struct security_operations selinux_ops __read_only = {
108732 .name = "selinux",
108733
108734 .ptrace_access_check = selinux_ptrace_access_check,
108735 @@ -6150,6 +6148,9 @@ static void selinux_nf_ip_exit(void)
108736 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
108737 static int selinux_disabled;
108738
108739 +extern struct security_operations *security_ops;
108740 +extern struct security_operations default_security_ops;
108741 +
108742 int selinux_disable(void)
108743 {
108744 if (ss_initialized) {
108745 @@ -6167,7 +6168,9 @@ int selinux_disable(void)
108746 selinux_disabled = 1;
108747 selinux_enabled = 0;
108748
108749 - reset_security_ops();
108750 + pax_open_kernel();
108751 + security_ops = &default_security_ops;
108752 + pax_close_kernel();
108753
108754 /* Try to destroy the avc node cache */
108755 avc_disable();
108756 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
108757 index 1450f85..a91e0bc 100644
108758 --- a/security/selinux/include/xfrm.h
108759 +++ b/security/selinux/include/xfrm.h
108760 @@ -48,7 +48,7 @@ static inline void selinux_xfrm_notify_policyload(void)
108761
108762 rtnl_lock();
108763 for_each_net(net) {
108764 - atomic_inc(&net->xfrm.flow_cache_genid);
108765 + atomic_inc_unchecked(&net->xfrm.flow_cache_genid);
108766 rt_genid_bump_all(net);
108767 }
108768 rtnl_unlock();
108769 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
108770 index d515ec2..8a4ca71 100644
108771 --- a/security/smack/smack_lsm.c
108772 +++ b/security/smack/smack_lsm.c
108773 @@ -4079,7 +4079,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
108774 return 0;
108775 }
108776
108777 -struct security_operations smack_ops = {
108778 +struct security_operations smack_ops __read_only = {
108779 .name = "smack",
108780
108781 .ptrace_access_check = smack_ptrace_access_check,
108782 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
108783 index 4003907..13a2b55 100644
108784 --- a/security/tomoyo/file.c
108785 +++ b/security/tomoyo/file.c
108786 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
108787 {
108788 struct tomoyo_request_info r;
108789 struct tomoyo_obj_info obj = {
108790 - .path1 = *path,
108791 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108792 };
108793 int error = -ENOMEM;
108794 struct tomoyo_path_info buf;
108795 @@ -740,7 +740,7 @@ int tomoyo_check_open_permission(struct tomoyo_domain_info *domain,
108796 struct tomoyo_path_info buf;
108797 struct tomoyo_request_info r;
108798 struct tomoyo_obj_info obj = {
108799 - .path1 = *path,
108800 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108801 };
108802 int idx;
108803
108804 @@ -786,7 +786,7 @@ int tomoyo_path_perm(const u8 operation, struct path *path, const char *target)
108805 {
108806 struct tomoyo_request_info r;
108807 struct tomoyo_obj_info obj = {
108808 - .path1 = *path,
108809 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108810 };
108811 int error;
108812 struct tomoyo_path_info buf;
108813 @@ -843,7 +843,7 @@ int tomoyo_mkdev_perm(const u8 operation, struct path *path,
108814 {
108815 struct tomoyo_request_info r;
108816 struct tomoyo_obj_info obj = {
108817 - .path1 = *path,
108818 + .path1 = { .mnt = path->mnt, .dentry = path->dentry },
108819 };
108820 int error = -ENOMEM;
108821 struct tomoyo_path_info buf;
108822 @@ -890,8 +890,8 @@ int tomoyo_path2_perm(const u8 operation, struct path *path1,
108823 struct tomoyo_path_info buf2;
108824 struct tomoyo_request_info r;
108825 struct tomoyo_obj_info obj = {
108826 - .path1 = *path1,
108827 - .path2 = *path2,
108828 + .path1 = { .mnt = path1->mnt, .dentry = path1->dentry },
108829 + .path2 = { .mnt = path2->mnt, .dentry = path2->dentry }
108830 };
108831 int idx;
108832
108833 diff --git a/security/tomoyo/mount.c b/security/tomoyo/mount.c
108834 index 390c646..f2f8db3 100644
108835 --- a/security/tomoyo/mount.c
108836 +++ b/security/tomoyo/mount.c
108837 @@ -118,6 +118,10 @@ static int tomoyo_mount_acl(struct tomoyo_request_info *r,
108838 type == tomoyo_mounts[TOMOYO_MOUNT_MOVE]) {
108839 need_dev = -1; /* dev_name is a directory */
108840 } else {
108841 + if (!capable(CAP_SYS_ADMIN)) {
108842 + error = -EPERM;
108843 + goto out;
108844 + }
108845 fstype = get_fs_type(type);
108846 if (!fstype) {
108847 error = -ENODEV;
108848 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
108849 index f0b756e..8aa497b 100644
108850 --- a/security/tomoyo/tomoyo.c
108851 +++ b/security/tomoyo/tomoyo.c
108852 @@ -146,7 +146,7 @@ static int tomoyo_bprm_check_security(struct linux_binprm *bprm)
108853 */
108854 static int tomoyo_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
108855 {
108856 - struct path path = { mnt, dentry };
108857 + struct path path = { .mnt = mnt, .dentry = dentry };
108858 return tomoyo_path_perm(TOMOYO_TYPE_GETATTR, &path, NULL);
108859 }
108860
108861 @@ -172,7 +172,7 @@ static int tomoyo_path_truncate(struct path *path)
108862 */
108863 static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108864 {
108865 - struct path path = { parent->mnt, dentry };
108866 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108867 return tomoyo_path_perm(TOMOYO_TYPE_UNLINK, &path, NULL);
108868 }
108869
108870 @@ -188,7 +188,7 @@ static int tomoyo_path_unlink(struct path *parent, struct dentry *dentry)
108871 static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108872 umode_t mode)
108873 {
108874 - struct path path = { parent->mnt, dentry };
108875 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108876 return tomoyo_path_number_perm(TOMOYO_TYPE_MKDIR, &path,
108877 mode & S_IALLUGO);
108878 }
108879 @@ -203,7 +203,7 @@ static int tomoyo_path_mkdir(struct path *parent, struct dentry *dentry,
108880 */
108881 static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108882 {
108883 - struct path path = { parent->mnt, dentry };
108884 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108885 return tomoyo_path_perm(TOMOYO_TYPE_RMDIR, &path, NULL);
108886 }
108887
108888 @@ -219,7 +219,7 @@ static int tomoyo_path_rmdir(struct path *parent, struct dentry *dentry)
108889 static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108890 const char *old_name)
108891 {
108892 - struct path path = { parent->mnt, dentry };
108893 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108894 return tomoyo_path_perm(TOMOYO_TYPE_SYMLINK, &path, old_name);
108895 }
108896
108897 @@ -236,7 +236,7 @@ static int tomoyo_path_symlink(struct path *parent, struct dentry *dentry,
108898 static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108899 umode_t mode, unsigned int dev)
108900 {
108901 - struct path path = { parent->mnt, dentry };
108902 + struct path path = { .mnt = parent->mnt, .dentry = dentry };
108903 int type = TOMOYO_TYPE_CREATE;
108904 const unsigned int perm = mode & S_IALLUGO;
108905
108906 @@ -275,8 +275,8 @@ static int tomoyo_path_mknod(struct path *parent, struct dentry *dentry,
108907 static int tomoyo_path_link(struct dentry *old_dentry, struct path *new_dir,
108908 struct dentry *new_dentry)
108909 {
108910 - struct path path1 = { new_dir->mnt, old_dentry };
108911 - struct path path2 = { new_dir->mnt, new_dentry };
108912 + struct path path1 = { .mnt = new_dir->mnt, .dentry = old_dentry };
108913 + struct path path2 = { .mnt = new_dir->mnt, .dentry = new_dentry };
108914 return tomoyo_path2_perm(TOMOYO_TYPE_LINK, &path1, &path2);
108915 }
108916
108917 @@ -295,8 +295,8 @@ static int tomoyo_path_rename(struct path *old_parent,
108918 struct path *new_parent,
108919 struct dentry *new_dentry)
108920 {
108921 - struct path path1 = { old_parent->mnt, old_dentry };
108922 - struct path path2 = { new_parent->mnt, new_dentry };
108923 + struct path path1 = { .mnt = old_parent->mnt, .dentry = old_dentry };
108924 + struct path path2 = { .mnt = new_parent->mnt, .dentry = new_dentry };
108925 return tomoyo_path2_perm(TOMOYO_TYPE_RENAME, &path1, &path2);
108926 }
108927
108928 @@ -424,7 +424,7 @@ static int tomoyo_sb_mount(const char *dev_name, struct path *path,
108929 */
108930 static int tomoyo_sb_umount(struct vfsmount *mnt, int flags)
108931 {
108932 - struct path path = { mnt, mnt->mnt_root };
108933 + struct path path = { .mnt = mnt, .dentry = mnt->mnt_root };
108934 return tomoyo_path_perm(TOMOYO_TYPE_UMOUNT, &path, NULL);
108935 }
108936
108937 @@ -503,7 +503,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
108938 * tomoyo_security_ops is a "struct security_operations" which is used for
108939 * registering TOMOYO.
108940 */
108941 -static struct security_operations tomoyo_security_ops = {
108942 +static struct security_operations tomoyo_security_ops __read_only = {
108943 .name = "tomoyo",
108944 .cred_alloc_blank = tomoyo_cred_alloc_blank,
108945 .cred_prepare = tomoyo_cred_prepare,
108946 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
108947 index 20ef514..4182bed 100644
108948 --- a/security/yama/Kconfig
108949 +++ b/security/yama/Kconfig
108950 @@ -1,6 +1,6 @@
108951 config SECURITY_YAMA
108952 bool "Yama support"
108953 - depends on SECURITY
108954 + depends on SECURITY && !GRKERNSEC
108955 select SECURITYFS
108956 select SECURITY_PATH
108957 default n
108958 diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
108959 index 13c88fbc..f8c115e 100644
108960 --- a/security/yama/yama_lsm.c
108961 +++ b/security/yama/yama_lsm.c
108962 @@ -365,7 +365,7 @@ int yama_ptrace_traceme(struct task_struct *parent)
108963 }
108964
108965 #ifndef CONFIG_SECURITY_YAMA_STACKED
108966 -static struct security_operations yama_ops = {
108967 +static struct security_operations yama_ops __read_only = {
108968 .name = "yama",
108969
108970 .ptrace_access_check = yama_ptrace_access_check,
108971 @@ -376,28 +376,24 @@ static struct security_operations yama_ops = {
108972 #endif
108973
108974 #ifdef CONFIG_SYSCTL
108975 +static int zero __read_only;
108976 +static int max_scope __read_only = YAMA_SCOPE_NO_ATTACH;
108977 +
108978 static int yama_dointvec_minmax(struct ctl_table *table, int write,
108979 void __user *buffer, size_t *lenp, loff_t *ppos)
108980 {
108981 - int rc;
108982 + ctl_table_no_const yama_table;
108983
108984 if (write && !capable(CAP_SYS_PTRACE))
108985 return -EPERM;
108986
108987 - rc = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
108988 - if (rc)
108989 - return rc;
108990 -
108991 + yama_table = *table;
108992 /* Lock the max value if it ever gets set. */
108993 - if (write && *(int *)table->data == *(int *)table->extra2)
108994 - table->extra1 = table->extra2;
108995 -
108996 - return rc;
108997 + if (ptrace_scope == max_scope)
108998 + yama_table.extra1 = &max_scope;
108999 + return proc_dointvec_minmax(&yama_table, write, buffer, lenp, ppos);
109000 }
109001
109002 -static int zero;
109003 -static int max_scope = YAMA_SCOPE_NO_ATTACH;
109004 -
109005 struct ctl_path yama_sysctl_path[] = {
109006 { .procname = "kernel", },
109007 { .procname = "yama", },
109008 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
109009 index 401107b..b9c47c6 100644
109010 --- a/sound/aoa/codecs/onyx.c
109011 +++ b/sound/aoa/codecs/onyx.c
109012 @@ -54,7 +54,7 @@ struct onyx {
109013 spdif_locked:1,
109014 analog_locked:1,
109015 original_mute:2;
109016 - int open_count;
109017 + local_t open_count;
109018 struct codec_info *codec_info;
109019
109020 /* mutex serializes concurrent access to the device
109021 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
109022 struct onyx *onyx = cii->codec_data;
109023
109024 mutex_lock(&onyx->mutex);
109025 - onyx->open_count++;
109026 + local_inc(&onyx->open_count);
109027 mutex_unlock(&onyx->mutex);
109028
109029 return 0;
109030 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
109031 struct onyx *onyx = cii->codec_data;
109032
109033 mutex_lock(&onyx->mutex);
109034 - onyx->open_count--;
109035 - if (!onyx->open_count)
109036 + if (local_dec_and_test(&onyx->open_count))
109037 onyx->spdif_locked = onyx->analog_locked = 0;
109038 mutex_unlock(&onyx->mutex);
109039
109040 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
109041 index ffd2025..df062c9 100644
109042 --- a/sound/aoa/codecs/onyx.h
109043 +++ b/sound/aoa/codecs/onyx.h
109044 @@ -11,6 +11,7 @@
109045 #include <linux/i2c.h>
109046 #include <asm/pmac_low_i2c.h>
109047 #include <asm/prom.h>
109048 +#include <asm/local.h>
109049
109050 /* PCM3052 register definitions */
109051
109052 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
109053 index ada69d7..5f65386 100644
109054 --- a/sound/core/oss/pcm_oss.c
109055 +++ b/sound/core/oss/pcm_oss.c
109056 @@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
109057 if (in_kernel) {
109058 mm_segment_t fs;
109059 fs = snd_enter_user();
109060 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
109061 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
109062 snd_leave_user(fs);
109063 } else {
109064 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
109065 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
109066 }
109067 if (ret != -EPIPE && ret != -ESTRPIPE)
109068 break;
109069 @@ -1233,10 +1233,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
109070 if (in_kernel) {
109071 mm_segment_t fs;
109072 fs = snd_enter_user();
109073 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
109074 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
109075 snd_leave_user(fs);
109076 } else {
109077 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
109078 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
109079 }
109080 if (ret == -EPIPE) {
109081 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
109082 @@ -1332,7 +1332,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
109083 struct snd_pcm_plugin_channel *channels;
109084 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
109085 if (!in_kernel) {
109086 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
109087 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
109088 return -EFAULT;
109089 buf = runtime->oss.buffer;
109090 }
109091 @@ -1402,7 +1402,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
109092 }
109093 } else {
109094 tmp = snd_pcm_oss_write2(substream,
109095 - (const char __force *)buf,
109096 + (const char __force_kernel *)buf,
109097 runtime->oss.period_bytes, 0);
109098 if (tmp <= 0)
109099 goto err;
109100 @@ -1428,7 +1428,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
109101 struct snd_pcm_runtime *runtime = substream->runtime;
109102 snd_pcm_sframes_t frames, frames1;
109103 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
109104 - char __user *final_dst = (char __force __user *)buf;
109105 + char __user *final_dst = (char __force_user *)buf;
109106 if (runtime->oss.plugin_first) {
109107 struct snd_pcm_plugin_channel *channels;
109108 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
109109 @@ -1490,7 +1490,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
109110 xfer += tmp;
109111 runtime->oss.buffer_used -= tmp;
109112 } else {
109113 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
109114 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
109115 runtime->oss.period_bytes, 0);
109116 if (tmp <= 0)
109117 goto err;
109118 @@ -1659,7 +1659,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
109119 size1);
109120 size1 /= runtime->channels; /* frames */
109121 fs = snd_enter_user();
109122 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
109123 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
109124 snd_leave_user(fs);
109125 }
109126 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
109127 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
109128 index 2d957ba..fda022c 100644
109129 --- a/sound/core/pcm_compat.c
109130 +++ b/sound/core/pcm_compat.c
109131 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
109132 int err;
109133
109134 fs = snd_enter_user();
109135 - err = snd_pcm_delay(substream, &delay);
109136 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
109137 snd_leave_user(fs);
109138 if (err < 0)
109139 return err;
109140 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
109141 index 166d59c..89e3889 100644
109142 --- a/sound/core/pcm_native.c
109143 +++ b/sound/core/pcm_native.c
109144 @@ -2931,11 +2931,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
109145 switch (substream->stream) {
109146 case SNDRV_PCM_STREAM_PLAYBACK:
109147 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
109148 - (void __user *)arg);
109149 + (void __force_user *)arg);
109150 break;
109151 case SNDRV_PCM_STREAM_CAPTURE:
109152 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
109153 - (void __user *)arg);
109154 + (void __force_user *)arg);
109155 break;
109156 default:
109157 result = -EINVAL;
109158 diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c
109159 index 16d4267..fe8b49b 100644
109160 --- a/sound/core/seq/oss/seq_oss.c
109161 +++ b/sound/core/seq/oss/seq_oss.c
109162 @@ -69,8 +69,8 @@ static int __init alsa_seq_oss_init(void)
109163 {
109164 int rc;
109165 static struct snd_seq_dev_ops ops = {
109166 - snd_seq_oss_synth_register,
109167 - snd_seq_oss_synth_unregister,
109168 + .init_device = snd_seq_oss_synth_register,
109169 + .free_device = snd_seq_oss_synth_unregister,
109170 };
109171
109172 snd_seq_autoload_lock();
109173 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
109174 index 91a786a..4c07ed4 100644
109175 --- a/sound/core/seq/seq_device.c
109176 +++ b/sound/core/seq/seq_device.c
109177 @@ -64,7 +64,7 @@ struct ops_list {
109178 int argsize; /* argument size */
109179
109180 /* operators */
109181 - struct snd_seq_dev_ops ops;
109182 + struct snd_seq_dev_ops *ops;
109183
109184 /* registered devices */
109185 struct list_head dev_list; /* list of devices */
109186 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
109187
109188 mutex_lock(&ops->reg_mutex);
109189 /* copy driver operators */
109190 - ops->ops = *entry;
109191 + ops->ops = entry;
109192 ops->driver |= DRIVER_LOADED;
109193 ops->argsize = argsize;
109194
109195 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
109196 dev->name, ops->id, ops->argsize, dev->argsize);
109197 return -EINVAL;
109198 }
109199 - if (ops->ops.init_device(dev) >= 0) {
109200 + if (ops->ops->init_device(dev) >= 0) {
109201 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
109202 ops->num_init_devices++;
109203 } else {
109204 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
109205 dev->name, ops->id, ops->argsize, dev->argsize);
109206 return -EINVAL;
109207 }
109208 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
109209 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
109210 dev->status = SNDRV_SEQ_DEVICE_FREE;
109211 dev->driver_data = NULL;
109212 ops->num_init_devices--;
109213 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
109214 index a1fd77a..69cd659 100644
109215 --- a/sound/core/seq/seq_midi.c
109216 +++ b/sound/core/seq/seq_midi.c
109217 @@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
109218 static int __init alsa_seq_midi_init(void)
109219 {
109220 static struct snd_seq_dev_ops ops = {
109221 - snd_seq_midisynth_register_port,
109222 - snd_seq_midisynth_unregister_port,
109223 + .init_device = snd_seq_midisynth_register_port,
109224 + .free_device = snd_seq_midisynth_unregister_port,
109225 };
109226 memset(&synths, 0, sizeof(synths));
109227 snd_seq_autoload_lock();
109228 diff --git a/sound/core/sound.c b/sound/core/sound.c
109229 index 38ad1a0..5010a40 100644
109230 --- a/sound/core/sound.c
109231 +++ b/sound/core/sound.c
109232 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
109233 case SNDRV_MINOR_TIMER: str = "snd-timer"; break;
109234 default: return;
109235 }
109236 - request_module(str);
109237 + request_module("%s", str);
109238 }
109239
109240 #endif /* modular kernel */
109241 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
109242 index f5fd448..6ae276da 100644
109243 --- a/sound/drivers/mts64.c
109244 +++ b/sound/drivers/mts64.c
109245 @@ -29,6 +29,7 @@
109246 #include <sound/initval.h>
109247 #include <sound/rawmidi.h>
109248 #include <sound/control.h>
109249 +#include <asm/local.h>
109250
109251 #define CARD_NAME "Miditerminal 4140"
109252 #define DRIVER_NAME "MTS64"
109253 @@ -67,7 +68,7 @@ struct mts64 {
109254 struct pardevice *pardev;
109255 int pardev_claimed;
109256
109257 - int open_count;
109258 + local_t open_count;
109259 int current_midi_output_port;
109260 int current_midi_input_port;
109261 u8 mode[MTS64_NUM_INPUT_PORTS];
109262 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
109263 {
109264 struct mts64 *mts = substream->rmidi->private_data;
109265
109266 - if (mts->open_count == 0) {
109267 + if (local_read(&mts->open_count) == 0) {
109268 /* We don't need a spinlock here, because this is just called
109269 if the device has not been opened before.
109270 So there aren't any IRQs from the device */
109271 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
109272
109273 msleep(50);
109274 }
109275 - ++(mts->open_count);
109276 + local_inc(&mts->open_count);
109277
109278 return 0;
109279 }
109280 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
109281 struct mts64 *mts = substream->rmidi->private_data;
109282 unsigned long flags;
109283
109284 - --(mts->open_count);
109285 - if (mts->open_count == 0) {
109286 + if (local_dec_return(&mts->open_count) == 0) {
109287 /* We need the spinlock_irqsave here because we can still
109288 have IRQs at this point */
109289 spin_lock_irqsave(&mts->lock, flags);
109290 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
109291
109292 msleep(500);
109293
109294 - } else if (mts->open_count < 0)
109295 - mts->open_count = 0;
109296 + } else if (local_read(&mts->open_count) < 0)
109297 + local_set(&mts->open_count, 0);
109298
109299 return 0;
109300 }
109301 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
109302 index 6839953..7a0f4b9 100644
109303 --- a/sound/drivers/opl3/opl3_seq.c
109304 +++ b/sound/drivers/opl3/opl3_seq.c
109305 @@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
109306 {
109307 static struct snd_seq_dev_ops ops =
109308 {
109309 - snd_opl3_seq_new_device,
109310 - snd_opl3_seq_delete_device
109311 + .init_device = snd_opl3_seq_new_device,
109312 + .free_device = snd_opl3_seq_delete_device
109313 };
109314
109315 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
109316 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
109317 index b953fb4..1999c01 100644
109318 --- a/sound/drivers/opl4/opl4_lib.c
109319 +++ b/sound/drivers/opl4/opl4_lib.c
109320 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
109321 MODULE_DESCRIPTION("OPL4 driver");
109322 MODULE_LICENSE("GPL");
109323
109324 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
109325 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
109326 {
109327 int timeout = 10;
109328 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
109329 diff --git a/sound/drivers/opl4/opl4_seq.c b/sound/drivers/opl4/opl4_seq.c
109330 index 9919769..d7de36c 100644
109331 --- a/sound/drivers/opl4/opl4_seq.c
109332 +++ b/sound/drivers/opl4/opl4_seq.c
109333 @@ -198,8 +198,8 @@ static int snd_opl4_seq_delete_device(struct snd_seq_device *dev)
109334 static int __init alsa_opl4_synth_init(void)
109335 {
109336 static struct snd_seq_dev_ops ops = {
109337 - snd_opl4_seq_new_device,
109338 - snd_opl4_seq_delete_device
109339 + .init_device = snd_opl4_seq_new_device,
109340 + .free_device = snd_opl4_seq_delete_device
109341 };
109342
109343 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL4, &ops,
109344 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
109345 index 78ccfa4..7a0857b 100644
109346 --- a/sound/drivers/portman2x4.c
109347 +++ b/sound/drivers/portman2x4.c
109348 @@ -48,6 +48,7 @@
109349 #include <sound/initval.h>
109350 #include <sound/rawmidi.h>
109351 #include <sound/control.h>
109352 +#include <asm/local.h>
109353
109354 #define CARD_NAME "Portman 2x4"
109355 #define DRIVER_NAME "portman"
109356 @@ -85,7 +86,7 @@ struct portman {
109357 struct pardevice *pardev;
109358 int pardev_claimed;
109359
109360 - int open_count;
109361 + local_t open_count;
109362 int mode[PORTMAN_NUM_INPUT_PORTS];
109363 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
109364 };
109365 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
109366 index 95fc2eaf..ea5d6a7 100644
109367 --- a/sound/firewire/amdtp.c
109368 +++ b/sound/firewire/amdtp.c
109369 @@ -521,7 +521,7 @@ static void update_pcm_pointers(struct amdtp_stream *s,
109370 ptr = s->pcm_buffer_pointer + frames;
109371 if (ptr >= pcm->runtime->buffer_size)
109372 ptr -= pcm->runtime->buffer_size;
109373 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
109374 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
109375
109376 s->pcm_period_pointer += frames;
109377 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
109378 @@ -961,7 +961,7 @@ EXPORT_SYMBOL(amdtp_stream_pcm_pointer);
109379 */
109380 void amdtp_stream_update(struct amdtp_stream *s)
109381 {
109382 - ACCESS_ONCE(s->source_node_id_field) =
109383 + ACCESS_ONCE_RW(s->source_node_id_field) =
109384 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
109385 }
109386 EXPORT_SYMBOL(amdtp_stream_update);
109387 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
109388 index 4823c08..47a5f7c 100644
109389 --- a/sound/firewire/amdtp.h
109390 +++ b/sound/firewire/amdtp.h
109391 @@ -212,7 +212,7 @@ static inline bool amdtp_stream_pcm_running(struct amdtp_stream *s)
109392 static inline void amdtp_stream_pcm_trigger(struct amdtp_stream *s,
109393 struct snd_pcm_substream *pcm)
109394 {
109395 - ACCESS_ONCE(s->pcm) = pcm;
109396 + ACCESS_ONCE_RW(s->pcm) = pcm;
109397 }
109398
109399 /**
109400 @@ -230,7 +230,7 @@ static inline void amdtp_stream_midi_trigger(struct amdtp_stream *s,
109401 struct snd_rawmidi_substream *midi)
109402 {
109403 if (port < s->midi_ports)
109404 - ACCESS_ONCE(s->midi[port]) = midi;
109405 + ACCESS_ONCE_RW(s->midi[port]) = midi;
109406 }
109407
109408 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
109409 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
109410 index 7ac9443..0ec6274 100644
109411 --- a/sound/firewire/isight.c
109412 +++ b/sound/firewire/isight.c
109413 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
109414 ptr += count;
109415 if (ptr >= runtime->buffer_size)
109416 ptr -= runtime->buffer_size;
109417 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
109418 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
109419
109420 isight->period_counter += count;
109421 if (isight->period_counter >= runtime->period_size) {
109422 @@ -299,7 +299,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
109423 if (err < 0)
109424 return err;
109425
109426 - ACCESS_ONCE(isight->pcm_active) = true;
109427 + ACCESS_ONCE_RW(isight->pcm_active) = true;
109428
109429 return 0;
109430 }
109431 @@ -337,7 +337,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
109432 {
109433 struct isight *isight = substream->private_data;
109434
109435 - ACCESS_ONCE(isight->pcm_active) = false;
109436 + ACCESS_ONCE_RW(isight->pcm_active) = false;
109437
109438 mutex_lock(&isight->mutex);
109439 isight_stop_streaming(isight);
109440 @@ -430,10 +430,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
109441
109442 switch (cmd) {
109443 case SNDRV_PCM_TRIGGER_START:
109444 - ACCESS_ONCE(isight->pcm_running) = true;
109445 + ACCESS_ONCE_RW(isight->pcm_running) = true;
109446 break;
109447 case SNDRV_PCM_TRIGGER_STOP:
109448 - ACCESS_ONCE(isight->pcm_running) = false;
109449 + ACCESS_ONCE_RW(isight->pcm_running) = false;
109450 break;
109451 default:
109452 return -EINVAL;
109453 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
109454 index 2dba848..c682aef 100644
109455 --- a/sound/firewire/scs1x.c
109456 +++ b/sound/firewire/scs1x.c
109457 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
109458 {
109459 struct scs *scs = stream->rmidi->private_data;
109460
109461 - ACCESS_ONCE(scs->output) = up ? stream : NULL;
109462 + ACCESS_ONCE_RW(scs->output) = up ? stream : NULL;
109463 if (up) {
109464 scs->output_idle = false;
109465 tasklet_schedule(&scs->tasklet);
109466 @@ -257,7 +257,7 @@ static void scs_input_trigger(struct snd_rawmidi_substream *stream, int up)
109467 {
109468 struct scs *scs = stream->rmidi->private_data;
109469
109470 - ACCESS_ONCE(scs->input) = up ? stream : NULL;
109471 + ACCESS_ONCE_RW(scs->input) = up ? stream : NULL;
109472 }
109473
109474 static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
109475 @@ -473,8 +473,8 @@ static void scs_remove(struct fw_unit *unit)
109476
109477 snd_card_disconnect(scs->card);
109478
109479 - ACCESS_ONCE(scs->output) = NULL;
109480 - ACCESS_ONCE(scs->input) = NULL;
109481 + ACCESS_ONCE_RW(scs->output) = NULL;
109482 + ACCESS_ONCE_RW(scs->input) = NULL;
109483
109484 wait_event(scs->idle_wait, scs->output_idle);
109485
109486 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
109487 index 4e3fcfb..ab45a9d 100644
109488 --- a/sound/isa/sb/emu8000_synth.c
109489 +++ b/sound/isa/sb/emu8000_synth.c
109490 @@ -120,8 +120,8 @@ static int __init alsa_emu8000_init(void)
109491 {
109492
109493 static struct snd_seq_dev_ops ops = {
109494 - snd_emu8000_new_device,
109495 - snd_emu8000_delete_device,
109496 + .init_device = snd_emu8000_new_device,
109497 + .free_device = snd_emu8000_delete_device,
109498 };
109499 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
109500 sizeof(struct snd_emu8000*));
109501 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
109502 index 048439a..3be9f6f 100644
109503 --- a/sound/oss/sb_audio.c
109504 +++ b/sound/oss/sb_audio.c
109505 @@ -904,7 +904,7 @@ sb16_copy_from_user(int dev,
109506 buf16 = (signed short *)(localbuf + localoffs);
109507 while (c)
109508 {
109509 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109510 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
109511 if (copy_from_user(lbuf8,
109512 userbuf+useroffs + p,
109513 locallen))
109514 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
109515 index a33e8ce..2262303 100644
109516 --- a/sound/oss/swarm_cs4297a.c
109517 +++ b/sound/oss/swarm_cs4297a.c
109518 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
109519 {
109520 struct cs4297a_state *s;
109521 u32 pwr, id;
109522 - mm_segment_t fs;
109523 int rval;
109524 u64 cfg;
109525 int mdio_val;
109526 @@ -2709,22 +2708,23 @@ static int __init cs4297a_init(void)
109527 if (!rval) {
109528 char *sb1250_duart_present;
109529
109530 +#if 0
109531 + mm_segment_t fs;
109532 fs = get_fs();
109533 set_fs(KERNEL_DS);
109534 -#if 0
109535 val = SOUND_MASK_LINE;
109536 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
109537 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
109538 val = initvol[i].vol;
109539 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
109540 }
109541 + set_fs(fs);
109542 // cs4297a_write_ac97(s, 0x18, 0x0808);
109543 #else
109544 // cs4297a_write_ac97(s, 0x5e, 0x180);
109545 cs4297a_write_ac97(s, 0x02, 0x0808);
109546 cs4297a_write_ac97(s, 0x18, 0x0808);
109547 #endif
109548 - set_fs(fs);
109549
109550 list_add(&s->list, &cs4297a_devs);
109551
109552 diff --git a/sound/pci/emu10k1/emu10k1_synth.c b/sound/pci/emu10k1/emu10k1_synth.c
109553 index 4c41c90..37f3631 100644
109554 --- a/sound/pci/emu10k1/emu10k1_synth.c
109555 +++ b/sound/pci/emu10k1/emu10k1_synth.c
109556 @@ -108,8 +108,8 @@ static int __init alsa_emu10k1_synth_init(void)
109557 {
109558
109559 static struct snd_seq_dev_ops ops = {
109560 - snd_emu10k1_synth_new_device,
109561 - snd_emu10k1_synth_delete_device,
109562 + .init_device = snd_emu10k1_synth_new_device,
109563 + .free_device = snd_emu10k1_synth_delete_device,
109564 };
109565 return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
109566 sizeof(struct snd_emu10k1_synth_arg));
109567 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
109568 index e708368..764dffe 100644
109569 --- a/sound/pci/hda/hda_codec.c
109570 +++ b/sound/pci/hda/hda_codec.c
109571 @@ -968,14 +968,10 @@ find_codec_preset(struct hda_codec *codec)
109572 mutex_unlock(&preset_mutex);
109573
109574 if (mod_requested < HDA_MODREQ_MAX_COUNT) {
109575 - char name[32];
109576 if (!mod_requested)
109577 - snprintf(name, sizeof(name), "snd-hda-codec-id:%08x",
109578 - codec->vendor_id);
109579 + request_module("snd-hda-codec-id:%08x", codec->vendor_id);
109580 else
109581 - snprintf(name, sizeof(name), "snd-hda-codec-id:%04x*",
109582 - (codec->vendor_id >> 16) & 0xffff);
109583 - request_module(name);
109584 + request_module("snd-hda-codec-id:%04x*", (codec->vendor_id >> 16) & 0xffff);
109585 mod_requested++;
109586 goto again;
109587 }
109588 @@ -2802,7 +2798,7 @@ static int get_kctl_0dB_offset(struct hda_codec *codec,
109589 /* FIXME: set_fs() hack for obtaining user-space TLV data */
109590 mm_segment_t fs = get_fs();
109591 set_fs(get_ds());
109592 - if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), _tlv))
109593 + if (!kctl->tlv.c(kctl, 0, sizeof(_tlv), (unsigned int __force_user *)_tlv))
109594 tlv = _tlv;
109595 set_fs(fs);
109596 } else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
109597 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
109598 index 4631a23..001ae57 100644
109599 --- a/sound/pci/ymfpci/ymfpci.h
109600 +++ b/sound/pci/ymfpci/ymfpci.h
109601 @@ -358,7 +358,7 @@ struct snd_ymfpci {
109602 spinlock_t reg_lock;
109603 spinlock_t voice_lock;
109604 wait_queue_head_t interrupt_sleep;
109605 - atomic_t interrupt_sleep_count;
109606 + atomic_unchecked_t interrupt_sleep_count;
109607 struct snd_info_entry *proc_entry;
109608 const struct firmware *dsp_microcode;
109609 const struct firmware *controller_microcode;
109610 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
109611 index 81c916a..516f0bf 100644
109612 --- a/sound/pci/ymfpci/ymfpci_main.c
109613 +++ b/sound/pci/ymfpci/ymfpci_main.c
109614 @@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
109615 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
109616 break;
109617 }
109618 - if (atomic_read(&chip->interrupt_sleep_count)) {
109619 - atomic_set(&chip->interrupt_sleep_count, 0);
109620 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109621 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109622 wake_up(&chip->interrupt_sleep);
109623 }
109624 __end:
109625 @@ -789,7 +789,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
109626 continue;
109627 init_waitqueue_entry(&wait, current);
109628 add_wait_queue(&chip->interrupt_sleep, &wait);
109629 - atomic_inc(&chip->interrupt_sleep_count);
109630 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
109631 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
109632 remove_wait_queue(&chip->interrupt_sleep, &wait);
109633 }
109634 @@ -827,8 +827,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
109635 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
109636 spin_unlock(&chip->reg_lock);
109637
109638 - if (atomic_read(&chip->interrupt_sleep_count)) {
109639 - atomic_set(&chip->interrupt_sleep_count, 0);
109640 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
109641 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109642 wake_up(&chip->interrupt_sleep);
109643 }
109644 }
109645 @@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
109646 spin_lock_init(&chip->reg_lock);
109647 spin_lock_init(&chip->voice_lock);
109648 init_waitqueue_head(&chip->interrupt_sleep);
109649 - atomic_set(&chip->interrupt_sleep_count, 0);
109650 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
109651 chip->card = card;
109652 chip->pci = pci;
109653 chip->irq = -1;
109654 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
109655 index b60ff56..7307f0f 100644
109656 --- a/sound/soc/soc-core.c
109657 +++ b/sound/soc/soc-core.c
109658 @@ -2132,8 +2132,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
109659 if (ret)
109660 return ret;
109661
109662 - ops->warm_reset = snd_soc_ac97_warm_reset;
109663 - ops->reset = snd_soc_ac97_reset;
109664 + pax_open_kernel();
109665 + *(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
109666 + *(void **)&ops->reset = snd_soc_ac97_reset;
109667 + pax_close_kernel();
109668
109669 snd_ac97_rst_cfg = cfg;
109670 return 0;
109671 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
109672 index 7778b8e..3d619fc 100644
109673 --- a/sound/synth/emux/emux_seq.c
109674 +++ b/sound/synth/emux/emux_seq.c
109675 @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf
109676 * MIDI emulation operators
109677 */
109678 static struct snd_midi_op emux_ops = {
109679 - snd_emux_note_on,
109680 - snd_emux_note_off,
109681 - snd_emux_key_press,
109682 - snd_emux_terminate_note,
109683 - snd_emux_control,
109684 - snd_emux_nrpn,
109685 - snd_emux_sysex,
109686 + .note_on = snd_emux_note_on,
109687 + .note_off = snd_emux_note_off,
109688 + .key_press = snd_emux_key_press,
109689 + .note_terminate = snd_emux_terminate_note,
109690 + .control = snd_emux_control,
109691 + .nrpn = snd_emux_nrpn,
109692 + .sysex = snd_emux_sysex,
109693 };
109694
109695
109696 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
109697 new file mode 100644
109698 index 0000000..de92ed9
109699 --- /dev/null
109700 +++ b/tools/gcc/.gitignore
109701 @@ -0,0 +1 @@
109702 +randomize_layout_seed.h
109703 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
109704 new file mode 100644
109705 index 0000000..7b8921f
109706 --- /dev/null
109707 +++ b/tools/gcc/Makefile
109708 @@ -0,0 +1,52 @@
109709 +#CC := gcc
109710 +#PLUGIN_SOURCE_FILES := pax_plugin.c
109711 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
109712 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
109713 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
109714 +
109715 +ifeq ($(PLUGINCC),$(HOSTCC))
109716 +HOSTLIBS := hostlibs
109717 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu99 -ggdb
109718 +export HOST_EXTRACFLAGS
109719 +else
109720 +HOSTLIBS := hostcxxlibs
109721 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(src) -std=gnu++98 -fno-rtti -ggdb -Wno-unused-parameter -Wno-narrowing -Wno-unused-variable
109722 +export HOST_EXTRACXXFLAGS
109723 +endif
109724 +
109725 +export GCCPLUGINS_DIR HOSTLIBS
109726 +
109727 +$(HOSTLIBS)-$(CONFIG_PAX_CONSTIFY_PLUGIN) := constify_plugin.so
109728 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
109729 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
109730 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
109731 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
109732 +$(HOSTLIBS)-y += colorize_plugin.so
109733 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
109734 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STRUCTLEAK) += structleak_plugin.so
109735 +$(HOSTLIBS)-$(CONFIG_GRKERNSEC_RANDSTRUCT) += randomize_layout_plugin.so
109736 +
109737 +subdir-$(CONFIG_PAX_SIZE_OVERFLOW) := size_overflow_plugin
109738 +subdir- += size_overflow_plugin
109739 +
109740 +always := $($(HOSTLIBS)-y)
109741 +
109742 +constify_plugin-objs := constify_plugin.o
109743 +stackleak_plugin-objs := stackleak_plugin.o
109744 +kallocstat_plugin-objs := kallocstat_plugin.o
109745 +kernexec_plugin-objs := kernexec_plugin.o
109746 +checker_plugin-objs := checker_plugin.o
109747 +colorize_plugin-objs := colorize_plugin.o
109748 +latent_entropy_plugin-objs := latent_entropy_plugin.o
109749 +structleak_plugin-objs := structleak_plugin.o
109750 +randomize_layout_plugin-objs := randomize_layout_plugin.o
109751 +
109752 +$(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
109753 +
109754 +quiet_cmd_create_randomize_layout_seed = GENSEED $@
109755 + cmd_create_randomize_layout_seed = \
109756 + $(CONFIG_SHELL) $(srctree)/$(src)/gen-random-seed.sh $@ $(objtree)/include/generated/randomize_layout_hash.h
109757 +$(objtree)/$(obj)/randomize_layout_seed.h: FORCE
109758 + $(call if_changed,create_randomize_layout_seed)
109759 +
109760 +targets += randomize_layout_seed.h randomize_layout_hash.h
109761 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
109762 new file mode 100644
109763 index 0000000..5452feea
109764 --- /dev/null
109765 +++ b/tools/gcc/checker_plugin.c
109766 @@ -0,0 +1,150 @@
109767 +/*
109768 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
109769 + * Licensed under the GPL v2
109770 + *
109771 + * Note: the choice of the license means that the compilation process is
109772 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109773 + * but for the kernel it doesn't matter since it doesn't link against
109774 + * any of the gcc libraries
109775 + *
109776 + * gcc plugin to implement various sparse (source code checker) features
109777 + *
109778 + * TODO:
109779 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
109780 + *
109781 + * BUGS:
109782 + * - none known
109783 + */
109784 +
109785 +#include "gcc-common.h"
109786 +
109787 +extern void c_register_addr_space (const char *str, addr_space_t as);
109788 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
109789 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
109790 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
109791 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
109792 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
109793 +
109794 +int plugin_is_GPL_compatible;
109795 +
109796 +static struct plugin_info checker_plugin_info = {
109797 + .version = "201304082245",
109798 + .help = NULL,
109799 +};
109800 +
109801 +#define ADDR_SPACE_KERNEL 0
109802 +#define ADDR_SPACE_FORCE_KERNEL 1
109803 +#define ADDR_SPACE_USER 2
109804 +#define ADDR_SPACE_FORCE_USER 3
109805 +#define ADDR_SPACE_IOMEM 0
109806 +#define ADDR_SPACE_FORCE_IOMEM 0
109807 +#define ADDR_SPACE_PERCPU 0
109808 +#define ADDR_SPACE_FORCE_PERCPU 0
109809 +#define ADDR_SPACE_RCU 0
109810 +#define ADDR_SPACE_FORCE_RCU 0
109811 +
109812 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
109813 +{
109814 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
109815 +}
109816 +
109817 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
109818 +{
109819 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
109820 +}
109821 +
109822 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
109823 +{
109824 + return default_addr_space_valid_pointer_mode(mode, as);
109825 +}
109826 +
109827 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
109828 +{
109829 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
109830 +}
109831 +
109832 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
109833 +{
109834 + return default_addr_space_legitimize_address(x, oldx, mode, as);
109835 +}
109836 +
109837 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
109838 +{
109839 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
109840 + return true;
109841 +
109842 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
109843 + return true;
109844 +
109845 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
109846 + return true;
109847 +
109848 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
109849 + return true;
109850 +
109851 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
109852 + return true;
109853 +
109854 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
109855 + return true;
109856 +
109857 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
109858 + return true;
109859 +
109860 + return subset == superset;
109861 +}
109862 +
109863 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
109864 +{
109865 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
109866 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
109867 +
109868 + return op;
109869 +}
109870 +
109871 +static void register_checker_address_spaces(void *event_data, void *data)
109872 +{
109873 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
109874 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
109875 + c_register_addr_space("__user", ADDR_SPACE_USER);
109876 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
109877 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
109878 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
109879 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
109880 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
109881 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
109882 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
109883 +
109884 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
109885 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
109886 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
109887 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
109888 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
109889 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
109890 + targetm.addr_space.convert = checker_addr_space_convert;
109891 +}
109892 +
109893 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
109894 +{
109895 + const char * const plugin_name = plugin_info->base_name;
109896 + const int argc = plugin_info->argc;
109897 + const struct plugin_argument * const argv = plugin_info->argv;
109898 + int i;
109899 +
109900 + if (!plugin_default_version_check(version, &gcc_version)) {
109901 + error(G_("incompatible gcc/plugin versions"));
109902 + return 1;
109903 + }
109904 +
109905 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
109906 +
109907 + for (i = 0; i < argc; ++i)
109908 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
109909 +
109910 + if (TARGET_64BIT == 0)
109911 + return 0;
109912 +
109913 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
109914 +
109915 + return 0;
109916 +}
109917 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
109918 new file mode 100644
109919 index 0000000..54461af
109920 --- /dev/null
109921 +++ b/tools/gcc/colorize_plugin.c
109922 @@ -0,0 +1,210 @@
109923 +/*
109924 + * Copyright 2012-2014 by PaX Team <pageexec@freemail.hu>
109925 + * Licensed under the GPL v2
109926 + *
109927 + * Note: the choice of the license means that the compilation process is
109928 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
109929 + * but for the kernel it doesn't matter since it doesn't link against
109930 + * any of the gcc libraries
109931 + *
109932 + * gcc plugin to colorize diagnostic output
109933 + *
109934 + */
109935 +
109936 +#include "gcc-common.h"
109937 +
109938 +int plugin_is_GPL_compatible;
109939 +
109940 +static struct plugin_info colorize_plugin_info = {
109941 + .version = "201404202350",
109942 + .help = "color=[never|always|auto]\tdetermine when to colorize\n",
109943 +};
109944 +
109945 +#define GREEN "\033[32m\033[K"
109946 +#define LIGHTGREEN "\033[1;32m\033[K"
109947 +#define YELLOW "\033[33m\033[K"
109948 +#define LIGHTYELLOW "\033[1;33m\033[K"
109949 +#define RED "\033[31m\033[K"
109950 +#define LIGHTRED "\033[1;31m\033[K"
109951 +#define BLUE "\033[34m\033[K"
109952 +#define LIGHTBLUE "\033[1;34m\033[K"
109953 +#define BRIGHT "\033[1;m\033[K"
109954 +#define NORMAL "\033[m\033[K"
109955 +
109956 +static diagnostic_starter_fn old_starter;
109957 +static diagnostic_finalizer_fn old_finalizer;
109958 +
109959 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109960 +{
109961 + const char *color;
109962 + char *newprefix;
109963 +
109964 + switch (diagnostic->kind) {
109965 + case DK_NOTE:
109966 + color = LIGHTBLUE;
109967 + break;
109968 +
109969 + case DK_PEDWARN:
109970 + case DK_WARNING:
109971 + color = LIGHTYELLOW;
109972 + break;
109973 +
109974 + case DK_ERROR:
109975 + case DK_FATAL:
109976 + case DK_ICE:
109977 + case DK_PERMERROR:
109978 + case DK_SORRY:
109979 + color = LIGHTRED;
109980 + break;
109981 +
109982 + default:
109983 + color = NORMAL;
109984 + }
109985 +
109986 + old_starter(context, diagnostic);
109987 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
109988 + return;
109989 + pp_destroy_prefix(context->printer);
109990 + pp_set_prefix(context->printer, newprefix);
109991 +}
109992 +
109993 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
109994 +{
109995 + old_finalizer(context, diagnostic);
109996 +}
109997 +
109998 +static void colorize_arm(void)
109999 +{
110000 + old_starter = diagnostic_starter(global_dc);
110001 + old_finalizer = diagnostic_finalizer(global_dc);
110002 +
110003 + diagnostic_starter(global_dc) = start_colorize;
110004 + diagnostic_finalizer(global_dc) = finalize_colorize;
110005 +}
110006 +
110007 +static unsigned int execute_colorize_rearm(void)
110008 +{
110009 + if (diagnostic_starter(global_dc) == start_colorize)
110010 + return 0;
110011 +
110012 + colorize_arm();
110013 + return 0;
110014 +}
110015 +
110016 +#if BUILDING_GCC_VERSION >= 4009
110017 +static const struct pass_data colorize_rearm_pass_data = {
110018 +#else
110019 +struct simple_ipa_opt_pass colorize_rearm_pass = {
110020 + .pass = {
110021 +#endif
110022 + .type = SIMPLE_IPA_PASS,
110023 + .name = "colorize_rearm",
110024 +#if BUILDING_GCC_VERSION >= 4008
110025 + .optinfo_flags = OPTGROUP_NONE,
110026 +#endif
110027 +#if BUILDING_GCC_VERSION >= 4009
110028 + .has_gate = false,
110029 + .has_execute = true,
110030 +#else
110031 + .gate = NULL,
110032 + .execute = execute_colorize_rearm,
110033 + .sub = NULL,
110034 + .next = NULL,
110035 + .static_pass_number = 0,
110036 +#endif
110037 + .tv_id = TV_NONE,
110038 + .properties_required = 0,
110039 + .properties_provided = 0,
110040 + .properties_destroyed = 0,
110041 + .todo_flags_start = 0,
110042 + .todo_flags_finish = 0
110043 +#if BUILDING_GCC_VERSION < 4009
110044 + }
110045 +#endif
110046 +};
110047 +
110048 +#if BUILDING_GCC_VERSION >= 4009
110049 +namespace {
110050 +class colorize_rearm_pass : public simple_ipa_opt_pass {
110051 +public:
110052 + colorize_rearm_pass() : simple_ipa_opt_pass(colorize_rearm_pass_data, g) {}
110053 + unsigned int execute() { return execute_colorize_rearm(); }
110054 +};
110055 +}
110056 +
110057 +static opt_pass *make_colorize_rearm_pass(void)
110058 +{
110059 + return new colorize_rearm_pass();
110060 +}
110061 +#else
110062 +static struct opt_pass *make_colorize_rearm_pass(void)
110063 +{
110064 + return &colorize_rearm_pass.pass;
110065 +}
110066 +#endif
110067 +
110068 +static void colorize_start_unit(void *gcc_data, void *user_data)
110069 +{
110070 + colorize_arm();
110071 +}
110072 +
110073 +static bool should_colorize(void)
110074 +{
110075 +#if BUILDING_GCC_VERSION >= 4009
110076 + return false;
110077 +#else
110078 + char const *t = getenv("TERM");
110079 +
110080 + return t && strcmp(t, "dumb") && isatty(STDERR_FILENO);
110081 +#endif
110082 +}
110083 +
110084 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110085 +{
110086 + const char * const plugin_name = plugin_info->base_name;
110087 + const int argc = plugin_info->argc;
110088 + const struct plugin_argument * const argv = plugin_info->argv;
110089 + int i;
110090 + struct register_pass_info colorize_rearm_pass_info;
110091 + bool colorize;
110092 +
110093 + colorize_rearm_pass_info.pass = make_colorize_rearm_pass();
110094 + colorize_rearm_pass_info.reference_pass_name = "*free_lang_data";
110095 + colorize_rearm_pass_info.ref_pass_instance_number = 1;
110096 + colorize_rearm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
110097 +
110098 + if (!plugin_default_version_check(version, &gcc_version)) {
110099 + error(G_("incompatible gcc/plugin versions"));
110100 + return 1;
110101 + }
110102 +
110103 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
110104 +
110105 + colorize = getenv("GCC_COLORS") ? should_colorize() : false;
110106 +
110107 + for (i = 0; i < argc; ++i) {
110108 + if (!strcmp(argv[i].key, "color")) {
110109 + if (!argv[i].value) {
110110 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110111 + continue;
110112 + }
110113 + if (!strcmp(argv[i].value, "always"))
110114 + colorize = true;
110115 + else if (!strcmp(argv[i].value, "never"))
110116 + colorize = false;
110117 + else if (!strcmp(argv[i].value, "auto"))
110118 + colorize = should_colorize();
110119 + else
110120 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
110121 + continue;
110122 + }
110123 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110124 + }
110125 +
110126 + if (colorize) {
110127 + // TODO: parse GCC_COLORS as used by gcc 4.9+
110128 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
110129 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
110130 + }
110131 + return 0;
110132 +}
110133 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
110134 new file mode 100644
110135 index 0000000..82bc5a8
110136 --- /dev/null
110137 +++ b/tools/gcc/constify_plugin.c
110138 @@ -0,0 +1,557 @@
110139 +/*
110140 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
110141 + * Copyright 2011-2014 by PaX Team <pageexec@freemail.hu>
110142 + * Licensed under the GPL v2, or (at your option) v3
110143 + *
110144 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
110145 + *
110146 + * Homepage:
110147 + * http://www.grsecurity.net/~ephox/const_plugin/
110148 + *
110149 + * Usage:
110150 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
110151 + * $ gcc -fplugin=constify_plugin.so test.c -O2
110152 + */
110153 +
110154 +#include "gcc-common.h"
110155 +
110156 +// unused C type flag in all versions 4.5-4.9
110157 +#define TYPE_CONSTIFY_VISITED(TYPE) TYPE_LANG_FLAG_4(TYPE)
110158 +
110159 +int plugin_is_GPL_compatible;
110160 +
110161 +static struct plugin_info const_plugin_info = {
110162 + .version = "201401270210",
110163 + .help = "no-constify\tturn off constification\n",
110164 +};
110165 +
110166 +typedef struct {
110167 + bool has_fptr_field;
110168 + bool has_writable_field;
110169 + bool has_do_const_field;
110170 + bool has_no_const_field;
110171 +} constify_info;
110172 +
110173 +static const_tree get_field_type(const_tree field)
110174 +{
110175 + return strip_array_types(TREE_TYPE(field));
110176 +}
110177 +
110178 +static bool is_fptr(const_tree field)
110179 +{
110180 + const_tree ptr = get_field_type(field);
110181 +
110182 + if (TREE_CODE(ptr) != POINTER_TYPE)
110183 + return false;
110184 +
110185 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
110186 +}
110187 +
110188 +/*
110189 + * determine whether the given structure type meets the requirements for automatic constification,
110190 + * including the constification attributes on nested structure types
110191 + */
110192 +static void constifiable(const_tree node, constify_info *cinfo)
110193 +{
110194 + const_tree field;
110195 +
110196 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
110197 +
110198 + // e.g., pointer to structure fields while still constructing the structure type
110199 + if (TYPE_FIELDS(node) == NULL_TREE)
110200 + return;
110201 +
110202 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
110203 + const_tree type = get_field_type(field);
110204 + enum tree_code code = TREE_CODE(type);
110205 +
110206 + if (node == type)
110207 + continue;
110208 +
110209 + if (is_fptr(field))
110210 + cinfo->has_fptr_field = true;
110211 + else if (!TREE_READONLY(field))
110212 + cinfo->has_writable_field = true;
110213 +
110214 + if (code == RECORD_TYPE || code == UNION_TYPE) {
110215 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
110216 + cinfo->has_do_const_field = true;
110217 + else if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
110218 + cinfo->has_no_const_field = true;
110219 + else
110220 + constifiable(type, cinfo);
110221 + }
110222 + }
110223 +}
110224 +
110225 +static bool constified(const_tree node)
110226 +{
110227 + constify_info cinfo = {
110228 + .has_fptr_field = false,
110229 + .has_writable_field = false,
110230 + .has_do_const_field = false,
110231 + .has_no_const_field = false
110232 + };
110233 +
110234 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
110235 +
110236 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
110237 +// gcc_assert(!TYPE_READONLY(node));
110238 + return false;
110239 + }
110240 +
110241 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(node))) {
110242 + gcc_assert(TYPE_READONLY(node));
110243 + return true;
110244 + }
110245 +
110246 + constifiable(node, &cinfo);
110247 + if ((!cinfo.has_fptr_field || cinfo.has_writable_field) && !cinfo.has_do_const_field)
110248 + return false;
110249 +
110250 + return TYPE_READONLY(node);
110251 +}
110252 +
110253 +static void deconstify_tree(tree node);
110254 +
110255 +static void deconstify_type(tree type)
110256 +{
110257 + tree field;
110258 +
110259 + gcc_assert(TREE_CODE(type) == RECORD_TYPE || TREE_CODE(type) == UNION_TYPE);
110260 +
110261 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
110262 + const_tree fieldtype = get_field_type(field);
110263 +
110264 + // special case handling of simple ptr-to-same-array-type members
110265 + if (TREE_CODE(TREE_TYPE(field)) == POINTER_TYPE) {
110266 + tree ptrtype = TREE_TYPE(TREE_TYPE(field));
110267 +
110268 + if (TREE_TYPE(TREE_TYPE(field)) == type)
110269 + continue;
110270 + if (TREE_CODE(ptrtype) != RECORD_TYPE && TREE_CODE(ptrtype) != UNION_TYPE)
110271 + continue;
110272 + if (!constified(ptrtype))
110273 + continue;
110274 + if (TYPE_MAIN_VARIANT(ptrtype) == TYPE_MAIN_VARIANT(type)) {
110275 + TREE_TYPE(field) = copy_node(TREE_TYPE(field));
110276 + TREE_TYPE(TREE_TYPE(field)) = build_qualified_type(type, TYPE_QUALS(ptrtype) & ~TYPE_QUAL_CONST);
110277 + }
110278 + continue;
110279 + }
110280 + if (TREE_CODE(fieldtype) != RECORD_TYPE && TREE_CODE(fieldtype) != UNION_TYPE)
110281 + continue;
110282 + if (!constified(fieldtype))
110283 + continue;
110284 +
110285 + deconstify_tree(field);
110286 + TREE_READONLY(field) = 0;
110287 + }
110288 + TYPE_READONLY(type) = 0;
110289 + C_TYPE_FIELDS_READONLY(type) = 0;
110290 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110291 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110292 + TYPE_ATTRIBUTES(type) = remove_attribute("do_const", TYPE_ATTRIBUTES(type));
110293 + }
110294 +}
110295 +
110296 +static void deconstify_tree(tree node)
110297 +{
110298 + tree old_type, new_type, field;
110299 +
110300 + old_type = TREE_TYPE(node);
110301 + while (TREE_CODE(old_type) == ARRAY_TYPE && TREE_CODE(TREE_TYPE(old_type)) != ARRAY_TYPE) {
110302 + node = TREE_TYPE(node) = copy_node(old_type);
110303 + old_type = TREE_TYPE(old_type);
110304 + }
110305 +
110306 + gcc_assert(TREE_CODE(old_type) == RECORD_TYPE || TREE_CODE(old_type) == UNION_TYPE);
110307 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
110308 +
110309 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
110310 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
110311 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
110312 + DECL_FIELD_CONTEXT(field) = new_type;
110313 +
110314 + deconstify_type(new_type);
110315 +
110316 + TREE_TYPE(node) = new_type;
110317 +}
110318 +
110319 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110320 +{
110321 + tree type;
110322 + constify_info cinfo = {
110323 + .has_fptr_field = false,
110324 + .has_writable_field = false,
110325 + .has_do_const_field = false,
110326 + .has_no_const_field = false
110327 + };
110328 +
110329 + *no_add_attrs = true;
110330 + if (TREE_CODE(*node) == FUNCTION_DECL) {
110331 + error("%qE attribute does not apply to functions (%qF)", name, *node);
110332 + return NULL_TREE;
110333 + }
110334 +
110335 + if (TREE_CODE(*node) == PARM_DECL) {
110336 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
110337 + return NULL_TREE;
110338 + }
110339 +
110340 + if (TREE_CODE(*node) == VAR_DECL) {
110341 + error("%qE attribute does not apply to variables (%qD)", name, *node);
110342 + return NULL_TREE;
110343 + }
110344 +
110345 + if (TYPE_P(*node)) {
110346 + type = *node;
110347 + } else {
110348 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
110349 + type = TREE_TYPE(*node);
110350 + }
110351 +
110352 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
110353 + error("%qE attribute used on %qT applies to struct and union types only", name, type);
110354 + return NULL_TREE;
110355 + }
110356 +
110357 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
110358 + error("%qE attribute is already applied to the type %qT", name, type);
110359 + return NULL_TREE;
110360 + }
110361 +
110362 + if (TYPE_P(*node)) {
110363 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
110364 + error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
110365 + else
110366 + *no_add_attrs = false;
110367 + return NULL_TREE;
110368 + }
110369 +
110370 + constifiable(type, &cinfo);
110371 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110372 + deconstify_tree(*node);
110373 + TYPE_CONSTIFY_VISITED(TREE_TYPE(*node)) = 1;
110374 + return NULL_TREE;
110375 + }
110376 +
110377 + error("%qE attribute used on type %qT that is not constified", name, type);
110378 + return NULL_TREE;
110379 +}
110380 +
110381 +static void constify_type(tree type)
110382 +{
110383 + TYPE_READONLY(type) = 1;
110384 + C_TYPE_FIELDS_READONLY(type) = 1;
110385 + TYPE_CONSTIFY_VISITED(type) = 1;
110386 +// TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
110387 +// TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("do_const"), NULL_TREE, TYPE_ATTRIBUTES(type));
110388 +}
110389 +
110390 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
110391 +{
110392 + *no_add_attrs = true;
110393 + if (!TYPE_P(*node)) {
110394 + error("%qE attribute applies to types only (%qD)", name, *node);
110395 + return NULL_TREE;
110396 + }
110397 +
110398 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
110399 + error("%qE attribute used on %qT applies to struct and union types only", name, *node);
110400 + return NULL_TREE;
110401 + }
110402 +
110403 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
110404 + error("%qE attribute used on %qT is already applied to the type", name, *node);
110405 + return NULL_TREE;
110406 + }
110407 +
110408 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
110409 + error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
110410 + return NULL_TREE;
110411 + }
110412 +
110413 + *no_add_attrs = false;
110414 + return NULL_TREE;
110415 +}
110416 +
110417 +static struct attribute_spec no_const_attr = {
110418 + .name = "no_const",
110419 + .min_length = 0,
110420 + .max_length = 0,
110421 + .decl_required = false,
110422 + .type_required = false,
110423 + .function_type_required = false,
110424 + .handler = handle_no_const_attribute,
110425 +#if BUILDING_GCC_VERSION >= 4007
110426 + .affects_type_identity = true
110427 +#endif
110428 +};
110429 +
110430 +static struct attribute_spec do_const_attr = {
110431 + .name = "do_const",
110432 + .min_length = 0,
110433 + .max_length = 0,
110434 + .decl_required = false,
110435 + .type_required = false,
110436 + .function_type_required = false,
110437 + .handler = handle_do_const_attribute,
110438 +#if BUILDING_GCC_VERSION >= 4007
110439 + .affects_type_identity = true
110440 +#endif
110441 +};
110442 +
110443 +static void register_attributes(void *event_data, void *data)
110444 +{
110445 + register_attribute(&no_const_attr);
110446 + register_attribute(&do_const_attr);
110447 +}
110448 +
110449 +static void finish_type(void *event_data, void *data)
110450 +{
110451 + tree type = (tree)event_data;
110452 + constify_info cinfo = {
110453 + .has_fptr_field = false,
110454 + .has_writable_field = false,
110455 + .has_do_const_field = false,
110456 + .has_no_const_field = false
110457 + };
110458 +
110459 + if (type == NULL_TREE || type == error_mark_node)
110460 + return;
110461 +
110462 + if (TYPE_FIELDS(type) == NULL_TREE || TYPE_CONSTIFY_VISITED(type))
110463 + return;
110464 +
110465 + constifiable(type, &cinfo);
110466 +
110467 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
110468 + if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
110469 + deconstify_type(type);
110470 + TYPE_CONSTIFY_VISITED(type) = 1;
110471 + } else
110472 + error("'no_const' attribute used on type %qT that is not constified", type);
110473 + return;
110474 + }
110475 +
110476 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110477 + if (!cinfo.has_writable_field) {
110478 + error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
110479 + return;
110480 + }
110481 + constify_type(type);
110482 + return;
110483 + }
110484 +
110485 + if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
110486 + if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
110487 + error("'do_const' attribute used on type %qT that is constified", type);
110488 + return;
110489 + }
110490 + constify_type(type);
110491 + return;
110492 + }
110493 +
110494 + deconstify_type(type);
110495 + TYPE_CONSTIFY_VISITED(type) = 1;
110496 +}
110497 +
110498 +static void check_global_variables(void *event_data, void *data)
110499 +{
110500 +#if BUILDING_GCC_VERSION >= 4009
110501 + varpool_node *node;
110502 +#else
110503 + struct varpool_node *node;
110504 +#endif
110505 +
110506 + FOR_EACH_VARIABLE(node) {
110507 + tree var = NODE_DECL(node);
110508 + tree type = TREE_TYPE(var);
110509 +
110510 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110511 + continue;
110512 +
110513 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110514 + continue;
110515 +
110516 + if (!TYPE_CONSTIFY_VISITED(type))
110517 + continue;
110518 +
110519 + if (DECL_EXTERNAL(var))
110520 + continue;
110521 +
110522 + if (DECL_INITIAL(var))
110523 + continue;
110524 +
110525 + // this works around a gcc bug/feature where uninitialized globals
110526 + // are moved into the .bss section regardless of any constification
110527 + DECL_INITIAL(var) = build_constructor(type, NULL);
110528 +// inform(DECL_SOURCE_LOCATION(var), "constified variable %qE moved into .rodata", var);
110529 + }
110530 +}
110531 +
110532 +static unsigned int check_local_variables(void)
110533 +{
110534 + unsigned int ret = 0;
110535 + tree var;
110536 +
110537 + unsigned int i;
110538 +
110539 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
110540 + tree type = TREE_TYPE(var);
110541 +
110542 + gcc_assert(DECL_P(var));
110543 + if (is_global_var(var))
110544 + continue;
110545 +
110546 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
110547 + continue;
110548 +
110549 + if (!TYPE_READONLY(type) || !C_TYPE_FIELDS_READONLY(type))
110550 + continue;
110551 +
110552 + if (!TYPE_CONSTIFY_VISITED(type))
110553 + continue;
110554 +
110555 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
110556 + ret = 1;
110557 + }
110558 + return ret;
110559 +}
110560 +
110561 +#if BUILDING_GCC_VERSION >= 4009
110562 +static const struct pass_data check_local_variables_pass_data = {
110563 +#else
110564 +static struct gimple_opt_pass check_local_variables_pass = {
110565 + .pass = {
110566 +#endif
110567 + .type = GIMPLE_PASS,
110568 + .name = "check_local_variables",
110569 +#if BUILDING_GCC_VERSION >= 4008
110570 + .optinfo_flags = OPTGROUP_NONE,
110571 +#endif
110572 +#if BUILDING_GCC_VERSION >= 4009
110573 + .has_gate = false,
110574 + .has_execute = true,
110575 +#else
110576 + .gate = NULL,
110577 + .execute = check_local_variables,
110578 + .sub = NULL,
110579 + .next = NULL,
110580 + .static_pass_number = 0,
110581 +#endif
110582 + .tv_id = TV_NONE,
110583 + .properties_required = 0,
110584 + .properties_provided = 0,
110585 + .properties_destroyed = 0,
110586 + .todo_flags_start = 0,
110587 + .todo_flags_finish = 0
110588 +#if BUILDING_GCC_VERSION < 4009
110589 + }
110590 +#endif
110591 +};
110592 +
110593 +#if BUILDING_GCC_VERSION >= 4009
110594 +namespace {
110595 +class check_local_variables_pass : public gimple_opt_pass {
110596 +public:
110597 + check_local_variables_pass() : gimple_opt_pass(check_local_variables_pass_data, g) {}
110598 + unsigned int execute() { return check_local_variables(); }
110599 +};
110600 +}
110601 +
110602 +static opt_pass *make_check_local_variables_pass(void)
110603 +{
110604 + return new check_local_variables_pass();
110605 +}
110606 +#else
110607 +static struct opt_pass *make_check_local_variables_pass(void)
110608 +{
110609 + return &check_local_variables_pass.pass;
110610 +}
110611 +#endif
110612 +
110613 +static struct {
110614 + const char *name;
110615 + const char *asm_op;
110616 +} sections[] = {
110617 + {".init.rodata", "\t.section\t.init.rodata,\"a\""},
110618 + {".ref.rodata", "\t.section\t.ref.rodata,\"a\""},
110619 + {".devinit.rodata", "\t.section\t.devinit.rodata,\"a\""},
110620 + {".devexit.rodata", "\t.section\t.devexit.rodata,\"a\""},
110621 + {".cpuinit.rodata", "\t.section\t.cpuinit.rodata,\"a\""},
110622 + {".cpuexit.rodata", "\t.section\t.cpuexit.rodata,\"a\""},
110623 + {".meminit.rodata", "\t.section\t.meminit.rodata,\"a\""},
110624 + {".memexit.rodata", "\t.section\t.memexit.rodata,\"a\""},
110625 + {".data..read_only", "\t.section\t.data..read_only,\"a\""},
110626 +};
110627 +
110628 +static unsigned int (*old_section_type_flags)(tree decl, const char *name, int reloc);
110629 +
110630 +static unsigned int constify_section_type_flags(tree decl, const char *name, int reloc)
110631 +{
110632 + size_t i;
110633 +
110634 + for (i = 0; i < ARRAY_SIZE(sections); i++)
110635 + if (!strcmp(sections[i].name, name))
110636 + return 0;
110637 + return old_section_type_flags(decl, name, reloc);
110638 +}
110639 +
110640 +static void constify_start_unit(void *gcc_data, void *user_data)
110641 +{
110642 +// size_t i;
110643 +
110644 +// for (i = 0; i < ARRAY_SIZE(sections); i++)
110645 +// sections[i].section = get_unnamed_section(0, output_section_asm_op, sections[i].asm_op);
110646 +// sections[i].section = get_section(sections[i].name, 0, NULL);
110647 +
110648 + old_section_type_flags = targetm.section_type_flags;
110649 + targetm.section_type_flags = constify_section_type_flags;
110650 +}
110651 +
110652 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
110653 +{
110654 + const char * const plugin_name = plugin_info->base_name;
110655 + const int argc = plugin_info->argc;
110656 + const struct plugin_argument * const argv = plugin_info->argv;
110657 + int i;
110658 + bool constify = true;
110659 +
110660 + struct register_pass_info check_local_variables_pass_info;
110661 +
110662 + check_local_variables_pass_info.pass = make_check_local_variables_pass();
110663 + check_local_variables_pass_info.reference_pass_name = "ssa";
110664 + check_local_variables_pass_info.ref_pass_instance_number = 1;
110665 + check_local_variables_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
110666 +
110667 + if (!plugin_default_version_check(version, &gcc_version)) {
110668 + error(G_("incompatible gcc/plugin versions"));
110669 + return 1;
110670 + }
110671 +
110672 + for (i = 0; i < argc; ++i) {
110673 + if (!(strcmp(argv[i].key, "no-constify"))) {
110674 + constify = false;
110675 + continue;
110676 + }
110677 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
110678 + }
110679 +
110680 + if (strcmp(lang_hooks.name, "GNU C")) {
110681 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
110682 + constify = false;
110683 + }
110684 +
110685 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
110686 + if (constify) {
110687 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
110688 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
110689 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &check_local_variables_pass_info);
110690 + register_callback(plugin_name, PLUGIN_START_UNIT, constify_start_unit, NULL);
110691 + }
110692 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
110693 +
110694 + return 0;
110695 +}
110696 diff --git a/tools/gcc/gcc-common.h b/tools/gcc/gcc-common.h
110697 new file mode 100644
110698 index 0000000..e90c205
110699 --- /dev/null
110700 +++ b/tools/gcc/gcc-common.h
110701 @@ -0,0 +1,295 @@
110702 +#ifndef GCC_COMMON_H_INCLUDED
110703 +#define GCC_COMMON_H_INCLUDED
110704 +
110705 +#include "plugin.h"
110706 +#include "bversion.h"
110707 +#include "plugin-version.h"
110708 +#include "config.h"
110709 +#include "system.h"
110710 +#include "coretypes.h"
110711 +#include "tm.h"
110712 +#include "line-map.h"
110713 +#include "input.h"
110714 +#include "tree.h"
110715 +
110716 +#include "tree-inline.h"
110717 +#include "version.h"
110718 +#include "rtl.h"
110719 +#include "tm_p.h"
110720 +#include "flags.h"
110721 +//#include "insn-attr.h"
110722 +//#include "insn-config.h"
110723 +//#include "insn-flags.h"
110724 +#include "hard-reg-set.h"
110725 +//#include "recog.h"
110726 +#include "output.h"
110727 +#include "except.h"
110728 +#include "function.h"
110729 +#include "toplev.h"
110730 +//#include "expr.h"
110731 +#include "basic-block.h"
110732 +#include "intl.h"
110733 +#include "ggc.h"
110734 +//#include "regs.h"
110735 +#include "timevar.h"
110736 +
110737 +#include "params.h"
110738 +#include "pointer-set.h"
110739 +#include "emit-rtl.h"
110740 +//#include "reload.h"
110741 +//#include "ira.h"
110742 +//#include "dwarf2asm.h"
110743 +#include "debug.h"
110744 +#include "target.h"
110745 +#include "langhooks.h"
110746 +#include "cfgloop.h"
110747 +//#include "hosthooks.h"
110748 +#include "cgraph.h"
110749 +#include "opts.h"
110750 +//#include "coverage.h"
110751 +//#include "value-prof.h"
110752 +
110753 +#if BUILDING_GCC_VERSION >= 4007
110754 +#include "tree-pretty-print.h"
110755 +#include "gimple-pretty-print.h"
110756 +#include "c-tree.h"
110757 +//#include "alloc-pool.h"
110758 +#endif
110759 +
110760 +#if BUILDING_GCC_VERSION <= 4008
110761 +#include "tree-flow.h"
110762 +#else
110763 +#include "tree-cfgcleanup.h"
110764 +#endif
110765 +
110766 +#include "diagnostic.h"
110767 +//#include "tree-diagnostic.h"
110768 +#include "tree-dump.h"
110769 +#include "tree-pass.h"
110770 +//#include "df.h"
110771 +#include "predict.h"
110772 +#include "ipa-utils.h"
110773 +
110774 +#if BUILDING_GCC_VERSION >= 4009
110775 +#include "varasm.h"
110776 +#include "stor-layout.h"
110777 +#include "internal-fn.h"
110778 +#include "gimple-expr.h"
110779 +//#include "diagnostic-color.h"
110780 +#include "context.h"
110781 +#include "tree-ssa-alias.h"
110782 +#include "stringpool.h"
110783 +#include "tree-ssanames.h"
110784 +#include "print-tree.h"
110785 +#include "tree-eh.h"
110786 +#include "stmt.h"
110787 +#endif
110788 +
110789 +#include "gimple.h"
110790 +
110791 +#if BUILDING_GCC_VERSION >= 4009
110792 +#include "tree-ssa-operands.h"
110793 +#include "tree-phinodes.h"
110794 +#include "tree-cfg.h"
110795 +#include "gimple-iterator.h"
110796 +#include "gimple-ssa.h"
110797 +#include "ssa-iterators.h"
110798 +#endif
110799 +
110800 +//#include "lto/lto.h"
110801 +//#include "data-streamer.h"
110802 +//#include "lto-compress.h"
110803 +
110804 +//#include "expr.h" where are you...
110805 +extern rtx emit_move_insn(rtx x, rtx y);
110806 +
110807 +// missing from basic_block.h...
110808 +extern void debug_dominance_info(enum cdi_direction dir);
110809 +extern void debug_dominance_tree(enum cdi_direction dir, basic_block root);
110810 +
110811 +#define __unused __attribute__((__unused__))
110812 +
110813 +#define DECL_NAME_POINTER(node) IDENTIFIER_POINTER(DECL_NAME(node))
110814 +#define DECL_NAME_LENGTH(node) IDENTIFIER_LENGTH(DECL_NAME(node))
110815 +#define TYPE_NAME_POINTER(node) IDENTIFIER_POINTER(TYPE_NAME(node))
110816 +#define TYPE_NAME_LENGTH(node) IDENTIFIER_LENGTH(TYPE_NAME(node))
110817 +
110818 +#if BUILDING_GCC_VERSION == 4005
110819 +#define FOR_EACH_LOCAL_DECL(FUN, I, D) for (tree vars = (FUN)->local_decls; vars && (D = TREE_VALUE(vars)); vars = TREE_CHAIN(vars), I)
110820 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
110821 +#define FOR_EACH_VEC_ELT(T, V, I, P) for (I = 0; VEC_iterate(T, (V), (I), (P)); ++(I))
110822 +#define TODO_rebuild_cgraph_edges 0
110823 +
110824 +static inline bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
110825 +{
110826 + tree fndecl;
110827 +
110828 + if (!is_gimple_call(stmt))
110829 + return false;
110830 + fndecl = gimple_call_fndecl(stmt);
110831 + if (!fndecl || DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
110832 + return false;
110833 +// print_node(stderr, "pax", fndecl, 4);
110834 + return DECL_FUNCTION_CODE(fndecl) == code;
110835 +}
110836 +
110837 +static inline bool is_simple_builtin(tree decl)
110838 +{
110839 + if (decl && DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
110840 + return false;
110841 +
110842 + switch (DECL_FUNCTION_CODE(decl)) {
110843 + /* Builtins that expand to constants. */
110844 + case BUILT_IN_CONSTANT_P:
110845 + case BUILT_IN_EXPECT:
110846 + case BUILT_IN_OBJECT_SIZE:
110847 + case BUILT_IN_UNREACHABLE:
110848 + /* Simple register moves or loads from stack. */
110849 + case BUILT_IN_RETURN_ADDRESS:
110850 + case BUILT_IN_EXTRACT_RETURN_ADDR:
110851 + case BUILT_IN_FROB_RETURN_ADDR:
110852 + case BUILT_IN_RETURN:
110853 + case BUILT_IN_AGGREGATE_INCOMING_ADDRESS:
110854 + case BUILT_IN_FRAME_ADDRESS:
110855 + case BUILT_IN_VA_END:
110856 + case BUILT_IN_STACK_SAVE:
110857 + case BUILT_IN_STACK_RESTORE:
110858 + /* Exception state returns or moves registers around. */
110859 + case BUILT_IN_EH_FILTER:
110860 + case BUILT_IN_EH_POINTER:
110861 + case BUILT_IN_EH_COPY_VALUES:
110862 + return true;
110863 +
110864 + default:
110865 + return false;
110866 + }
110867 +}
110868 +#endif
110869 +
110870 +#if BUILDING_GCC_VERSION <= 4006
110871 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
110872 +#define C_DECL_REGISTER(EXP) DECL_LANG_FLAG_4(EXP)
110873 +
110874 +// should come from c-tree.h if only it were installed for gcc 4.5...
110875 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
110876 +
110877 +#define get_random_seed(noinit) ({ \
110878 + unsigned HOST_WIDE_INT seed; \
110879 + sscanf(get_random_seed(noinit), "%" HOST_WIDE_INT_PRINT "x", &seed); \
110880 + seed * seed; })
110881 +
110882 +static inline bool gimple_clobber_p(gimple s)
110883 +{
110884 + return false;
110885 +}
110886 +
110887 +static inline tree builtin_decl_implicit(enum built_in_function fncode)
110888 +{
110889 + return implicit_built_in_decls[fncode];
110890 +}
110891 +
110892 +static inline struct cgraph_node *cgraph_get_create_node(tree decl)
110893 +{
110894 + struct cgraph_node *node = cgraph_get_node(decl);
110895 +
110896 + return node ? node : cgraph_node(decl);
110897 +}
110898 +
110899 +static inline bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
110900 +{
110901 + return node->analyzed && !node->thunk.thunk_p && !node->alias;
110902 +}
110903 +
110904 +static inline struct cgraph_node *cgraph_first_function_with_gimple_body(void)
110905 +{
110906 + struct cgraph_node *node;
110907 +
110908 + for (node = cgraph_nodes; node; node = node->next)
110909 + if (cgraph_function_with_gimple_body_p(node))
110910 + return node;
110911 + return NULL;
110912 +}
110913 +
110914 +static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
110915 +{
110916 + for (node = node->next; node; node = node->next)
110917 + if (cgraph_function_with_gimple_body_p(node))
110918 + return node;
110919 + return NULL;
110920 +}
110921 +
110922 +#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
110923 + for ((node) = cgraph_first_function_with_gimple_body(); (node); \
110924 + (node) = cgraph_next_function_with_gimple_body(node))
110925 +#endif
110926 +
110927 +#if BUILDING_GCC_VERSION == 4006
110928 +extern void debug_gimple_stmt(gimple);
110929 +extern void debug_gimple_seq(gimple_seq);
110930 +extern void print_gimple_seq(FILE *, gimple_seq, int, int);
110931 +extern void print_gimple_stmt(FILE *, gimple, int, int);
110932 +extern void print_gimple_expr(FILE *, gimple, int, int);
110933 +extern void dump_gimple_stmt(pretty_printer *, gimple, int, int);
110934 +#endif
110935 +
110936 +#if BUILDING_GCC_VERSION <= 4007
110937 +#define FOR_EACH_VARIABLE(node) for (node = varpool_nodes; node; node = node->next)
110938 +#define PROP_loops 0
110939 +
110940 +static inline int bb_loop_depth(const_basic_block bb)
110941 +{
110942 + return bb->loop_father ? loop_depth(bb->loop_father) : 0;
110943 +}
110944 +
110945 +static inline bool gimple_store_p(gimple gs)
110946 +{
110947 + tree lhs = gimple_get_lhs(gs);
110948 + return lhs && !is_gimple_reg(lhs);
110949 +}
110950 +#endif
110951 +
110952 +#if BUILDING_GCC_VERSION >= 4007
110953 +#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
110954 + cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
110955 +#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
110956 + cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
110957 +#endif
110958 +
110959 +#if BUILDING_GCC_VERSION <= 4008
110960 +#define ENTRY_BLOCK_PTR_FOR_FN(FN) ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
110961 +#define EXIT_BLOCK_PTR_FOR_FN(FN) EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
110962 +#define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info)
110963 +#define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks)
110964 +#define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges)
110965 +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block)
110966 +#define label_to_block_map_for_fn(FN) ((FN)->cfg->x_label_to_block_map)
110967 +#define profile_status_for_fn(FN) ((FN)->cfg->x_profile_status)
110968 +
110969 +static inline const char *get_tree_code_name(enum tree_code code)
110970 +{
110971 + gcc_assert(code < MAX_TREE_CODES);
110972 + return tree_code_name[code];
110973 +}
110974 +
110975 +#define ipa_remove_stmt_references(cnode, stmt)
110976 +#endif
110977 +
110978 +#if BUILDING_GCC_VERSION == 4008
110979 +#define NODE_DECL(node) node->symbol.decl
110980 +#else
110981 +#define NODE_DECL(node) node->decl
110982 +#endif
110983 +
110984 +#if BUILDING_GCC_VERSION >= 4008
110985 +#define add_referenced_var(var)
110986 +#define mark_sym_for_renaming(var)
110987 +#define varpool_mark_needed_node(node)
110988 +#define TODO_dump_func 0
110989 +#define TODO_dump_cgraph 0
110990 +#endif
110991 +
110992 +#if BUILDING_GCC_VERSION >= 4009
110993 +#define TODO_ggc_collect 0
110994 +#endif
110995 +
110996 +#endif
110997 diff --git a/tools/gcc/gen-random-seed.sh b/tools/gcc/gen-random-seed.sh
110998 new file mode 100644
110999 index 0000000..7514850
111000 --- /dev/null
111001 +++ b/tools/gcc/gen-random-seed.sh
111002 @@ -0,0 +1,8 @@
111003 +#!/bin/sh
111004 +
111005 +if [ ! -f "$1" ]; then
111006 + SEED=`od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n'`
111007 + echo "const char *randstruct_seed = \"$SEED\";" > "$1"
111008 + HASH=`echo -n "$SEED" | sha256sum | cut -d" " -f1 | tr -d ' \n'`
111009 + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2"
111010 +fi
111011 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
111012 new file mode 100644
111013 index 0000000..d81c094
111014 --- /dev/null
111015 +++ b/tools/gcc/kallocstat_plugin.c
111016 @@ -0,0 +1,183 @@
111017 +/*
111018 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
111019 + * Licensed under the GPL v2
111020 + *
111021 + * Note: the choice of the license means that the compilation process is
111022 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111023 + * but for the kernel it doesn't matter since it doesn't link against
111024 + * any of the gcc libraries
111025 + *
111026 + * gcc plugin to find the distribution of k*alloc sizes
111027 + *
111028 + * TODO:
111029 + *
111030 + * BUGS:
111031 + * - none known
111032 + */
111033 +
111034 +#include "gcc-common.h"
111035 +
111036 +int plugin_is_GPL_compatible;
111037 +
111038 +static struct plugin_info kallocstat_plugin_info = {
111039 + .version = "201401260140",
111040 + .help = NULL
111041 +};
111042 +
111043 +static const char * const kalloc_functions[] = {
111044 + "__kmalloc",
111045 + "kmalloc",
111046 + "kmalloc_large",
111047 + "kmalloc_node",
111048 + "kmalloc_order",
111049 + "kmalloc_order_trace",
111050 + "kmalloc_slab",
111051 + "kzalloc",
111052 + "kzalloc_node",
111053 +};
111054 +
111055 +static bool is_kalloc(const char *fnname)
111056 +{
111057 + size_t i;
111058 +
111059 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
111060 + if (!strcmp(fnname, kalloc_functions[i]))
111061 + return true;
111062 + return false;
111063 +}
111064 +
111065 +static unsigned int execute_kallocstat(void)
111066 +{
111067 + basic_block bb;
111068 +
111069 + // 1. loop through BBs and GIMPLE statements
111070 + FOR_EACH_BB_FN(bb, cfun) {
111071 + gimple_stmt_iterator gsi;
111072 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111073 + // gimple match:
111074 + tree fndecl, size;
111075 + gimple stmt;
111076 + const char *fnname;
111077 +
111078 + // is it a call
111079 + stmt = gsi_stmt(gsi);
111080 + if (!is_gimple_call(stmt))
111081 + continue;
111082 + fndecl = gimple_call_fndecl(stmt);
111083 + if (fndecl == NULL_TREE)
111084 + continue;
111085 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
111086 + continue;
111087 +
111088 + // is it a call to k*alloc
111089 + fnname = DECL_NAME_POINTER(fndecl);
111090 + if (!is_kalloc(fnname))
111091 + continue;
111092 +
111093 + // is the size arg const or the result of a simple const assignment
111094 + size = gimple_call_arg(stmt, 0);
111095 + while (true) {
111096 + expanded_location xloc;
111097 + size_t size_val;
111098 +
111099 + if (TREE_CONSTANT(size)) {
111100 + xloc = expand_location(gimple_location(stmt));
111101 + if (!xloc.file)
111102 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
111103 + size_val = TREE_INT_CST_LOW(size);
111104 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
111105 + break;
111106 + }
111107 +
111108 + if (TREE_CODE(size) != SSA_NAME)
111109 + break;
111110 + stmt = SSA_NAME_DEF_STMT(size);
111111 +//debug_gimple_stmt(stmt);
111112 +//debug_tree(size);
111113 + if (!stmt || !is_gimple_assign(stmt))
111114 + break;
111115 + if (gimple_num_ops(stmt) != 2)
111116 + break;
111117 + size = gimple_assign_rhs1(stmt);
111118 + }
111119 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
111120 +//debug_tree(gimple_call_fn(call_stmt));
111121 +//print_node(stderr, "pax", fndecl, 4);
111122 + }
111123 + }
111124 +
111125 + return 0;
111126 +}
111127 +
111128 +#if BUILDING_GCC_VERSION >= 4009
111129 +static const struct pass_data kallocstat_pass_data = {
111130 +#else
111131 +static struct gimple_opt_pass kallocstat_pass = {
111132 + .pass = {
111133 +#endif
111134 + .type = GIMPLE_PASS,
111135 + .name = "kallocstat",
111136 +#if BUILDING_GCC_VERSION >= 4008
111137 + .optinfo_flags = OPTGROUP_NONE,
111138 +#endif
111139 +#if BUILDING_GCC_VERSION >= 4009
111140 + .has_gate = false,
111141 + .has_execute = true,
111142 +#else
111143 + .gate = NULL,
111144 + .execute = execute_kallocstat,
111145 + .sub = NULL,
111146 + .next = NULL,
111147 + .static_pass_number = 0,
111148 +#endif
111149 + .tv_id = TV_NONE,
111150 + .properties_required = 0,
111151 + .properties_provided = 0,
111152 + .properties_destroyed = 0,
111153 + .todo_flags_start = 0,
111154 + .todo_flags_finish = 0
111155 +#if BUILDING_GCC_VERSION < 4009
111156 + }
111157 +#endif
111158 +};
111159 +
111160 +#if BUILDING_GCC_VERSION >= 4009
111161 +namespace {
111162 +class kallocstat_pass : public gimple_opt_pass {
111163 +public:
111164 + kallocstat_pass() : gimple_opt_pass(kallocstat_pass_data, g) {}
111165 + unsigned int execute() { return execute_kallocstat(); }
111166 +};
111167 +}
111168 +
111169 +static opt_pass *make_kallocstat_pass(void)
111170 +{
111171 + return new kallocstat_pass();
111172 +}
111173 +#else
111174 +static struct opt_pass *make_kallocstat_pass(void)
111175 +{
111176 + return &kallocstat_pass.pass;
111177 +}
111178 +#endif
111179 +
111180 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111181 +{
111182 + const char * const plugin_name = plugin_info->base_name;
111183 + struct register_pass_info kallocstat_pass_info;
111184 +
111185 + kallocstat_pass_info.pass = make_kallocstat_pass();
111186 + kallocstat_pass_info.reference_pass_name = "ssa";
111187 + kallocstat_pass_info.ref_pass_instance_number = 1;
111188 + kallocstat_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111189 +
111190 + if (!plugin_default_version_check(version, &gcc_version)) {
111191 + error(G_("incompatible gcc/plugin versions"));
111192 + return 1;
111193 + }
111194 +
111195 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
111196 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
111197 +
111198 + return 0;
111199 +}
111200 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
111201 new file mode 100644
111202 index 0000000..89f256d
111203 --- /dev/null
111204 +++ b/tools/gcc/kernexec_plugin.c
111205 @@ -0,0 +1,522 @@
111206 +/*
111207 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
111208 + * Licensed under the GPL v2
111209 + *
111210 + * Note: the choice of the license means that the compilation process is
111211 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111212 + * but for the kernel it doesn't matter since it doesn't link against
111213 + * any of the gcc libraries
111214 + *
111215 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
111216 + *
111217 + * TODO:
111218 + *
111219 + * BUGS:
111220 + * - none known
111221 + */
111222 +
111223 +#include "gcc-common.h"
111224 +
111225 +int plugin_is_GPL_compatible;
111226 +
111227 +static struct plugin_info kernexec_plugin_info = {
111228 + .version = "201401260140",
111229 + .help = "method=[bts|or]\tinstrumentation method\n"
111230 +};
111231 +
111232 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
111233 +static void (*kernexec_instrument_retaddr)(rtx);
111234 +
111235 +/*
111236 + * add special KERNEXEC instrumentation: reload %r12 after it has been clobbered
111237 + */
111238 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
111239 +{
111240 + gimple asm_movabs_stmt;
111241 +
111242 + // build asm volatile("movabs $0x8000000000000000, %%r12\n\t" : : : );
111243 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r12\n\t", NULL, NULL, NULL, NULL);
111244 + gimple_asm_set_volatile(asm_movabs_stmt, true);
111245 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
111246 + update_stmt(asm_movabs_stmt);
111247 +}
111248 +
111249 +/*
111250 + * find all asm() stmts that clobber r12 and add a reload of r12
111251 + */
111252 +static unsigned int execute_kernexec_reload(void)
111253 +{
111254 + basic_block bb;
111255 +
111256 + // 1. loop through BBs and GIMPLE statements
111257 + FOR_EACH_BB_FN(bb, cfun) {
111258 + gimple_stmt_iterator gsi;
111259 +
111260 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111261 + // gimple match: __asm__ ("" : : : "r12");
111262 + gimple asm_stmt;
111263 + size_t nclobbers;
111264 +
111265 + // is it an asm ...
111266 + asm_stmt = gsi_stmt(gsi);
111267 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
111268 + continue;
111269 +
111270 + // ... clobbering r12
111271 + nclobbers = gimple_asm_nclobbers(asm_stmt);
111272 + while (nclobbers--) {
111273 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
111274 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r12"))
111275 + continue;
111276 + kernexec_reload_fptr_mask(&gsi);
111277 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
111278 + break;
111279 + }
111280 + }
111281 + }
111282 +
111283 + return 0;
111284 +}
111285 +
111286 +/*
111287 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
111288 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
111289 + */
111290 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
111291 +{
111292 + gimple assign_intptr, assign_new_fptr, call_stmt;
111293 + tree intptr, orptr, old_fptr, new_fptr, kernexec_mask;
111294 +
111295 + call_stmt = gsi_stmt(*gsi);
111296 + old_fptr = gimple_call_fn(call_stmt);
111297 +
111298 + // create temporary unsigned long variable used for bitops and cast fptr to it
111299 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
111300 + add_referenced_var(intptr);
111301 + intptr = make_ssa_name(intptr, NULL);
111302 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
111303 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111304 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111305 + update_stmt(assign_intptr);
111306 +
111307 + // apply logical or to temporary unsigned long and bitmask
111308 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
111309 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
111310 + orptr = fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask);
111311 + intptr = make_ssa_name(SSA_NAME_VAR(intptr), NULL);
111312 + assign_intptr = gimple_build_assign(intptr, orptr);
111313 + SSA_NAME_DEF_STMT(intptr) = assign_intptr;
111314 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
111315 + update_stmt(assign_intptr);
111316 +
111317 + // cast temporary unsigned long back to a temporary fptr variable
111318 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
111319 + add_referenced_var(new_fptr);
111320 + new_fptr = make_ssa_name(new_fptr, NULL);
111321 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
111322 + SSA_NAME_DEF_STMT(new_fptr) = assign_new_fptr;
111323 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
111324 + update_stmt(assign_new_fptr);
111325 +
111326 + // replace call stmt fn with the new fptr
111327 + gimple_call_set_fn(call_stmt, new_fptr);
111328 + update_stmt(call_stmt);
111329 +}
111330 +
111331 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
111332 +{
111333 + gimple asm_or_stmt, call_stmt;
111334 + tree old_fptr, new_fptr, input, output;
111335 +#if BUILDING_GCC_VERSION <= 4007
111336 + VEC(tree, gc) *inputs = NULL;
111337 + VEC(tree, gc) *outputs = NULL;
111338 +#else
111339 + vec<tree, va_gc> *inputs = NULL;
111340 + vec<tree, va_gc> *outputs = NULL;
111341 +#endif
111342 +
111343 + call_stmt = gsi_stmt(*gsi);
111344 + old_fptr = gimple_call_fn(call_stmt);
111345 +
111346 + // create temporary fptr variable
111347 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
111348 + add_referenced_var(new_fptr);
111349 + new_fptr = make_ssa_name(new_fptr, NULL);
111350 +
111351 + // build asm volatile("orq %%r12, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
111352 + input = build_tree_list(NULL_TREE, build_string(1, "0"));
111353 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
111354 + output = build_tree_list(NULL_TREE, build_string(2, "=r"));
111355 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
111356 +#if BUILDING_GCC_VERSION <= 4007
111357 + VEC_safe_push(tree, gc, inputs, input);
111358 + VEC_safe_push(tree, gc, outputs, output);
111359 +#else
111360 + vec_safe_push(inputs, input);
111361 + vec_safe_push(outputs, output);
111362 +#endif
111363 + asm_or_stmt = gimple_build_asm_vec("orq %%r12, %0\n\t", inputs, outputs, NULL, NULL);
111364 + SSA_NAME_DEF_STMT(new_fptr) = asm_or_stmt;
111365 + gimple_asm_set_volatile(asm_or_stmt, true);
111366 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
111367 + update_stmt(asm_or_stmt);
111368 +
111369 + // replace call stmt fn with the new fptr
111370 + gimple_call_set_fn(call_stmt, new_fptr);
111371 + update_stmt(call_stmt);
111372 +}
111373 +
111374 +/*
111375 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
111376 + */
111377 +static unsigned int execute_kernexec_fptr(void)
111378 +{
111379 + basic_block bb;
111380 +
111381 + // 1. loop through BBs and GIMPLE statements
111382 + FOR_EACH_BB_FN(bb, cfun) {
111383 + gimple_stmt_iterator gsi;
111384 +
111385 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
111386 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
111387 + tree fn;
111388 + gimple call_stmt;
111389 +
111390 + // is it a call ...
111391 + call_stmt = gsi_stmt(gsi);
111392 + if (!is_gimple_call(call_stmt))
111393 + continue;
111394 + fn = gimple_call_fn(call_stmt);
111395 + if (TREE_CODE(fn) == ADDR_EXPR)
111396 + continue;
111397 + if (TREE_CODE(fn) != SSA_NAME)
111398 + gcc_unreachable();
111399 +
111400 + // ... through a function pointer
111401 + if (SSA_NAME_VAR(fn) != NULL_TREE) {
111402 + fn = SSA_NAME_VAR(fn);
111403 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL) {
111404 + debug_tree(fn);
111405 + gcc_unreachable();
111406 + }
111407 + }
111408 + fn = TREE_TYPE(fn);
111409 + if (TREE_CODE(fn) != POINTER_TYPE)
111410 + continue;
111411 + fn = TREE_TYPE(fn);
111412 + if (TREE_CODE(fn) != FUNCTION_TYPE)
111413 + continue;
111414 +
111415 + kernexec_instrument_fptr(&gsi);
111416 +
111417 +//debug_tree(gimple_call_fn(call_stmt));
111418 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
111419 + }
111420 + }
111421 +
111422 + return 0;
111423 +}
111424 +
111425 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
111426 +static void kernexec_instrument_retaddr_bts(rtx insn)
111427 +{
111428 + rtx btsq;
111429 + rtvec argvec, constraintvec, labelvec;
111430 + int line;
111431 +
111432 + // create asm volatile("btsq $63,(%%rsp)":::)
111433 + argvec = rtvec_alloc(0);
111434 + constraintvec = rtvec_alloc(0);
111435 + labelvec = rtvec_alloc(0);
111436 + line = expand_location(RTL_LOCATION(insn)).line;
111437 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111438 + MEM_VOLATILE_P(btsq) = 1;
111439 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
111440 + emit_insn_before(btsq, insn);
111441 +}
111442 +
111443 +// add special KERNEXEC instrumentation: orq %r12,(%rsp) just before retn
111444 +static void kernexec_instrument_retaddr_or(rtx insn)
111445 +{
111446 + rtx orq;
111447 + rtvec argvec, constraintvec, labelvec;
111448 + int line;
111449 +
111450 + // create asm volatile("orq %%r12,(%%rsp)":::)
111451 + argvec = rtvec_alloc(0);
111452 + constraintvec = rtvec_alloc(0);
111453 + labelvec = rtvec_alloc(0);
111454 + line = expand_location(RTL_LOCATION(insn)).line;
111455 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r12,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
111456 + MEM_VOLATILE_P(orq) = 1;
111457 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
111458 + emit_insn_before(orq, insn);
111459 +}
111460 +
111461 +/*
111462 + * find all asm level function returns and forcibly set the highest bit of the return address
111463 + */
111464 +static unsigned int execute_kernexec_retaddr(void)
111465 +{
111466 + rtx insn;
111467 +
111468 +// if (stack_realign_drap)
111469 +// inform(DECL_SOURCE_LOCATION(current_function_decl), "drap detected in %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
111470 +
111471 + // 1. find function returns
111472 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
111473 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
111474 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
111475 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
111476 + rtx body;
111477 +
111478 + // is it a retn
111479 + if (!JUMP_P(insn))
111480 + continue;
111481 + body = PATTERN(insn);
111482 + if (GET_CODE(body) == PARALLEL)
111483 + body = XVECEXP(body, 0, 0);
111484 + if (!ANY_RETURN_P(body))
111485 + continue;
111486 + kernexec_instrument_retaddr(insn);
111487 + }
111488 +
111489 +// print_simple_rtl(stderr, get_insns());
111490 +// print_rtl(stderr, get_insns());
111491 +
111492 + return 0;
111493 +}
111494 +
111495 +static bool kernexec_cmodel_check(void)
111496 +{
111497 + tree section;
111498 +
111499 + if (ix86_cmodel != CM_KERNEL)
111500 + return false;
111501 +
111502 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
111503 + if (!section || !TREE_VALUE(section))
111504 + return true;
111505 +
111506 + section = TREE_VALUE(TREE_VALUE(section));
111507 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
111508 + return true;
111509 +
111510 + return false;
111511 +}
111512 +
111513 +#if BUILDING_GCC_VERSION >= 4009
111514 +static const struct pass_data kernexec_reload_pass_data = {
111515 +#else
111516 +static struct gimple_opt_pass kernexec_reload_pass = {
111517 + .pass = {
111518 +#endif
111519 + .type = GIMPLE_PASS,
111520 + .name = "kernexec_reload",
111521 +#if BUILDING_GCC_VERSION >= 4008
111522 + .optinfo_flags = OPTGROUP_NONE,
111523 +#endif
111524 +#if BUILDING_GCC_VERSION >= 4009
111525 + .has_gate = true,
111526 + .has_execute = true,
111527 +#else
111528 + .gate = kernexec_cmodel_check,
111529 + .execute = execute_kernexec_reload,
111530 + .sub = NULL,
111531 + .next = NULL,
111532 + .static_pass_number = 0,
111533 +#endif
111534 + .tv_id = TV_NONE,
111535 + .properties_required = 0,
111536 + .properties_provided = 0,
111537 + .properties_destroyed = 0,
111538 + .todo_flags_start = 0,
111539 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111540 +#if BUILDING_GCC_VERSION < 4009
111541 + }
111542 +#endif
111543 +};
111544 +
111545 +#if BUILDING_GCC_VERSION >= 4009
111546 +static const struct pass_data kernexec_fptr_pass_data = {
111547 +#else
111548 +static struct gimple_opt_pass kernexec_fptr_pass = {
111549 + .pass = {
111550 +#endif
111551 + .type = GIMPLE_PASS,
111552 + .name = "kernexec_fptr",
111553 +#if BUILDING_GCC_VERSION >= 4008
111554 + .optinfo_flags = OPTGROUP_NONE,
111555 +#endif
111556 +#if BUILDING_GCC_VERSION >= 4009
111557 + .has_gate = true,
111558 + .has_execute = true,
111559 +#else
111560 + .gate = kernexec_cmodel_check,
111561 + .execute = execute_kernexec_fptr,
111562 + .sub = NULL,
111563 + .next = NULL,
111564 + .static_pass_number = 0,
111565 +#endif
111566 + .tv_id = TV_NONE,
111567 + .properties_required = 0,
111568 + .properties_provided = 0,
111569 + .properties_destroyed = 0,
111570 + .todo_flags_start = 0,
111571 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
111572 +#if BUILDING_GCC_VERSION < 4009
111573 + }
111574 +#endif
111575 +};
111576 +
111577 +#if BUILDING_GCC_VERSION >= 4009
111578 +static const struct pass_data kernexec_retaddr_pass_data = {
111579 +#else
111580 +static struct rtl_opt_pass kernexec_retaddr_pass = {
111581 + .pass = {
111582 +#endif
111583 + .type = RTL_PASS,
111584 + .name = "kernexec_retaddr",
111585 +#if BUILDING_GCC_VERSION >= 4008
111586 + .optinfo_flags = OPTGROUP_NONE,
111587 +#endif
111588 +#if BUILDING_GCC_VERSION >= 4009
111589 + .has_gate = true,
111590 + .has_execute = true,
111591 +#else
111592 + .gate = kernexec_cmodel_check,
111593 + .execute = execute_kernexec_retaddr,
111594 + .sub = NULL,
111595 + .next = NULL,
111596 + .static_pass_number = 0,
111597 +#endif
111598 + .tv_id = TV_NONE,
111599 + .properties_required = 0,
111600 + .properties_provided = 0,
111601 + .properties_destroyed = 0,
111602 + .todo_flags_start = 0,
111603 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
111604 +#if BUILDING_GCC_VERSION < 4009
111605 + }
111606 +#endif
111607 +};
111608 +
111609 +#if BUILDING_GCC_VERSION >= 4009
111610 +namespace {
111611 +class kernexec_reload_pass : public gimple_opt_pass {
111612 +public:
111613 + kernexec_reload_pass() : gimple_opt_pass(kernexec_reload_pass_data, g) {}
111614 + bool gate() { return kernexec_cmodel_check(); }
111615 + unsigned int execute() { return execute_kernexec_reload(); }
111616 +};
111617 +
111618 +class kernexec_fptr_pass : public gimple_opt_pass {
111619 +public:
111620 + kernexec_fptr_pass() : gimple_opt_pass(kernexec_fptr_pass_data, g) {}
111621 + bool gate() { return kernexec_cmodel_check(); }
111622 + unsigned int execute() { return execute_kernexec_fptr(); }
111623 +};
111624 +
111625 +class kernexec_retaddr_pass : public rtl_opt_pass {
111626 +public:
111627 + kernexec_retaddr_pass() : rtl_opt_pass(kernexec_retaddr_pass_data, g) {}
111628 + bool gate() { return kernexec_cmodel_check(); }
111629 + unsigned int execute() { return execute_kernexec_retaddr(); }
111630 +};
111631 +}
111632 +
111633 +static opt_pass *make_kernexec_reload_pass(void)
111634 +{
111635 + return new kernexec_reload_pass();
111636 +}
111637 +
111638 +static opt_pass *make_kernexec_fptr_pass(void)
111639 +{
111640 + return new kernexec_fptr_pass();
111641 +}
111642 +
111643 +static opt_pass *make_kernexec_retaddr_pass(void)
111644 +{
111645 + return new kernexec_retaddr_pass();
111646 +}
111647 +#else
111648 +static struct opt_pass *make_kernexec_reload_pass(void)
111649 +{
111650 + return &kernexec_reload_pass.pass;
111651 +}
111652 +
111653 +static struct opt_pass *make_kernexec_fptr_pass(void)
111654 +{
111655 + return &kernexec_fptr_pass.pass;
111656 +}
111657 +
111658 +static struct opt_pass *make_kernexec_retaddr_pass(void)
111659 +{
111660 + return &kernexec_retaddr_pass.pass;
111661 +}
111662 +#endif
111663 +
111664 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
111665 +{
111666 + const char * const plugin_name = plugin_info->base_name;
111667 + const int argc = plugin_info->argc;
111668 + const struct plugin_argument * const argv = plugin_info->argv;
111669 + int i;
111670 + struct register_pass_info kernexec_reload_pass_info;
111671 + struct register_pass_info kernexec_fptr_pass_info;
111672 + struct register_pass_info kernexec_retaddr_pass_info;
111673 +
111674 + kernexec_reload_pass_info.pass = make_kernexec_reload_pass();
111675 + kernexec_reload_pass_info.reference_pass_name = "ssa";
111676 + kernexec_reload_pass_info.ref_pass_instance_number = 1;
111677 + kernexec_reload_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111678 +
111679 + kernexec_fptr_pass_info.pass = make_kernexec_fptr_pass();
111680 + kernexec_fptr_pass_info.reference_pass_name = "ssa";
111681 + kernexec_fptr_pass_info.ref_pass_instance_number = 1;
111682 + kernexec_fptr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111683 +
111684 + kernexec_retaddr_pass_info.pass = make_kernexec_retaddr_pass();
111685 + kernexec_retaddr_pass_info.reference_pass_name = "pro_and_epilogue";
111686 + kernexec_retaddr_pass_info.ref_pass_instance_number = 1;
111687 + kernexec_retaddr_pass_info.pos_op = PASS_POS_INSERT_AFTER;
111688 +
111689 + if (!plugin_default_version_check(version, &gcc_version)) {
111690 + error(G_("incompatible gcc/plugin versions"));
111691 + return 1;
111692 + }
111693 +
111694 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
111695 +
111696 + if (TARGET_64BIT == 0)
111697 + return 0;
111698 +
111699 + for (i = 0; i < argc; ++i) {
111700 + if (!strcmp(argv[i].key, "method")) {
111701 + if (!argv[i].value) {
111702 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111703 + continue;
111704 + }
111705 + if (!strcmp(argv[i].value, "bts")) {
111706 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
111707 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
111708 + } else if (!strcmp(argv[i].value, "or")) {
111709 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
111710 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
111711 + fix_register("r12", 1, 1);
111712 + } else
111713 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
111714 + continue;
111715 + }
111716 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
111717 + }
111718 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
111719 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
111720 +
111721 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
111722 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
111723 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
111724 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
111725 +
111726 + return 0;
111727 +}
111728 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
111729 new file mode 100644
111730 index 0000000..e48b323
111731 --- /dev/null
111732 +++ b/tools/gcc/latent_entropy_plugin.c
111733 @@ -0,0 +1,466 @@
111734 +/*
111735 + * Copyright 2012-2014 by the PaX Team <pageexec@freemail.hu>
111736 + * Licensed under the GPL v2
111737 + *
111738 + * Note: the choice of the license means that the compilation process is
111739 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
111740 + * but for the kernel it doesn't matter since it doesn't link against
111741 + * any of the gcc libraries
111742 + *
111743 + * gcc plugin to help generate a little bit of entropy from program state,
111744 + * used throughout the uptime of the kernel
111745 + *
111746 + * TODO:
111747 + * - add ipa pass to identify not explicitly marked candidate functions
111748 + * - mix in more program state (function arguments/return values, loop variables, etc)
111749 + * - more instrumentation control via attribute parameters
111750 + *
111751 + * BUGS:
111752 + * - LTO needs -flto-partition=none for now
111753 + */
111754 +
111755 +#include "gcc-common.h"
111756 +
111757 +int plugin_is_GPL_compatible;
111758 +
111759 +static tree latent_entropy_decl;
111760 +
111761 +static struct plugin_info latent_entropy_plugin_info = {
111762 + .version = "201409101820",
111763 + .help = NULL
111764 +};
111765 +
111766 +static unsigned HOST_WIDE_INT seed;
111767 +static unsigned HOST_WIDE_INT get_random_const(void)
111768 +{
111769 + unsigned int i;
111770 + unsigned HOST_WIDE_INT ret = 0;
111771 +
111772 + for (i = 0; i < 8 * sizeof ret; i++) {
111773 + ret = (ret << 1) | (seed & 1);
111774 + seed >>= 1;
111775 + if (ret & 1)
111776 + seed ^= 0xD800000000000000ULL;
111777 + }
111778 +
111779 + return ret;
111780 +}
111781 +
111782 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
111783 +{
111784 + tree type;
111785 + unsigned long long mask;
111786 +#if BUILDING_GCC_VERSION <= 4007
111787 + VEC(constructor_elt, gc) *vals;
111788 +#else
111789 + vec<constructor_elt, va_gc> *vals;
111790 +#endif
111791 +
111792 + switch (TREE_CODE(*node)) {
111793 + default:
111794 + *no_add_attrs = true;
111795 + error("%qE attribute only applies to functions and variables", name);
111796 + break;
111797 +
111798 + case VAR_DECL:
111799 + if (DECL_INITIAL(*node)) {
111800 + *no_add_attrs = true;
111801 + error("variable %qD with %qE attribute must not be initialized", *node, name);
111802 + break;
111803 + }
111804 +
111805 + if (!TREE_STATIC(*node)) {
111806 + *no_add_attrs = true;
111807 + error("variable %qD with %qE attribute must not be local", *node, name);
111808 + break;
111809 + }
111810 +
111811 + type = TREE_TYPE(*node);
111812 + switch (TREE_CODE(type)) {
111813 + default:
111814 + *no_add_attrs = true;
111815 + error("variable %qD with %qE attribute must be an integer or a fixed length integer array type or a fixed sized structure with integer fields", *node, name);
111816 + break;
111817 +
111818 + case RECORD_TYPE: {
111819 + tree field;
111820 + unsigned int nelt = 0;
111821 +
111822 + for (field = TYPE_FIELDS(type); field; nelt++, field = TREE_CHAIN(field)) {
111823 + tree fieldtype;
111824 +
111825 + fieldtype = TREE_TYPE(field);
111826 + if (TREE_CODE(fieldtype) != INTEGER_TYPE) {
111827 + *no_add_attrs = true;
111828 + error("structure variable %qD with %qE attribute has a non-integer field %qE", *node, name, field);
111829 + break;
111830 + }
111831 + }
111832 +
111833 + if (field)
111834 + break;
111835 +
111836 +#if BUILDING_GCC_VERSION <= 4007
111837 + vals = VEC_alloc(constructor_elt, gc, nelt);
111838 +#else
111839 + vec_alloc(vals, nelt);
111840 +#endif
111841 +
111842 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
111843 + tree fieldtype;
111844 +
111845 + fieldtype = TREE_TYPE(field);
111846 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(fieldtype)) - 1);
111847 + mask = 2 * (mask - 1) + 1;
111848 +
111849 + if (TYPE_UNSIGNED(fieldtype))
111850 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cstu(fieldtype, mask & get_random_const()));
111851 + else
111852 + CONSTRUCTOR_APPEND_ELT(vals, field, build_int_cst(fieldtype, mask & get_random_const()));
111853 + }
111854 +
111855 + DECL_INITIAL(*node) = build_constructor(type, vals);
111856 +//debug_tree(DECL_INITIAL(*node));
111857 + break;
111858 + }
111859 +
111860 + case INTEGER_TYPE:
111861 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(type)) - 1);
111862 + mask = 2 * (mask - 1) + 1;
111863 +
111864 + if (TYPE_UNSIGNED(type))
111865 + DECL_INITIAL(*node) = build_int_cstu(type, mask & get_random_const());
111866 + else
111867 + DECL_INITIAL(*node) = build_int_cst(type, mask & get_random_const());
111868 + break;
111869 +
111870 + case ARRAY_TYPE: {
111871 + tree elt_type, array_size, elt_size;
111872 + unsigned int i, nelt;
111873 +
111874 + elt_type = TREE_TYPE(type);
111875 + elt_size = TYPE_SIZE_UNIT(TREE_TYPE(type));
111876 + array_size = TYPE_SIZE_UNIT(type);
111877 +
111878 + if (TREE_CODE(elt_type) != INTEGER_TYPE || !array_size || TREE_CODE(array_size) != INTEGER_CST) {
111879 + *no_add_attrs = true;
111880 + error("array variable %qD with %qE attribute must be a fixed length integer array type", *node, name);
111881 + break;
111882 + }
111883 +
111884 + nelt = TREE_INT_CST_LOW(array_size) / TREE_INT_CST_LOW(elt_size);
111885 +#if BUILDING_GCC_VERSION <= 4007
111886 + vals = VEC_alloc(constructor_elt, gc, nelt);
111887 +#else
111888 + vec_alloc(vals, nelt);
111889 +#endif
111890 +
111891 + mask = 1ULL << (TREE_INT_CST_LOW(TYPE_SIZE(elt_type)) - 1);
111892 + mask = 2 * (mask - 1) + 1;
111893 +
111894 + for (i = 0; i < nelt; i++)
111895 + if (TYPE_UNSIGNED(elt_type))
111896 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cstu(elt_type, mask & get_random_const()));
111897 + else
111898 + CONSTRUCTOR_APPEND_ELT(vals, size_int(i), build_int_cst(elt_type, mask & get_random_const()));
111899 +
111900 + DECL_INITIAL(*node) = build_constructor(type, vals);
111901 +//debug_tree(DECL_INITIAL(*node));
111902 + break;
111903 + }
111904 + }
111905 + break;
111906 +
111907 + case FUNCTION_DECL:
111908 + break;
111909 + }
111910 +
111911 + return NULL_TREE;
111912 +}
111913 +
111914 +static struct attribute_spec latent_entropy_attr = {
111915 + .name = "latent_entropy",
111916 + .min_length = 0,
111917 + .max_length = 0,
111918 + .decl_required = true,
111919 + .type_required = false,
111920 + .function_type_required = false,
111921 + .handler = handle_latent_entropy_attribute,
111922 +#if BUILDING_GCC_VERSION >= 4007
111923 + .affects_type_identity = false
111924 +#endif
111925 +};
111926 +
111927 +static void register_attributes(void *event_data, void *data)
111928 +{
111929 + register_attribute(&latent_entropy_attr);
111930 +}
111931 +
111932 +static bool gate_latent_entropy(void)
111933 +{
111934 + // don't bother with noreturn functions for now
111935 + if (TREE_THIS_VOLATILE(current_function_decl))
111936 + return false;
111937 +
111938 + // gcc-4.5 doesn't discover some trivial noreturn functions
111939 + if (EDGE_COUNT(EXIT_BLOCK_PTR_FOR_FN(cfun)->preds) == 0)
111940 + return false;
111941 +
111942 + return lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl)) != NULL_TREE;
111943 +}
111944 +
111945 +static enum tree_code get_op(tree *rhs)
111946 +{
111947 + static enum tree_code op;
111948 + unsigned HOST_WIDE_INT random_const;
111949 +
111950 + random_const = get_random_const();
111951 +
111952 + switch (op) {
111953 + case BIT_XOR_EXPR:
111954 + op = PLUS_EXPR;
111955 + break;
111956 +
111957 + case PLUS_EXPR:
111958 + if (rhs) {
111959 + op = LROTATE_EXPR;
111960 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
111961 + break;
111962 + }
111963 +
111964 + case LROTATE_EXPR:
111965 + default:
111966 + op = BIT_XOR_EXPR;
111967 + break;
111968 + }
111969 + if (rhs)
111970 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
111971 + return op;
111972 +}
111973 +
111974 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
111975 +{
111976 + gimple_stmt_iterator gsi;
111977 + gimple assign;
111978 + tree addxorrol, rhs;
111979 + enum tree_code op;
111980 +
111981 + op = get_op(&rhs);
111982 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
111983 + assign = gimple_build_assign(local_entropy, addxorrol);
111984 + gsi = gsi_after_labels(bb);
111985 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
111986 + update_stmt(assign);
111987 +//debug_bb(bb);
111988 +}
111989 +
111990 +static void perturb_latent_entropy(basic_block bb, tree rhs)
111991 +{
111992 + gimple_stmt_iterator gsi;
111993 + gimple assign;
111994 + tree addxorrol, temp;
111995 +
111996 + // 1. create temporary copy of latent_entropy
111997 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
111998 + add_referenced_var(temp);
111999 +
112000 + // 2. read...
112001 + temp = make_ssa_name(temp, NULL);
112002 + assign = gimple_build_assign(temp, latent_entropy_decl);
112003 + SSA_NAME_DEF_STMT(temp) = assign;
112004 + add_referenced_var(latent_entropy_decl);
112005 + gsi = gsi_after_labels(bb);
112006 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
112007 + update_stmt(assign);
112008 +
112009 + // 3. ...modify...
112010 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
112011 + temp = make_ssa_name(SSA_NAME_VAR(temp), NULL);
112012 + assign = gimple_build_assign(temp, addxorrol);
112013 + SSA_NAME_DEF_STMT(temp) = assign;
112014 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
112015 + update_stmt(assign);
112016 +
112017 + // 4. ...write latent_entropy
112018 + assign = gimple_build_assign(latent_entropy_decl, temp);
112019 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
112020 + update_stmt(assign);
112021 +}
112022 +
112023 +static unsigned int execute_latent_entropy(void)
112024 +{
112025 + basic_block bb;
112026 + gimple assign;
112027 + gimple_stmt_iterator gsi;
112028 + tree local_entropy;
112029 +
112030 + if (!latent_entropy_decl) {
112031 +#if BUILDING_GCC_VERSION >= 4009
112032 + varpool_node *node;
112033 +#else
112034 + struct varpool_node *node;
112035 +#endif
112036 +
112037 + FOR_EACH_VARIABLE(node) {
112038 + tree var = NODE_DECL(node);
112039 +
112040 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
112041 + continue;
112042 + latent_entropy_decl = var;
112043 +// debug_tree(var);
112044 + break;
112045 + }
112046 + if (!latent_entropy_decl) {
112047 +// debug_tree(current_function_decl);
112048 + return 0;
112049 + }
112050 + }
112051 +
112052 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
112053 +
112054 + // 1. create local entropy variable
112055 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
112056 + add_referenced_var(local_entropy);
112057 + mark_sym_for_renaming(local_entropy);
112058 +
112059 + // 2. initialize local entropy variable
112060 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
112061 + if (dom_info_available_p(CDI_DOMINATORS))
112062 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
112063 + gsi = gsi_start_bb(bb);
112064 +
112065 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
112066 +// gimple_set_location(assign, loc);
112067 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
112068 + update_stmt(assign);
112069 +//debug_bb(bb);
112070 + gcc_assert(single_succ_p(bb));
112071 + bb = single_succ(bb);
112072 +
112073 + // 3. instrument each BB with an operation on the local entropy variable
112074 + while (bb != EXIT_BLOCK_PTR_FOR_FN(cfun)) {
112075 + perturb_local_entropy(bb, local_entropy);
112076 +//debug_bb(bb);
112077 + bb = bb->next_bb;
112078 + };
112079 +
112080 + // 4. mix local entropy into the global entropy variable
112081 + gcc_assert(single_pred_p(EXIT_BLOCK_PTR_FOR_FN(cfun)));
112082 + perturb_latent_entropy(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)), local_entropy);
112083 +//debug_bb(single_pred(EXIT_BLOCK_PTR_FOR_FN(cfun)));
112084 + return 0;
112085 +}
112086 +
112087 +static void latent_entropy_start_unit(void *gcc_data, void *user_data)
112088 +{
112089 + tree latent_entropy_type;
112090 +
112091 + seed = get_random_seed(false);
112092 +
112093 + if (in_lto_p)
112094 + return;
112095 +
112096 + // extern volatile u64 latent_entropy
112097 + gcc_assert(TYPE_PRECISION(long_long_unsigned_type_node) == 64);
112098 + latent_entropy_type = build_qualified_type(long_long_unsigned_type_node, TYPE_QUALS(long_long_unsigned_type_node) | TYPE_QUAL_VOLATILE);
112099 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), latent_entropy_type);
112100 +
112101 + TREE_STATIC(latent_entropy_decl) = 1;
112102 + TREE_PUBLIC(latent_entropy_decl) = 1;
112103 + TREE_USED(latent_entropy_decl) = 1;
112104 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
112105 + DECL_EXTERNAL(latent_entropy_decl) = 1;
112106 + DECL_ARTIFICIAL(latent_entropy_decl) = 1;
112107 + lang_hooks.decls.pushdecl(latent_entropy_decl);
112108 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
112109 +// varpool_finalize_decl(latent_entropy_decl);
112110 +// varpool_mark_needed_node(latent_entropy_decl);
112111 +}
112112 +
112113 +#if BUILDING_GCC_VERSION >= 4009
112114 +static const struct pass_data latent_entropy_pass_data = {
112115 +#else
112116 +static struct gimple_opt_pass latent_entropy_pass = {
112117 + .pass = {
112118 +#endif
112119 + .type = GIMPLE_PASS,
112120 + .name = "latent_entropy",
112121 +#if BUILDING_GCC_VERSION >= 4008
112122 + .optinfo_flags = OPTGROUP_NONE,
112123 +#endif
112124 +#if BUILDING_GCC_VERSION >= 4009
112125 + .has_gate = true,
112126 + .has_execute = true,
112127 +#else
112128 + .gate = gate_latent_entropy,
112129 + .execute = execute_latent_entropy,
112130 + .sub = NULL,
112131 + .next = NULL,
112132 + .static_pass_number = 0,
112133 +#endif
112134 + .tv_id = TV_NONE,
112135 + .properties_required = PROP_gimple_leh | PROP_cfg,
112136 + .properties_provided = 0,
112137 + .properties_destroyed = 0,
112138 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
112139 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
112140 +#if BUILDING_GCC_VERSION < 4009
112141 + }
112142 +#endif
112143 +};
112144 +
112145 +#if BUILDING_GCC_VERSION >= 4009
112146 +namespace {
112147 +class latent_entropy_pass : public gimple_opt_pass {
112148 +public:
112149 + latent_entropy_pass() : gimple_opt_pass(latent_entropy_pass_data, g) {}
112150 + bool gate() { return gate_latent_entropy(); }
112151 + unsigned int execute() { return execute_latent_entropy(); }
112152 +};
112153 +}
112154 +
112155 +static opt_pass *make_latent_entropy_pass(void)
112156 +{
112157 + return new latent_entropy_pass();
112158 +}
112159 +#else
112160 +static struct opt_pass *make_latent_entropy_pass(void)
112161 +{
112162 + return &latent_entropy_pass.pass;
112163 +}
112164 +#endif
112165 +
112166 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
112167 +{
112168 + const char * const plugin_name = plugin_info->base_name;
112169 + struct register_pass_info latent_entropy_pass_info;
112170 +
112171 + latent_entropy_pass_info.pass = make_latent_entropy_pass();
112172 + latent_entropy_pass_info.reference_pass_name = "optimized";
112173 + latent_entropy_pass_info.ref_pass_instance_number = 1;
112174 + latent_entropy_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
112175 + static const struct ggc_root_tab gt_ggc_r_gt_latent_entropy[] = {
112176 + {
112177 + .base = &latent_entropy_decl,
112178 + .nelt = 1,
112179 + .stride = sizeof(latent_entropy_decl),
112180 + .cb = &gt_ggc_mx_tree_node,
112181 + .pchw = &gt_pch_nx_tree_node
112182 + },
112183 + LAST_GGC_ROOT_TAB
112184 + };
112185 +
112186 + if (!plugin_default_version_check(version, &gcc_version)) {
112187 + error(G_("incompatible gcc/plugin versions"));
112188 + return 1;
112189 + }
112190 +
112191 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
112192 + register_callback(plugin_name, PLUGIN_START_UNIT, &latent_entropy_start_unit, NULL);
112193 + if (!in_lto_p)
112194 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_latent_entropy);
112195 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
112196 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
112197 +
112198 + return 0;
112199 +}
112200 diff --git a/tools/gcc/randomize_layout_plugin.c b/tools/gcc/randomize_layout_plugin.c
112201 new file mode 100644
112202 index 0000000..a5cb46b
112203 --- /dev/null
112204 +++ b/tools/gcc/randomize_layout_plugin.c
112205 @@ -0,0 +1,915 @@
112206 +/*
112207 + * Copyright 2014 by Open Source Security, Inc., Brad Spengler <spender@grsecurity.net>
112208 + * and PaX Team <pageexec@freemail.hu>
112209 + * Licensed under the GPL v2
112210 + *
112211 + * Usage:
112212 + * $ # for 4.5/4.6/C based 4.7
112213 + * $ gcc -I`gcc -print-file-name=plugin`/include -I`gcc -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o randomize_layout_plugin.so randomize_layout_plugin.c
112214 + * $ # for C++ based 4.7/4.8+
112215 + * $ g++ -I`g++ -print-file-name=plugin`/include -I`g++ -print-file-name=plugin`/include/c-family -fPIC -shared -O2 -o randomize_layout_plugin.so randomize_layout_plugin.c
112216 + * $ gcc -fplugin=./randomize_layout_plugin.so test.c -O2
112217 + */
112218 +
112219 +#include "gcc-common.h"
112220 +#include "randomize_layout_seed.h"
112221 +
112222 +#if BUILDING_GCC_MAJOR < 4 || BUILDING_GCC_MINOR < 6 || (BUILDING_GCC_MINOR == 6 && BUILDING_GCC_PATCHLEVEL < 4)
112223 +#error "The RANDSTRUCT plugin requires GCC 4.6.4 or newer."
112224 +#endif
112225 +
112226 +#define ORIG_TYPE_NAME(node) \
112227 + (TYPE_NAME(TYPE_MAIN_VARIANT(node)) != NULL_TREE ? ((const unsigned char *)IDENTIFIER_POINTER(TYPE_NAME(TYPE_MAIN_VARIANT(node)))) : (const unsigned char *)"anonymous")
112228 +
112229 +int plugin_is_GPL_compatible;
112230 +
112231 +static int performance_mode;
112232 +
112233 +static struct plugin_info randomize_layout_plugin_info = {
112234 + .version = "201402201816",
112235 + .help = "disable\t\t\tdo not activate plugin\n"
112236 + "performance-mode\tenable cacheline-aware layout randomization\n"
112237 +};
112238 +
112239 +/* from old Linux dcache.h */
112240 +static inline unsigned long
112241 +partial_name_hash(unsigned long c, unsigned long prevhash)
112242 +{
112243 + return (prevhash + (c << 4) + (c >> 4)) * 11;
112244 +}
112245 +static inline unsigned int
112246 +name_hash(const unsigned char *name)
112247 +{
112248 + unsigned long hash = 0;
112249 + unsigned int len = strlen((const char *)name);
112250 + while (len--)
112251 + hash = partial_name_hash(*name++, hash);
112252 + return (unsigned int)hash;
112253 +}
112254 +
112255 +static tree handle_randomize_layout_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112256 +{
112257 + tree type;
112258 +
112259 + *no_add_attrs = true;
112260 + if (TREE_CODE(*node) == FUNCTION_DECL) {
112261 + error("%qE attribute does not apply to functions (%qF)", name, *node);
112262 + return NULL_TREE;
112263 + }
112264 +
112265 + if (TREE_CODE(*node) == PARM_DECL) {
112266 + error("%qE attribute does not apply to function parameters (%qD)", name, *node);
112267 + return NULL_TREE;
112268 + }
112269 +
112270 + if (TREE_CODE(*node) == VAR_DECL) {
112271 + error("%qE attribute does not apply to variables (%qD)", name, *node);
112272 + return NULL_TREE;
112273 + }
112274 +
112275 + if (TYPE_P(*node)) {
112276 + type = *node;
112277 + } else {
112278 + gcc_assert(TREE_CODE(*node) == TYPE_DECL);
112279 + type = TREE_TYPE(*node);
112280 + }
112281 +
112282 + if (TREE_CODE(type) != RECORD_TYPE) {
112283 + error("%qE attribute used on %qT applies to struct types only", name, type);
112284 + return NULL_TREE;
112285 + }
112286 +
112287 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
112288 + error("%qE attribute is already applied to the type %qT", name, type);
112289 + return NULL_TREE;
112290 + }
112291 +
112292 + *no_add_attrs = false;
112293 +
112294 + return NULL_TREE;
112295 +}
112296 +
112297 +/* set on complete types that we don't need to inspect further at all */
112298 +static tree handle_randomize_considered_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112299 +{
112300 + *no_add_attrs = false;
112301 + return NULL_TREE;
112302 +}
112303 +
112304 +/*
112305 + * set on types that we've performed a shuffle on, to prevent re-shuffling
112306 + * this does not preclude us from inspecting its fields for potential shuffles
112307 + */
112308 +static tree handle_randomize_performed_attr(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
112309 +{
112310 + *no_add_attrs = false;
112311 + return NULL_TREE;
112312 +}
112313 +
112314 +/*
112315 + * 64bit variant of Bob Jenkins' public domain PRNG
112316 + * 256 bits of internal state
112317 + */
112318 +
112319 +typedef unsigned long long u64;
112320 +
112321 +typedef struct ranctx { u64 a; u64 b; u64 c; u64 d; } ranctx;
112322 +
112323 +#define rot(x,k) (((x)<<(k))|((x)>>(64-(k))))
112324 +static u64 ranval(ranctx *x) {
112325 + u64 e = x->a - rot(x->b, 7);
112326 + x->a = x->b ^ rot(x->c, 13);
112327 + x->b = x->c + rot(x->d, 37);
112328 + x->c = x->d + e;
112329 + x->d = e + x->a;
112330 + return x->d;
112331 +}
112332 +
112333 +static void raninit(ranctx *x, u64 *seed) {
112334 + int i;
112335 +
112336 + x->a = seed[0];
112337 + x->b = seed[1];
112338 + x->c = seed[2];
112339 + x->d = seed[3];
112340 +
112341 + for (i=0; i < 30; ++i)
112342 + (void)ranval(x);
112343 +}
112344 +
112345 +static u64 shuffle_seed[4];
112346 +
112347 +struct partition_group {
112348 + tree tree_start;
112349 + unsigned long start;
112350 + unsigned long length;
112351 +};
112352 +
112353 +static void partition_struct(tree *fields, unsigned long length, struct partition_group *size_groups, unsigned long *num_groups)
112354 +{
112355 + unsigned long i;
112356 + unsigned long accum_size = 0;
112357 + unsigned long accum_length = 0;
112358 + unsigned long group_idx = 0;
112359 +
112360 + gcc_assert(length < INT_MAX);
112361 +
112362 + memset(size_groups, 0, sizeof(struct partition_group) * length);
112363 +
112364 + for (i = 0; i < length; i++) {
112365 + if (size_groups[group_idx].tree_start == NULL_TREE) {
112366 + size_groups[group_idx].tree_start = fields[i];
112367 + size_groups[group_idx].start = i;
112368 + accum_length = 0;
112369 + accum_size = 0;
112370 + }
112371 + accum_size += (unsigned long)int_size_in_bytes(TREE_TYPE(fields[i]));
112372 + accum_length++;
112373 + if (accum_size >= 64) {
112374 + size_groups[group_idx].length = accum_length;
112375 + accum_length = 0;
112376 + group_idx++;
112377 + }
112378 + }
112379 +
112380 + if (size_groups[group_idx].tree_start != NULL_TREE &&
112381 + !size_groups[group_idx].length) {
112382 + size_groups[group_idx].length = accum_length;
112383 + group_idx++;
112384 + }
112385 +
112386 + *num_groups = group_idx;
112387 +}
112388 +
112389 +static void performance_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112390 +{
112391 + unsigned long i, x;
112392 + struct partition_group size_group[length];
112393 + unsigned long num_groups = 0;
112394 + unsigned long randnum;
112395 +
112396 + partition_struct(newtree, length, (struct partition_group *)&size_group, &num_groups);
112397 + for (i = num_groups - 1; i > 0; i--) {
112398 + struct partition_group tmp;
112399 + randnum = ranval(prng_state) % (i + 1);
112400 + tmp = size_group[i];
112401 + size_group[i] = size_group[randnum];
112402 + size_group[randnum] = tmp;
112403 + }
112404 +
112405 + for (x = 0; x < num_groups; x++) {
112406 + for (i = size_group[x].start + size_group[x].length - 1; i > size_group[x].start; i--) {
112407 + tree tmp;
112408 + if (DECL_BIT_FIELD_TYPE(newtree[i]))
112409 + continue;
112410 + randnum = ranval(prng_state) % (i + 1);
112411 + // we could handle this case differently if desired
112412 + if (DECL_BIT_FIELD_TYPE(newtree[randnum]))
112413 + continue;
112414 + tmp = newtree[i];
112415 + newtree[i] = newtree[randnum];
112416 + newtree[randnum] = tmp;
112417 + }
112418 + }
112419 +}
112420 +
112421 +static void full_shuffle(tree *newtree, unsigned long length, ranctx *prng_state)
112422 +{
112423 + unsigned long i, randnum;
112424 +
112425 + for (i = length - 1; i > 0; i--) {
112426 + tree tmp;
112427 + randnum = ranval(prng_state) % (i + 1);
112428 + tmp = newtree[i];
112429 + newtree[i] = newtree[randnum];
112430 + newtree[randnum] = tmp;
112431 + }
112432 +}
112433 +
112434 +/* modern in-place Fisher-Yates shuffle */
112435 +static void shuffle(const_tree type, tree *newtree, unsigned long length)
112436 +{
112437 + unsigned long i;
112438 + u64 seed[4];
112439 + ranctx prng_state;
112440 + const unsigned char *structname;
112441 +
112442 + if (length == 0)
112443 + return;
112444 +
112445 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112446 +
112447 + structname = ORIG_TYPE_NAME(type);
112448 +
112449 +#ifdef __DEBUG_PLUGIN
112450 + fprintf(stderr, "Shuffling struct %s %p\n", (const char *)structname, type);
112451 +#ifdef __DEBUG_VERBOSE
112452 + debug_tree((tree)type);
112453 +#endif
112454 +#endif
112455 +
112456 + for (i = 0; i < 4; i++) {
112457 + seed[i] = shuffle_seed[i];
112458 + seed[i] ^= name_hash(structname);
112459 + }
112460 +
112461 + raninit(&prng_state, (u64 *)&seed);
112462 +
112463 + if (performance_mode)
112464 + performance_shuffle(newtree, length, &prng_state);
112465 + else
112466 + full_shuffle(newtree, length, &prng_state);
112467 +}
112468 +
112469 +static bool is_flexible_array(const_tree field)
112470 +{
112471 + const_tree fieldtype;
112472 + const_tree typesize;
112473 + const_tree elemtype;
112474 + const_tree elemsize;
112475 +
112476 + fieldtype = TREE_TYPE(field);
112477 + typesize = TYPE_SIZE(fieldtype);
112478 +
112479 + if (TREE_CODE(fieldtype) != ARRAY_TYPE)
112480 + return false;
112481 +
112482 + elemtype = TREE_TYPE(fieldtype);
112483 + elemsize = TYPE_SIZE(elemtype);
112484 +
112485 + /* size of type is represented in bits */
112486 +
112487 + if (typesize == NULL_TREE && TYPE_DOMAIN(fieldtype) != NULL_TREE &&
112488 + TYPE_MAX_VALUE(TYPE_DOMAIN(fieldtype)) == NULL_TREE)
112489 + return true;
112490 +
112491 + if (typesize != NULL_TREE &&
112492 + (TREE_CONSTANT(typesize) && (!TREE_INT_CST_LOW(typesize) ||
112493 + TREE_INT_CST_LOW(typesize) == TREE_INT_CST_LOW(elemsize))))
112494 + return true;
112495 +
112496 + return false;
112497 +}
112498 +
112499 +static int relayout_struct(tree type)
112500 +{
112501 + unsigned long num_fields = (unsigned long)list_length(TYPE_FIELDS(type));
112502 + unsigned long shuffle_length = num_fields;
112503 + tree field;
112504 + tree newtree[num_fields];
112505 + unsigned long i;
112506 + tree list;
112507 + tree variant;
112508 + expanded_location xloc;
112509 +
112510 + if (TYPE_FIELDS(type) == NULL_TREE)
112511 + return 0;
112512 +
112513 + if (num_fields < 2)
112514 + return 0;
112515 +
112516 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112517 +
112518 + gcc_assert(num_fields < INT_MAX);
112519 +
112520 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)) ||
112521 + lookup_attribute("no_randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))))
112522 + return 0;
112523 +
112524 + /* Workaround for 3rd-party VirtualBox source that we can't modify ourselves */
112525 + if (!strcmp((const char *)ORIG_TYPE_NAME(type), "INTNETTRUNKFACTORY") ||
112526 + !strcmp((const char *)ORIG_TYPE_NAME(type), "RAWPCIFACTORY"))
112527 + return 0;
112528 +
112529 + /* throw out any structs in uapi */
112530 + xloc = expand_location(DECL_SOURCE_LOCATION(TYPE_FIELDS(type)));
112531 +
112532 + if (strstr(xloc.file, "/uapi/"))
112533 + error(G_("attempted to randomize userland API struct %s"), ORIG_TYPE_NAME(type));
112534 +
112535 + for (field = TYPE_FIELDS(type), i = 0; field; field = TREE_CHAIN(field), i++) {
112536 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
112537 + newtree[i] = field;
112538 + }
112539 +
112540 + /*
112541 + * enforce that we don't randomize the layout of the last
112542 + * element of a struct if it's a 0 or 1-length array
112543 + * or a proper flexible array
112544 + */
112545 + if (is_flexible_array(newtree[num_fields - 1]))
112546 + shuffle_length--;
112547 +
112548 + shuffle(type, (tree *)newtree, shuffle_length);
112549 +
112550 + /*
112551 + * set up a bogus anonymous struct field designed to error out on unnamed struct initializers
112552 + * as gcc provides no other way to detect such code
112553 + */
112554 + list = make_node(FIELD_DECL);
112555 + TREE_CHAIN(list) = newtree[0];
112556 + TREE_TYPE(list) = void_type_node;
112557 + DECL_SIZE(list) = bitsize_zero_node;
112558 + DECL_NONADDRESSABLE_P(list) = 1;
112559 + DECL_FIELD_BIT_OFFSET(list) = bitsize_zero_node;
112560 + DECL_SIZE_UNIT(list) = size_zero_node;
112561 + DECL_FIELD_OFFSET(list) = size_zero_node;
112562 + // to satisfy the constify plugin
112563 + TREE_READONLY(list) = 1;
112564 +
112565 + for (i = 0; i < num_fields - 1; i++)
112566 + TREE_CHAIN(newtree[i]) = newtree[i+1];
112567 + TREE_CHAIN(newtree[num_fields - 1]) = NULL_TREE;
112568 +
112569 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112570 + TYPE_FIELDS(variant) = list;
112571 + TYPE_ATTRIBUTES(variant) = copy_list(TYPE_ATTRIBUTES(variant));
112572 + TYPE_ATTRIBUTES(variant) = tree_cons(get_identifier("randomize_performed"), NULL_TREE, TYPE_ATTRIBUTES(variant));
112573 + // force a re-layout
112574 + TYPE_SIZE(variant) = NULL_TREE;
112575 + layout_type(variant);
112576 + }
112577 +
112578 + return 1;
112579 +}
112580 +
112581 +/* from constify plugin */
112582 +static const_tree get_field_type(const_tree field)
112583 +{
112584 + return strip_array_types(TREE_TYPE(field));
112585 +}
112586 +
112587 +/* from constify plugin */
112588 +static bool is_fptr(const_tree fieldtype)
112589 +{
112590 + if (TREE_CODE(fieldtype) != POINTER_TYPE)
112591 + return false;
112592 +
112593 + return TREE_CODE(TREE_TYPE(fieldtype)) == FUNCTION_TYPE;
112594 +}
112595 +
112596 +/* derived from constify plugin */
112597 +static int is_pure_ops_struct(const_tree node)
112598 +{
112599 + const_tree field;
112600 +
112601 + gcc_assert(TREE_CODE(node) == RECORD_TYPE || TREE_CODE(node) == UNION_TYPE);
112602 +
112603 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
112604 + const_tree fieldtype = get_field_type(field);
112605 + enum tree_code code = TREE_CODE(fieldtype);
112606 +
112607 + if (node == fieldtype)
112608 + continue;
112609 +
112610 + if (!is_fptr(fieldtype))
112611 + return 0;
112612 +
112613 + if (code != RECORD_TYPE && code != UNION_TYPE)
112614 + continue;
112615 +
112616 + if (!is_pure_ops_struct(fieldtype))
112617 + return 0;
112618 + }
112619 +
112620 + return 1;
112621 +}
112622 +
112623 +static void randomize_type(tree type)
112624 +{
112625 + tree variant;
112626 +
112627 + gcc_assert(TREE_CODE(type) == RECORD_TYPE);
112628 +
112629 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112630 + return;
112631 +
112632 + if (lookup_attribute("randomize_layout", TYPE_ATTRIBUTES(TYPE_MAIN_VARIANT(type))) || is_pure_ops_struct(type))
112633 + relayout_struct(type);
112634 +
112635 + for (variant = TYPE_MAIN_VARIANT(type); variant; variant = TYPE_NEXT_VARIANT(variant)) {
112636 + TYPE_ATTRIBUTES(type) = copy_list(TYPE_ATTRIBUTES(type));
112637 + TYPE_ATTRIBUTES(type) = tree_cons(get_identifier("randomize_considered"), NULL_TREE, TYPE_ATTRIBUTES(type));
112638 + }
112639 +#ifdef __DEBUG_PLUGIN
112640 + fprintf(stderr, "Marking randomize_considered on struct %s\n", ORIG_TYPE_NAME(type));
112641 +#ifdef __DEBUG_VERBOSE
112642 + debug_tree(type);
112643 +#endif
112644 +#endif
112645 +}
112646 +
112647 +static void randomize_layout_finish_decl(void *event_data, void *data)
112648 +{
112649 + tree decl = (tree)event_data;
112650 + tree type;
112651 +
112652 + if (decl == NULL_TREE || decl == error_mark_node)
112653 + return;
112654 +
112655 + type = TREE_TYPE(decl);
112656 +
112657 + if (TREE_CODE(decl) != VAR_DECL)
112658 + return;
112659 +
112660 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
112661 + return;
112662 +
112663 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(type)))
112664 + return;
112665 +
112666 + relayout_decl(decl);
112667 +}
112668 +
112669 +static void finish_type(void *event_data, void *data)
112670 +{
112671 + tree type = (tree)event_data;
112672 +
112673 + if (type == NULL_TREE || type == error_mark_node)
112674 + return;
112675 +
112676 + if (TREE_CODE(type) != RECORD_TYPE)
112677 + return;
112678 +
112679 + if (TYPE_FIELDS(type) == NULL_TREE)
112680 + return;
112681 +
112682 + if (lookup_attribute("randomize_considered", TYPE_ATTRIBUTES(type)))
112683 + return;
112684 +
112685 +#ifdef __DEBUG_PLUGIN
112686 + fprintf(stderr, "Calling randomize_type on %s\n", ORIG_TYPE_NAME(type));
112687 +#endif
112688 +#ifdef __DEBUG_VERBOSE
112689 + debug_tree(type);
112690 +#endif
112691 + randomize_type(type);
112692 +
112693 + return;
112694 +}
112695 +
112696 +static struct attribute_spec randomize_layout_attr = {
112697 + .name = "randomize_layout",
112698 + // related to args
112699 + .min_length = 0,
112700 + .max_length = 0,
112701 + .decl_required = false,
112702 + // need type declaration
112703 + .type_required = true,
112704 + .function_type_required = false,
112705 + .handler = handle_randomize_layout_attr,
112706 +#if BUILDING_GCC_VERSION >= 4007
112707 + .affects_type_identity = true
112708 +#endif
112709 +};
112710 +
112711 +static struct attribute_spec no_randomize_layout_attr = {
112712 + .name = "no_randomize_layout",
112713 + // related to args
112714 + .min_length = 0,
112715 + .max_length = 0,
112716 + .decl_required = false,
112717 + // need type declaration
112718 + .type_required = true,
112719 + .function_type_required = false,
112720 + .handler = handle_randomize_layout_attr,
112721 +#if BUILDING_GCC_VERSION >= 4007
112722 + .affects_type_identity = true
112723 +#endif
112724 +};
112725 +
112726 +static struct attribute_spec randomize_considered_attr = {
112727 + .name = "randomize_considered",
112728 + // related to args
112729 + .min_length = 0,
112730 + .max_length = 0,
112731 + .decl_required = false,
112732 + // need type declaration
112733 + .type_required = true,
112734 + .function_type_required = false,
112735 + .handler = handle_randomize_considered_attr,
112736 +#if BUILDING_GCC_VERSION >= 4007
112737 + .affects_type_identity = false
112738 +#endif
112739 +};
112740 +
112741 +static struct attribute_spec randomize_performed_attr = {
112742 + .name = "randomize_performed",
112743 + // related to args
112744 + .min_length = 0,
112745 + .max_length = 0,
112746 + .decl_required = false,
112747 + // need type declaration
112748 + .type_required = true,
112749 + .function_type_required = false,
112750 + .handler = handle_randomize_performed_attr,
112751 +#if BUILDING_GCC_VERSION >= 4007
112752 + .affects_type_identity = false
112753 +#endif
112754 +};
112755 +
112756 +static void register_attributes(void *event_data, void *data)
112757 +{
112758 + register_attribute(&randomize_layout_attr);
112759 + register_attribute(&no_randomize_layout_attr);
112760 + register_attribute(&randomize_considered_attr);
112761 + register_attribute(&randomize_performed_attr);
112762 +}
112763 +
112764 +static void check_bad_casts_in_constructor(tree var, tree init)
112765 +{
112766 + unsigned HOST_WIDE_INT idx;
112767 + tree field, val;
112768 + tree field_type, val_type;
112769 +
112770 + FOR_EACH_CONSTRUCTOR_ELT(CONSTRUCTOR_ELTS(init), idx, field, val) {
112771 + if (TREE_CODE(val) == CONSTRUCTOR) {
112772 + check_bad_casts_in_constructor(var, val);
112773 + continue;
112774 + }
112775 +
112776 + /* pipacs' plugin creates franken-arrays that differ from those produced by
112777 + normal code which all have valid 'field' trees. work around this */
112778 + if (field == NULL_TREE)
112779 + continue;
112780 + field_type = TREE_TYPE(field);
112781 + val_type = TREE_TYPE(val);
112782 +
112783 + if (TREE_CODE(field_type) != POINTER_TYPE || TREE_CODE(val_type) != POINTER_TYPE)
112784 + continue;
112785 +
112786 + if (field_type == val_type)
112787 + continue;
112788 +
112789 + field_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(field_type))));
112790 + val_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(val_type))));
112791 +
112792 + if (field_type == void_type_node)
112793 + continue;
112794 + if (field_type == val_type)
112795 + continue;
112796 + if (TREE_CODE(val_type) != RECORD_TYPE)
112797 + continue;
112798 +
112799 + if (!lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(val_type)))
112800 + continue;
112801 + inform(DECL_SOURCE_LOCATION(var), "found mismatched struct pointer types: %qT and %qT\n", TYPE_MAIN_VARIANT(field_type), TYPE_MAIN_VARIANT(val_type));
112802 + }
112803 +}
112804 +
112805 +/* derived from the constify plugin */
112806 +static void check_global_variables(void *event_data, void *data)
112807 +{
112808 + struct varpool_node *node;
112809 + tree init;
112810 +
112811 + FOR_EACH_VARIABLE(node) {
112812 + tree var = NODE_DECL(node);
112813 + init = DECL_INITIAL(var);
112814 + if (init == NULL_TREE)
112815 + continue;
112816 +
112817 + if (TREE_CODE(init) != CONSTRUCTOR)
112818 + continue;
112819 +
112820 + check_bad_casts_in_constructor(var, init);
112821 + }
112822 +}
112823 +
112824 +static bool dominated_by_is_err(const_tree rhs, basic_block bb)
112825 +{
112826 + basic_block dom;
112827 + gimple dom_stmt;
112828 + gimple call_stmt;
112829 + const_tree dom_lhs;
112830 + const_tree poss_is_err_cond;
112831 + const_tree poss_is_err_func;
112832 + const_tree is_err_arg;
112833 +
112834 + dom = get_immediate_dominator(CDI_DOMINATORS, bb);
112835 + if (!dom)
112836 + return false;
112837 +
112838 + dom_stmt = last_stmt(dom);
112839 + if (!dom_stmt)
112840 + return false;
112841 +
112842 + if (gimple_code(dom_stmt) != GIMPLE_COND)
112843 + return false;
112844 +
112845 + if (gimple_cond_code(dom_stmt) != NE_EXPR)
112846 + return false;
112847 +
112848 + if (!integer_zerop(gimple_cond_rhs(dom_stmt)))
112849 + return false;
112850 +
112851 + poss_is_err_cond = gimple_cond_lhs(dom_stmt);
112852 +
112853 + if (TREE_CODE(poss_is_err_cond) != SSA_NAME)
112854 + return false;
112855 +
112856 + call_stmt = SSA_NAME_DEF_STMT(poss_is_err_cond);
112857 +
112858 + if (gimple_code(call_stmt) != GIMPLE_CALL)
112859 + return false;
112860 +
112861 + dom_lhs = gimple_get_lhs(call_stmt);
112862 + poss_is_err_func = gimple_call_fndecl(call_stmt);
112863 + if (!poss_is_err_func)
112864 + return false;
112865 + if (dom_lhs != poss_is_err_cond)
112866 + return false;
112867 + if (strcmp(DECL_NAME_POINTER(poss_is_err_func), "IS_ERR"))
112868 + return false;
112869 +
112870 + is_err_arg = gimple_call_arg(call_stmt, 0);
112871 + if (!is_err_arg)
112872 + return false;
112873 +
112874 + if (is_err_arg != rhs)
112875 + return false;
112876 +
112877 + return true;
112878 +}
112879 +
112880 +static void handle_local_var_initializers(void)
112881 +{
112882 + tree var;
112883 + unsigned int i;
112884 +
112885 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
112886 + tree init = DECL_INITIAL(var);
112887 + if (!init)
112888 + continue;
112889 + if (TREE_CODE(init) != CONSTRUCTOR)
112890 + continue;
112891 + check_bad_casts_in_constructor(var, init);
112892 + }
112893 +}
112894 +
112895 +/*
112896 + * iterate over all statements to find "bad" casts:
112897 + * those where the address of the start of a structure is cast
112898 + * to a pointer of a structure of a different type, or a
112899 + * structure pointer type is cast to a different structure pointer type
112900 + */
112901 +static unsigned int find_bad_casts(void)
112902 +{
112903 + basic_block bb;
112904 +
112905 + handle_local_var_initializers();
112906 +
112907 + FOR_ALL_BB_FN(bb, cfun) {
112908 + gimple_stmt_iterator gsi;
112909 +
112910 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
112911 + gimple stmt;
112912 + const_tree lhs;
112913 + const_tree lhs_type;
112914 + const_tree rhs1;
112915 + const_tree rhs_type;
112916 + const_tree ptr_lhs_type;
112917 + const_tree ptr_rhs_type;
112918 + const_tree op0;
112919 + const_tree op0_type;
112920 + enum tree_code rhs_code;
112921 +
112922 + stmt = gsi_stmt(gsi);
112923 +
112924 +#ifdef __DEBUG_PLUGIN
112925 +#ifdef __DEBUG_VERBOSE
112926 + debug_gimple_stmt(stmt);
112927 + debug_tree(gimple_get_lhs(stmt));
112928 +#endif
112929 +#endif
112930 +
112931 + if (gimple_code(stmt) != GIMPLE_ASSIGN)
112932 + continue;
112933 +
112934 +#ifdef __DEBUG_PLUGIN
112935 +#ifdef __DEBUG_VERBOSE
112936 + debug_tree(gimple_assign_rhs1(stmt));
112937 +#endif
112938 +#endif
112939 +
112940 + rhs_code = gimple_assign_rhs_code(stmt);
112941 +
112942 + if (rhs_code != ADDR_EXPR && rhs_code != SSA_NAME)
112943 + continue;
112944 +
112945 + lhs = gimple_get_lhs(stmt);
112946 + lhs_type = TREE_TYPE(lhs);
112947 + rhs1 = gimple_assign_rhs1(stmt);
112948 + rhs_type = TREE_TYPE(rhs1);
112949 +
112950 + if (TREE_CODE(rhs_type) != POINTER_TYPE ||
112951 + TREE_CODE(lhs_type) != POINTER_TYPE)
112952 + continue;
112953 +
112954 + ptr_lhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(lhs_type))));
112955 + ptr_rhs_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(rhs_type))));
112956 +
112957 + if (ptr_rhs_type == void_type_node)
112958 + continue;
112959 +
112960 + if (ptr_lhs_type == void_type_node)
112961 + continue;
112962 +
112963 + if (dominated_by_is_err(rhs1, bb))
112964 + continue;
112965 +
112966 + if (TREE_CODE(ptr_rhs_type) != RECORD_TYPE) {
112967 +#ifndef __DEBUG_PLUGIN
112968 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_lhs_type)))
112969 +#endif
112970 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
112971 + continue;
112972 + }
112973 +
112974 + if (rhs_code == SSA_NAME && ptr_lhs_type == ptr_rhs_type)
112975 + continue;
112976 +
112977 + if (rhs_code == ADDR_EXPR) {
112978 + op0 = TREE_OPERAND(rhs1, 0);
112979 +
112980 + if (op0 == NULL_TREE)
112981 + continue;
112982 +
112983 + if (TREE_CODE(op0) != VAR_DECL)
112984 + continue;
112985 +
112986 + op0_type = TYPE_MAIN_VARIANT(strip_array_types(TYPE_MAIN_VARIANT(TREE_TYPE(op0))));
112987 + if (op0_type == ptr_lhs_type)
112988 + continue;
112989 +
112990 +#ifndef __DEBUG_PLUGIN
112991 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(op0_type)))
112992 +#endif
112993 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, op0_type);
112994 + } else {
112995 + const_tree ssa_name_var = SSA_NAME_VAR(rhs1);
112996 + /* skip bogus type casts introduced by container_of */
112997 + if (ssa_name_var != NULL_TREE && DECL_NAME(ssa_name_var) &&
112998 + !strcmp((const char *)DECL_NAME_POINTER(ssa_name_var), "__mptr"))
112999 + continue;
113000 +#ifndef __DEBUG_PLUGIN
113001 + if (lookup_attribute("randomize_performed", TYPE_ATTRIBUTES(ptr_rhs_type)))
113002 +#endif
113003 + inform(gimple_location(stmt), "found mismatched struct pointer types: %qT and %qT\n", ptr_lhs_type, ptr_rhs_type);
113004 + }
113005 +
113006 + }
113007 + }
113008 + return 0;
113009 +}
113010 +
113011 +#if BUILDING_GCC_VERSION >= 4009
113012 +static const struct pass_data randomize_layout_bad_cast_data = {
113013 +#else
113014 +static struct gimple_opt_pass randomize_layout_bad_cast = {
113015 + .pass = {
113016 +#endif
113017 + .type = GIMPLE_PASS,
113018 + .name = "randomize_layout_bad_cast",
113019 +#if BUILDING_GCC_VERSION >= 4008
113020 + .optinfo_flags = OPTGROUP_NONE,
113021 +#endif
113022 +#if BUILDING_GCC_VERSION >= 4009
113023 + .has_gate = false,
113024 + .has_execute = true,
113025 +#else
113026 + .gate = NULL,
113027 + .execute = find_bad_casts,
113028 + .sub = NULL,
113029 + .next = NULL,
113030 + .static_pass_number = 0,
113031 +#endif
113032 + .tv_id = TV_NONE,
113033 + .properties_required = PROP_cfg,
113034 + .properties_provided = 0,
113035 + .properties_destroyed = 0,
113036 + .todo_flags_start = 0,
113037 + .todo_flags_finish = TODO_dump_func
113038 +#if BUILDING_GCC_VERSION < 4009
113039 + }
113040 +#endif
113041 +};
113042 +
113043 +#if BUILDING_GCC_VERSION >= 4009
113044 +namespace {
113045 +class randomize_layout_bad_cast : public gimple_opt_pass {
113046 +public:
113047 + randomize_layout_bad_cast() : gimple_opt_pass(randomize_layout_bad_cast_data, g) {}
113048 + unsigned int execute() { return find_bad_casts(); }
113049 +};
113050 +}
113051 +#endif
113052 +
113053 +static struct opt_pass *make_randomize_layout_bad_cast(void)
113054 +{
113055 +#if BUILDING_GCC_VERSION >= 4009
113056 + return new randomize_layout_bad_cast();
113057 +#else
113058 + return &randomize_layout_bad_cast.pass;
113059 +#endif
113060 +}
113061 +
113062 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
113063 +{
113064 + int i;
113065 + const char * const plugin_name = plugin_info->base_name;
113066 + const int argc = plugin_info->argc;
113067 + const struct plugin_argument * const argv = plugin_info->argv;
113068 + bool enable = true;
113069 + int obtained_seed = 0;
113070 + struct register_pass_info randomize_layout_bad_cast_info;
113071 +
113072 + randomize_layout_bad_cast_info.pass = make_randomize_layout_bad_cast();
113073 + randomize_layout_bad_cast_info.reference_pass_name = "ssa";
113074 + randomize_layout_bad_cast_info.ref_pass_instance_number = 1;
113075 + randomize_layout_bad_cast_info.pos_op = PASS_POS_INSERT_AFTER;
113076 +
113077 + if (!plugin_default_version_check(version, &gcc_version)) {
113078 + error(G_("incompatible gcc/plugin versions"));
113079 + return 1;
113080 + }
113081 +
113082 + if (strcmp(lang_hooks.name, "GNU C")) {
113083 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
113084 + enable = false;
113085 + }
113086 +
113087 + for (i = 0; i < argc; ++i) {
113088 + if (!strcmp(argv[i].key, "disable")) {
113089 + enable = false;
113090 + continue;
113091 + }
113092 + if (!strcmp(argv[i].key, "performance-mode")) {
113093 + performance_mode = 1;
113094 + continue;
113095 + }
113096 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
113097 + }
113098 +
113099 + if (strlen(randstruct_seed) != 64) {
113100 + error(G_("invalid seed value supplied for %s plugin"), plugin_name);
113101 + return 1;
113102 + }
113103 + obtained_seed = sscanf(randstruct_seed, "%016llx%016llx%016llx%016llx",
113104 + &shuffle_seed[0], &shuffle_seed[1], &shuffle_seed[2], &shuffle_seed[3]);
113105 + if (obtained_seed != 4) {
113106 + error(G_("Invalid seed supplied for %s plugin"), plugin_name);
113107 + return 1;
113108 + }
113109 +
113110 + register_callback(plugin_name, PLUGIN_INFO, NULL, &randomize_layout_plugin_info);
113111 + if (enable) {
113112 + register_callback(plugin_name, PLUGIN_ALL_IPA_PASSES_START, check_global_variables, NULL);
113113 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &randomize_layout_bad_cast_info);
113114 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
113115 + register_callback(plugin_name, PLUGIN_FINISH_DECL, randomize_layout_finish_decl, NULL);
113116 + }
113117 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
113118 +
113119 + return 0;
113120 +}
113121 diff --git a/tools/gcc/size_overflow_plugin/.gitignore b/tools/gcc/size_overflow_plugin/.gitignore
113122 new file mode 100644
113123 index 0000000..1f0214f
113124 --- /dev/null
113125 +++ b/tools/gcc/size_overflow_plugin/.gitignore
113126 @@ -0,0 +1,3 @@
113127 +randomize_layout_seed.h
113128 +size_overflow_hash.h
113129 +size_overflow_hash_aux.h
113130 diff --git a/tools/gcc/size_overflow_plugin/Makefile b/tools/gcc/size_overflow_plugin/Makefile
113131 new file mode 100644
113132 index 0000000..1ae2ed5
113133 --- /dev/null
113134 +++ b/tools/gcc/size_overflow_plugin/Makefile
113135 @@ -0,0 +1,20 @@
113136 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
113137 +always := $($(HOSTLIBS)-y)
113138 +
113139 +size_overflow_plugin-objs := $(patsubst $(srctree)/$(src)/%.c,%.o,$(wildcard $(srctree)/$(src)/*.c))
113140 +
113141 +$(patsubst $(srctree)/$(src)/%.c,$(obj)/%.o,$(wildcard $(srctree)/$(src)/*.c)): $(objtree)/$(obj)/size_overflow_hash.h $(objtree)/$(obj)/size_overflow_hash_aux.h
113142 +
113143 +quiet_cmd_build_size_overflow_hash = GENHASH $@
113144 + cmd_build_size_overflow_hash = \
113145 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash -d $< -o $@
113146 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
113147 + $(call if_changed,build_size_overflow_hash)
113148 +
113149 +quiet_cmd_build_size_overflow_hash_aux = GENHASH $@
113150 + cmd_build_size_overflow_hash_aux = \
113151 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -s size_overflow_hash_aux -d $< -o $@
113152 +$(objtree)/$(obj)/size_overflow_hash_aux.h: $(src)/size_overflow_hash_aux.data FORCE
113153 + $(call if_changed,build_size_overflow_hash_aux)
113154 +
113155 +targets += size_overflow_hash.h size_overflow_hash_aux.h
113156 diff --git a/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
113157 new file mode 100644
113158 index 0000000..12b1e3b
113159 --- /dev/null
113160 +++ b/tools/gcc/size_overflow_plugin/generate_size_overflow_hash.sh
113161 @@ -0,0 +1,102 @@
113162 +#!/bin/bash
113163 +
113164 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
113165 +
113166 +header1="size_overflow_hash.h"
113167 +database="size_overflow_hash.data"
113168 +n=65536
113169 +hashtable_name="size_overflow_hash"
113170 +
113171 +usage() {
113172 +cat <<EOF
113173 +usage: $0 options
113174 +OPTIONS:
113175 + -h|--help help
113176 + -o header file
113177 + -d database file
113178 + -n hash array size
113179 + -s name of the hash table
113180 +EOF
113181 + return 0
113182 +}
113183 +
113184 +while true
113185 +do
113186 + case "$1" in
113187 + -h|--help) usage && exit 0;;
113188 + -n) n=$2; shift 2;;
113189 + -o) header1="$2"; shift 2;;
113190 + -d) database="$2"; shift 2;;
113191 + -s) hashtable_name="$2"; shift 2;;
113192 + --) shift 1; break ;;
113193 + *) break ;;
113194 + esac
113195 +done
113196 +
113197 +create_defines() {
113198 + for i in `seq 0 31`
113199 + do
113200 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
113201 + done
113202 + echo >> "$header1"
113203 +}
113204 +
113205 +create_structs() {
113206 + rm -f "$header1"
113207 +
113208 + create_defines
113209 +
113210 + cat "$database" | while read data
113211 + do
113212 + data_array=($data)
113213 + struct_hash_name="${data_array[0]}"
113214 + funcn="${data_array[1]}"
113215 + params="${data_array[2]}"
113216 + next="${data_array[4]}"
113217 +
113218 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
113219 +
113220 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
113221 + echo -en "\t.param\t= " >> "$header1"
113222 + line=
113223 + for param_num in ${params//-/ };
113224 + do
113225 + line="${line}PARAM"$param_num"|"
113226 + done
113227 +
113228 + echo -e "${line%?},\n};\n" >> "$header1"
113229 + done
113230 +}
113231 +
113232 +create_headers() {
113233 + echo "const struct size_overflow_hash * const $hashtable_name[$n] = {" >> "$header1"
113234 +}
113235 +
113236 +create_array_elements() {
113237 + index=0
113238 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
113239 + do
113240 + data_array=($data)
113241 + i="${data_array[3]}"
113242 + hash="${data_array[0]}"
113243 + while [[ $index -lt $i ]]
113244 + do
113245 + echo -e "\t["$index"]\t= NULL," >> "$header1"
113246 + index=$(($index + 1))
113247 + done
113248 + index=$(($index + 1))
113249 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
113250 + done
113251 + echo '};' >> $header1
113252 +}
113253 +
113254 +size_overflow_plugin_dir=`dirname $header1`
113255 +if [ "$size_overflow_plugin_dir" != '.' ]; then
113256 + mkdir -p "$size_overflow_plugin_dir" 2> /dev/null
113257 +fi
113258 +
113259 +create_structs
113260 +create_headers
113261 +create_array_elements
113262 +
113263 +exit 0
113264 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
113265 new file mode 100644
113266 index 0000000..c43901f
113267 --- /dev/null
113268 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_asm.c
113269 @@ -0,0 +1,748 @@
113270 +/*
113271 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
113272 + * Licensed under the GPL v2, or (at your option) v3
113273 + *
113274 + * Homepage:
113275 + * http://www.grsecurity.net/~ephox/overflow_plugin/
113276 + *
113277 + * Documentation:
113278 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
113279 + *
113280 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
113281 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
113282 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
113283 + *
113284 + * Usage:
113285 + * $ make
113286 + * $ make run
113287 + */
113288 +
113289 +#include "gcc-common.h"
113290 +#include "size_overflow.h"
113291 +
113292 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
113293 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
113294 +
113295 +// data for the size_overflow asm stmt
113296 +struct asm_data {
113297 + gimple def_stmt;
113298 + tree input;
113299 + tree output;
113300 +};
113301 +
113302 +#if BUILDING_GCC_VERSION <= 4007
113303 +static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
113304 +#else
113305 +static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
113306 +#endif
113307 +{
113308 + tree list;
113309 +#if BUILDING_GCC_VERSION <= 4007
113310 + VEC(tree, gc) *vec_list = NULL;
113311 +#else
113312 + vec<tree, va_gc> *vec_list = NULL;
113313 +#endif
113314 +
113315 + list = build_tree_list(NULL_TREE, string);
113316 + list = chainon(NULL_TREE, build_tree_list(list, io));
113317 +#if BUILDING_GCC_VERSION <= 4007
113318 + VEC_safe_push(tree, gc, vec_list, list);
113319 +#else
113320 + vec_safe_push(vec_list, list);
113321 +#endif
113322 + return vec_list;
113323 +}
113324 +
113325 +static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
113326 +{
113327 + gimple asm_stmt;
113328 + gimple_stmt_iterator gsi;
113329 +#if BUILDING_GCC_VERSION <= 4007
113330 + VEC(tree, gc) *input, *output = NULL;
113331 +#else
113332 + vec<tree, va_gc> *input, *output = NULL;
113333 +#endif
113334 +
113335 + input = create_asm_io_list(str_input, asm_data->input);
113336 +
113337 + if (asm_data->output)
113338 + output = create_asm_io_list(str_output, asm_data->output);
113339 +
113340 + asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
113341 + gsi = gsi_for_stmt(asm_data->def_stmt);
113342 + gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
113343 +
113344 + if (asm_data->output)
113345 + SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
113346 +}
113347 +
113348 +static void replace_call_lhs(const struct asm_data *asm_data)
113349 +{
113350 + gimple_set_lhs(asm_data->def_stmt, asm_data->input);
113351 + update_stmt(asm_data->def_stmt);
113352 + SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
113353 +}
113354 +
113355 +static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
113356 +{
113357 + enum mark cur_fndecl_attr;
113358 + gimple phi = get_def_stmt(result);
113359 + unsigned int i, n = gimple_phi_num_args(phi);
113360 +
113361 + pointer_set_insert(visited, phi);
113362 + for (i = 0; i < n; i++) {
113363 + tree arg = gimple_phi_arg_def(phi, i);
113364 +
113365 + cur_fndecl_attr = search_intentional(visited, arg);
113366 + if (cur_fndecl_attr != MARK_NO)
113367 + return cur_fndecl_attr;
113368 + }
113369 + return MARK_NO;
113370 +}
113371 +
113372 +static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
113373 +{
113374 + enum mark cur_fndecl_attr;
113375 + const_tree rhs1, rhs2;
113376 + gimple def_stmt = get_def_stmt(lhs);
113377 +
113378 + rhs1 = gimple_assign_rhs1(def_stmt);
113379 + rhs2 = gimple_assign_rhs2(def_stmt);
113380 +
113381 + cur_fndecl_attr = search_intentional(visited, rhs1);
113382 + if (cur_fndecl_attr != MARK_NO)
113383 + return cur_fndecl_attr;
113384 + return search_intentional(visited, rhs2);
113385 +}
113386 +
113387 +// Look up the intentional_overflow attribute on the caller and the callee functions.
113388 +static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
113389 +{
113390 + const_gimple def_stmt;
113391 +
113392 + if (TREE_CODE(lhs) != SSA_NAME)
113393 + return get_intentional_attr_type(lhs);
113394 +
113395 + def_stmt = get_def_stmt(lhs);
113396 + if (!def_stmt)
113397 + return MARK_NO;
113398 +
113399 + if (pointer_set_contains(visited, def_stmt))
113400 + return MARK_NO;
113401 +
113402 + switch (gimple_code(def_stmt)) {
113403 + case GIMPLE_NOP:
113404 + return search_intentional(visited, SSA_NAME_VAR(lhs));
113405 + case GIMPLE_ASM:
113406 + if (is_size_overflow_intentional_asm_turn_off(def_stmt))
113407 + return MARK_TURN_OFF;
113408 + return MARK_NO;
113409 + case GIMPLE_CALL:
113410 + return MARK_NO;
113411 + case GIMPLE_PHI:
113412 + return search_intentional_phi(visited, lhs);
113413 + case GIMPLE_ASSIGN:
113414 + switch (gimple_num_ops(def_stmt)) {
113415 + case 2:
113416 + return search_intentional(visited, gimple_assign_rhs1(def_stmt));
113417 + case 3:
113418 + return search_intentional_binary(visited, lhs);
113419 + }
113420 + case GIMPLE_RETURN:
113421 + return MARK_NO;
113422 + default:
113423 + debug_gimple_stmt((gimple)def_stmt);
113424 + error("%s: unknown gimple code", __func__);
113425 + gcc_unreachable();
113426 + }
113427 +}
113428 +
113429 +// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
113430 +static enum mark check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
113431 +{
113432 + const_tree fndecl;
113433 + struct pointer_set_t *visited;
113434 + enum mark cur_fndecl_attr, decl_attr = MARK_NO;
113435 +
113436 + fndecl = get_interesting_orig_fndecl(stmt, argnum);
113437 + if (is_end_intentional_intentional_attr(fndecl, argnum))
113438 + decl_attr = MARK_NOT_INTENTIONAL;
113439 + else if (is_yes_intentional_attr(fndecl, argnum))
113440 + decl_attr = MARK_YES;
113441 + else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
113442 + return MARK_TURN_OFF;
113443 + }
113444 +
113445 + visited = pointer_set_create();
113446 + cur_fndecl_attr = search_intentional(visited, arg);
113447 + pointer_set_destroy(visited);
113448 +
113449 + switch (cur_fndecl_attr) {
113450 + case MARK_NO:
113451 + case MARK_TURN_OFF:
113452 + return cur_fndecl_attr;
113453 + default:
113454 + print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
113455 + return MARK_YES;
113456 + }
113457 +}
113458 +
113459 +static void check_missing_size_overflow_attribute(tree var)
113460 +{
113461 + tree orig_fndecl;
113462 + unsigned int num;
113463 +
113464 + if (is_a_return_check(var))
113465 + orig_fndecl = DECL_ORIGIN(var);
113466 + else
113467 + orig_fndecl = DECL_ORIGIN(current_function_decl);
113468 +
113469 + num = get_function_num(var, orig_fndecl);
113470 + if (num == CANNOT_FIND_ARG)
113471 + return;
113472 +
113473 + is_missing_function(orig_fndecl, num);
113474 +}
113475 +
113476 +static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
113477 +{
113478 + gimple phi = get_def_stmt(result);
113479 + unsigned int i, n = gimple_phi_num_args(phi);
113480 +
113481 + pointer_set_insert(visited, phi);
113482 + for (i = 0; i < n; i++) {
113483 + tree arg = gimple_phi_arg_def(phi, i);
113484 +
113485 + search_size_overflow_attribute(visited, arg);
113486 + }
113487 +}
113488 +
113489 +static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
113490 +{
113491 + const_gimple def_stmt = get_def_stmt(lhs);
113492 + tree rhs1, rhs2;
113493 +
113494 + rhs1 = gimple_assign_rhs1(def_stmt);
113495 + rhs2 = gimple_assign_rhs2(def_stmt);
113496 +
113497 + search_size_overflow_attribute(visited, rhs1);
113498 + search_size_overflow_attribute(visited, rhs2);
113499 +}
113500 +
113501 +static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
113502 +{
113503 + const_gimple def_stmt;
113504 +
113505 + if (TREE_CODE(lhs) == PARM_DECL) {
113506 + check_missing_size_overflow_attribute(lhs);
113507 + return;
113508 + }
113509 +
113510 + def_stmt = get_def_stmt(lhs);
113511 + if (!def_stmt)
113512 + return;
113513 +
113514 + if (pointer_set_insert(visited, def_stmt))
113515 + return;
113516 +
113517 + switch (gimple_code(def_stmt)) {
113518 + case GIMPLE_NOP:
113519 + return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
113520 + case GIMPLE_ASM:
113521 + return;
113522 + case GIMPLE_CALL: {
113523 + tree fndecl = gimple_call_fndecl(def_stmt);
113524 +
113525 + if (fndecl == NULL_TREE)
113526 + return;
113527 + check_missing_size_overflow_attribute(fndecl);
113528 + return;
113529 + }
113530 + case GIMPLE_PHI:
113531 + return search_size_overflow_attribute_phi(visited, lhs);
113532 + case GIMPLE_ASSIGN:
113533 + switch (gimple_num_ops(def_stmt)) {
113534 + case 2:
113535 + return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
113536 + case 3:
113537 + return search_size_overflow_attribute_binary(visited, lhs);
113538 + }
113539 + default:
113540 + debug_gimple_stmt((gimple)def_stmt);
113541 + error("%s: unknown gimple code", __func__);
113542 + gcc_unreachable();
113543 + }
113544 +}
113545 +
113546 +// Search missing entries in the hash table (invoked from the gimple pass)
113547 +static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
113548 +{
113549 + tree fndecl = NULL_TREE;
113550 + tree lhs;
113551 + struct pointer_set_t *visited;
113552 +
113553 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
113554 + return;
113555 +
113556 + if (num == 0) {
113557 + gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
113558 + lhs = gimple_return_retval(stmt);
113559 + } else {
113560 + gcc_assert(is_gimple_call(stmt));
113561 + lhs = gimple_call_arg(stmt, num - 1);
113562 + fndecl = gimple_call_fndecl(stmt);
113563 + }
113564 +
113565 + if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
113566 + return;
113567 +
113568 + visited = pointer_set_create();
113569 + search_size_overflow_attribute(visited, lhs);
113570 + pointer_set_destroy(visited);
113571 +}
113572 +
113573 +static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113574 +{
113575 + gimple_stmt_iterator gsi;
113576 + gimple assign;
113577 +
113578 + assign = gimple_build_assign(asm_data->input, asm_data->output);
113579 + gsi = gsi_for_stmt(stmt);
113580 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
113581 + asm_data->def_stmt = assign;
113582 +
113583 + asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
113584 + asm_data->output = make_ssa_name(asm_data->output, stmt);
113585 + if (gimple_code(stmt) == GIMPLE_RETURN)
113586 + gimple_return_set_retval(stmt, asm_data->output);
113587 + else
113588 + gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
113589 + update_stmt(stmt);
113590 +}
113591 +
113592 +static char *create_asm_comment(unsigned int argnum, const_gimple stmt , const char *mark_str)
113593 +{
113594 + const char *fn_name;
113595 + char *asm_comment;
113596 + unsigned int len;
113597 +
113598 + if (argnum == 0)
113599 + fn_name = DECL_NAME_POINTER(current_function_decl);
113600 + else
113601 + fn_name = DECL_NAME_POINTER(gimple_call_fndecl(stmt));
113602 +
113603 + len = asprintf(&asm_comment, "%s %s %u", mark_str, fn_name, argnum);
113604 + gcc_assert(len > 0);
113605 +
113606 + return asm_comment;
113607 +}
113608 +
113609 +static const char *convert_mark_to_str(enum mark mark)
113610 +{
113611 + switch (mark) {
113612 + case MARK_NO:
113613 + return OK_ASM_STR;
113614 + case MARK_YES:
113615 + case MARK_NOT_INTENTIONAL:
113616 + return YES_ASM_STR;
113617 + case MARK_TURN_OFF:
113618 + return TURN_OFF_ASM_STR;
113619 + }
113620 +
113621 + gcc_unreachable();
113622 +}
113623 +
113624 +/* Create the input of the size_overflow asm stmt.
113625 + * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
113626 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113627 + * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
113628 + * otherwise create the input (for a phi stmt the output too) of the asm stmt.
113629 + */
113630 +static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
113631 +{
113632 + if (!asm_data->def_stmt) {
113633 + asm_data->input = NULL_TREE;
113634 + return;
113635 + }
113636 +
113637 + asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
113638 + asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
113639 +
113640 + switch (gimple_code(asm_data->def_stmt)) {
113641 + case GIMPLE_ASSIGN:
113642 + case GIMPLE_CALL:
113643 + replace_call_lhs(asm_data);
113644 + break;
113645 + case GIMPLE_PHI:
113646 + create_output_from_phi(stmt, argnum, asm_data);
113647 + break;
113648 + case GIMPLE_NOP: {
113649 + enum mark mark;
113650 + const char *mark_str;
113651 + char *asm_comment;
113652 +
113653 + mark = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
113654 +
113655 + asm_data->input = asm_data->output;
113656 + asm_data->output = NULL;
113657 + asm_data->def_stmt = stmt;
113658 +
113659 + mark_str = convert_mark_to_str(mark);
113660 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113661 +
113662 + create_asm_stmt(asm_comment, build_string(3, "rm"), NULL, asm_data);
113663 + free(asm_comment);
113664 + asm_data->input = NULL_TREE;
113665 + break;
113666 + }
113667 + case GIMPLE_ASM:
113668 + if (is_size_overflow_asm(asm_data->def_stmt)) {
113669 + asm_data->input = NULL_TREE;
113670 + break;
113671 + }
113672 + default:
113673 + debug_gimple_stmt(asm_data->def_stmt);
113674 + gcc_unreachable();
113675 + }
113676 +}
113677 +
113678 +/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
113679 + * is of the right kind create the appropriate size_overflow asm stmts:
113680 + * __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
113681 + * __asm__("# size_overflow MARK_YES" : : "rm" size_1(D));
113682 + */
113683 +static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
113684 +{
113685 + struct asm_data asm_data;
113686 + const char *mark_str;
113687 + char *asm_comment;
113688 + enum mark mark;
113689 +
113690 + if (is_gimple_constant(output_node))
113691 + return;
113692 +
113693 + asm_data.output = output_node;
113694 + mark = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
113695 + if (mark != MARK_TURN_OFF)
113696 + search_missing_size_overflow_attribute_gimple(stmt, argnum);
113697 +
113698 + asm_data.def_stmt = get_def_stmt(asm_data.output);
113699 + if (is_size_overflow_intentional_asm_turn_off(asm_data.def_stmt))
113700 + return;
113701 +
113702 + create_asm_input(stmt, argnum, &asm_data);
113703 + if (asm_data.input == NULL_TREE)
113704 + return;
113705 +
113706 + mark_str = convert_mark_to_str(mark);
113707 + asm_comment = create_asm_comment(argnum, stmt, mark_str);
113708 + create_asm_stmt(asm_comment, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113709 + free(asm_comment);
113710 +}
113711 +
113712 +// Insert an asm stmt with "MARK_TURN_OFF", "MARK_YES" or "MARK_NOT_INTENTIONAL".
113713 +static bool create_mark_asm(gimple stmt, enum mark mark)
113714 +{
113715 + struct asm_data asm_data;
113716 + const char *asm_str;
113717 +
113718 + switch (mark) {
113719 + case MARK_TURN_OFF:
113720 + asm_str = TURN_OFF_ASM_STR;
113721 + break;
113722 + case MARK_NOT_INTENTIONAL:
113723 + case MARK_YES:
113724 + asm_str = YES_ASM_STR;
113725 + break;
113726 + default:
113727 + gcc_unreachable();
113728 + }
113729 +
113730 + asm_data.def_stmt = stmt;
113731 + asm_data.output = gimple_call_lhs(stmt);
113732 +
113733 + if (asm_data.output == NULL_TREE) {
113734 + asm_data.input = gimple_call_arg(stmt, 0);
113735 + if (is_gimple_constant(asm_data.input))
113736 + return false;
113737 + asm_data.output = NULL;
113738 + create_asm_stmt(asm_str, build_string(3, "rm"), NULL, &asm_data);
113739 + return true;
113740 + }
113741 +
113742 + create_asm_input(stmt, 0, &asm_data);
113743 + gcc_assert(asm_data.input != NULL_TREE);
113744 +
113745 + create_asm_stmt(asm_str, build_string(2, "0"), build_string(4, "=rm"), &asm_data);
113746 + return true;
113747 +}
113748 +
113749 +static void walk_use_def_ptr(struct pointer_set_t *visited, const_tree lhs)
113750 +{
113751 + gimple def_stmt;
113752 +
113753 + def_stmt = get_def_stmt(lhs);
113754 + if (!def_stmt)
113755 + return;
113756 +
113757 + if (pointer_set_insert(visited, def_stmt))
113758 + return;
113759 +
113760 + switch (gimple_code(def_stmt)) {
113761 + case GIMPLE_NOP:
113762 + case GIMPLE_ASM:
113763 + case GIMPLE_CALL:
113764 + break;
113765 + case GIMPLE_PHI: {
113766 + unsigned int i, n = gimple_phi_num_args(def_stmt);
113767 +
113768 + pointer_set_insert(visited, def_stmt);
113769 +
113770 + for (i = 0; i < n; i++) {
113771 + tree arg = gimple_phi_arg_def(def_stmt, i);
113772 +
113773 + walk_use_def_ptr(visited, arg);
113774 + }
113775 + }
113776 + case GIMPLE_ASSIGN:
113777 + switch (gimple_num_ops(def_stmt)) {
113778 + case 2:
113779 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113780 + return;
113781 + case 3:
113782 + walk_use_def_ptr(visited, gimple_assign_rhs1(def_stmt));
113783 + walk_use_def_ptr(visited, gimple_assign_rhs2(def_stmt));
113784 + return;
113785 + default:
113786 + return;
113787 + }
113788 + default:
113789 + debug_gimple_stmt((gimple)def_stmt);
113790 + error("%s: unknown gimple code", __func__);
113791 + gcc_unreachable();
113792 + }
113793 +}
113794 +
113795 +// Look for a ptr - ptr expression (e.g., cpuset_common_file_read() s - page)
113796 +static void insert_mark_not_intentional_asm_at_ptr(const_tree arg)
113797 +{
113798 + struct pointer_set_t *visited;
113799 +
113800 + visited = pointer_set_create();
113801 + walk_use_def_ptr(visited, arg);
113802 + pointer_set_destroy(visited);
113803 +}
113804 +
113805 +// Determine the return value and insert the asm stmt to mark the return stmt.
113806 +static void insert_asm_ret(gimple stmt)
113807 +{
113808 + tree ret;
113809 +
113810 + ret = gimple_return_retval(stmt);
113811 + create_size_overflow_asm(stmt, ret, 0);
113812 +}
113813 +
113814 +// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
113815 +static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
113816 +{
113817 + tree arg;
113818 + unsigned int argnum;
113819 +
113820 + argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
113821 + gcc_assert(argnum != 0);
113822 + if (argnum == CANNOT_FIND_ARG)
113823 + return;
113824 +
113825 + arg = gimple_call_arg(stmt, argnum - 1);
113826 + gcc_assert(arg != NULL_TREE);
113827 +
113828 + // skip all ptr - ptr expressions
113829 + insert_mark_not_intentional_asm_at_ptr(arg);
113830 +
113831 + create_size_overflow_asm(stmt, arg, argnum);
113832 +}
113833 +
113834 +// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
113835 +static void set_argnum_attribute(const_tree attr, bool *argnums)
113836 +{
113837 + unsigned int argnum;
113838 + tree attr_value;
113839 +
113840 + for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
113841 + argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
113842 + argnums[argnum] = true;
113843 + }
113844 +}
113845 +
113846 +// If a function arg or the return value is in the hash table then set its index in the array.
113847 +static void set_argnum_hash(tree fndecl, bool *argnums)
113848 +{
113849 + unsigned int num;
113850 + const struct size_overflow_hash *hash;
113851 +
113852 + hash = get_function_hash(DECL_ORIGIN(fndecl));
113853 + if (!hash)
113854 + return;
113855 +
113856 + for (num = 0; num <= MAX_PARAM; num++) {
113857 + if (!(hash->param & (1U << num)))
113858 + continue;
113859 +
113860 + argnums[num] = true;
113861 + }
113862 +}
113863 +
113864 +static bool is_all_the_argnums_empty(bool *argnums)
113865 +{
113866 + unsigned int i;
113867 +
113868 + for (i = 0; i <= MAX_PARAM; i++)
113869 + if (argnums[i])
113870 + return false;
113871 + return true;
113872 +}
113873 +
113874 +// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
113875 +static void search_interesting_args(tree fndecl, bool *argnums)
113876 +{
113877 + const_tree attr;
113878 +
113879 + set_argnum_hash(fndecl, argnums);
113880 + if (!is_all_the_argnums_empty(argnums))
113881 + return;
113882 +
113883 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
113884 + if (attr && TREE_VALUE(attr))
113885 + set_argnum_attribute(attr, argnums);
113886 +}
113887 +
113888 +/*
113889 + * Look up the intentional_overflow attribute that turns off ipa based duplication
113890 + * on the callee function.
113891 + */
113892 +static bool is_mark_turn_off_attribute(gimple stmt)
113893 +{
113894 + enum mark mark;
113895 + const_tree fndecl = gimple_call_fndecl(stmt);
113896 +
113897 + mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
113898 + if (mark == MARK_TURN_OFF)
113899 + return true;
113900 + return false;
113901 +}
113902 +
113903 +// 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
113904 +static void handle_interesting_function(gimple stmt)
113905 +{
113906 + unsigned int argnum;
113907 + tree fndecl;
113908 + bool orig_argnums[MAX_PARAM + 1] = {false};
113909 +
113910 + if (gimple_call_num_args(stmt) == 0)
113911 + return;
113912 + fndecl = gimple_call_fndecl(stmt);
113913 + if (fndecl == NULL_TREE)
113914 + return;
113915 + fndecl = DECL_ORIGIN(fndecl);
113916 +
113917 + if (is_mark_turn_off_attribute(stmt)) {
113918 + create_mark_asm(stmt, MARK_TURN_OFF);
113919 + return;
113920 + }
113921 +
113922 + search_interesting_args(fndecl, orig_argnums);
113923 +
113924 + for (argnum = 1; argnum < MAX_PARAM; argnum++)
113925 + if (orig_argnums[argnum])
113926 + insert_asm_arg(stmt, argnum);
113927 +}
113928 +
113929 +// 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
113930 +static void handle_interesting_ret(gimple stmt)
113931 +{
113932 + bool orig_argnums[MAX_PARAM + 1] = {false};
113933 +
113934 + search_interesting_args(current_function_decl, orig_argnums);
113935 +
113936 + if (orig_argnums[0])
113937 + insert_asm_ret(stmt);
113938 +}
113939 +
113940 +// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
113941 +static unsigned int search_interesting_functions(void)
113942 +{
113943 + basic_block bb;
113944 +
113945 + FOR_ALL_BB_FN(bb, cfun) {
113946 + gimple_stmt_iterator gsi;
113947 +
113948 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
113949 + gimple stmt = gsi_stmt(gsi);
113950 +
113951 + if (is_size_overflow_asm(stmt))
113952 + continue;
113953 +
113954 + if (is_gimple_call(stmt))
113955 + handle_interesting_function(stmt);
113956 + else if (gimple_code(stmt) == GIMPLE_RETURN)
113957 + handle_interesting_ret(stmt);
113958 + }
113959 + }
113960 + return 0;
113961 +}
113962 +
113963 +/*
113964 + * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
113965 + * this pass inserts asm stmts to mark the interesting args
113966 + * that the ipa pass will detect and insert the size overflow checks for.
113967 + */
113968 +#if BUILDING_GCC_VERSION >= 4009
113969 +static const struct pass_data insert_size_overflow_asm_pass_data = {
113970 +#else
113971 +static struct gimple_opt_pass insert_size_overflow_asm_pass = {
113972 + .pass = {
113973 +#endif
113974 + .type = GIMPLE_PASS,
113975 + .name = "insert_size_overflow_asm",
113976 +#if BUILDING_GCC_VERSION >= 4008
113977 + .optinfo_flags = OPTGROUP_NONE,
113978 +#endif
113979 +#if BUILDING_GCC_VERSION >= 4009
113980 + .has_gate = false,
113981 + .has_execute = true,
113982 +#else
113983 + .gate = NULL,
113984 + .execute = search_interesting_functions,
113985 + .sub = NULL,
113986 + .next = NULL,
113987 + .static_pass_number = 0,
113988 +#endif
113989 + .tv_id = TV_NONE,
113990 + .properties_required = PROP_cfg,
113991 + .properties_provided = 0,
113992 + .properties_destroyed = 0,
113993 + .todo_flags_start = 0,
113994 + .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
113995 +#if BUILDING_GCC_VERSION < 4009
113996 + }
113997 +#endif
113998 +};
113999 +
114000 +#if BUILDING_GCC_VERSION >= 4009
114001 +namespace {
114002 +class insert_size_overflow_asm_pass : public gimple_opt_pass {
114003 +public:
114004 + insert_size_overflow_asm_pass() : gimple_opt_pass(insert_size_overflow_asm_pass_data, g) {}
114005 + unsigned int execute() { return search_interesting_functions(); }
114006 +};
114007 +}
114008 +#endif
114009 +
114010 +struct opt_pass *make_insert_size_overflow_asm_pass(void)
114011 +{
114012 +#if BUILDING_GCC_VERSION >= 4009
114013 + return new insert_size_overflow_asm_pass();
114014 +#else
114015 + return &insert_size_overflow_asm_pass.pass;
114016 +#endif
114017 +}
114018 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
114019 new file mode 100644
114020 index 0000000..73f0a12
114021 --- /dev/null
114022 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_core.c
114023 @@ -0,0 +1,943 @@
114024 +/*
114025 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114026 + * Licensed under the GPL v2, or (at your option) v3
114027 + *
114028 + * Homepage:
114029 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114030 + *
114031 + * Documentation:
114032 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114033 + *
114034 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114035 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114036 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114037 + *
114038 + * Usage:
114039 + * $ make
114040 + * $ make run
114041 + */
114042 +
114043 +#include "gcc-common.h"
114044 +#include "size_overflow.h"
114045 +
114046 +#define MIN_CHECK true
114047 +#define MAX_CHECK false
114048 +
114049 +static tree get_size_overflow_type(struct visited *visited, const_gimple stmt, const_tree node)
114050 +{
114051 + const_tree type;
114052 + tree new_type;
114053 +
114054 + gcc_assert(node != NULL_TREE);
114055 +
114056 + type = TREE_TYPE(node);
114057 +
114058 + if (pointer_set_contains(visited->my_stmts, stmt))
114059 + return TREE_TYPE(node);
114060 +
114061 + switch (TYPE_MODE(type)) {
114062 + case QImode:
114063 + new_type = size_overflow_type_HI;
114064 + break;
114065 + case HImode:
114066 + new_type = size_overflow_type_SI;
114067 + break;
114068 + case SImode:
114069 + new_type = size_overflow_type_DI;
114070 + break;
114071 + case DImode:
114072 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
114073 + new_type = TYPE_UNSIGNED(type) ? unsigned_intDI_type_node : intDI_type_node;
114074 + else
114075 + new_type = size_overflow_type_TI;
114076 + break;
114077 + case TImode:
114078 + gcc_assert(!TYPE_UNSIGNED(type));
114079 + new_type = size_overflow_type_TI;
114080 + break;
114081 + default:
114082 + debug_tree((tree)node);
114083 + error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
114084 + gcc_unreachable();
114085 + }
114086 +
114087 + if (TYPE_QUALS(type) != 0)
114088 + return build_qualified_type(new_type, TYPE_QUALS(type));
114089 + return new_type;
114090 +}
114091 +
114092 +static tree get_lhs(const_gimple stmt)
114093 +{
114094 + switch (gimple_code(stmt)) {
114095 + case GIMPLE_ASSIGN:
114096 + case GIMPLE_CALL:
114097 + return gimple_get_lhs(stmt);
114098 + case GIMPLE_PHI:
114099 + return gimple_phi_result(stmt);
114100 + default:
114101 + return NULL_TREE;
114102 + }
114103 +}
114104 +
114105 +static tree cast_to_new_size_overflow_type(struct visited *visited, gimple stmt, tree rhs, tree size_overflow_type, bool before)
114106 +{
114107 + gimple_stmt_iterator gsi;
114108 + tree lhs;
114109 + gimple new_stmt;
114110 +
114111 + if (rhs == NULL_TREE)
114112 + return NULL_TREE;
114113 +
114114 + gsi = gsi_for_stmt(stmt);
114115 + new_stmt = build_cast_stmt(visited, size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
114116 + pointer_set_insert(visited->my_stmts, new_stmt);
114117 +
114118 + lhs = get_lhs(new_stmt);
114119 + gcc_assert(lhs != NULL_TREE);
114120 + return lhs;
114121 +}
114122 +
114123 +tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before)
114124 +{
114125 + tree lhs, dst_type;
114126 + gimple_stmt_iterator gsi;
114127 +
114128 + if (rhs1 == NULL_TREE) {
114129 + debug_gimple_stmt(oldstmt);
114130 + error("%s: rhs1 is NULL_TREE", __func__);
114131 + gcc_unreachable();
114132 + }
114133 +
114134 + switch (gimple_code(oldstmt)) {
114135 + case GIMPLE_ASM:
114136 + lhs = rhs1;
114137 + break;
114138 + case GIMPLE_CALL:
114139 + case GIMPLE_ASSIGN:
114140 + lhs = gimple_get_lhs(oldstmt);
114141 + break;
114142 + default:
114143 + debug_gimple_stmt(oldstmt);
114144 + gcc_unreachable();
114145 + }
114146 +
114147 + gsi = gsi_for_stmt(oldstmt);
114148 + pointer_set_insert(visited->stmts, oldstmt);
114149 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
114150 + basic_block next_bb, cur_bb;
114151 + const_edge e;
114152 +
114153 + gcc_assert(before == false);
114154 + gcc_assert(stmt_can_throw_internal(oldstmt));
114155 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
114156 + gcc_assert(!gsi_end_p(gsi));
114157 +
114158 + cur_bb = gimple_bb(oldstmt);
114159 + next_bb = cur_bb->next_bb;
114160 + e = find_edge(cur_bb, next_bb);
114161 + gcc_assert(e != NULL);
114162 + gcc_assert(e->flags & EDGE_FALLTHRU);
114163 +
114164 + gsi = gsi_after_labels(next_bb);
114165 + gcc_assert(!gsi_end_p(gsi));
114166 +
114167 + before = true;
114168 + oldstmt = gsi_stmt(gsi);
114169 + }
114170 +
114171 + dst_type = get_size_overflow_type(visited, oldstmt, lhs);
114172 +
114173 + if (is_gimple_constant(rhs1))
114174 + return cast_a_tree(dst_type, rhs1);
114175 + return cast_to_new_size_overflow_type(visited, oldstmt, rhs1, dst_type, before);
114176 +}
114177 +
114178 +tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
114179 +{
114180 + gimple stmt;
114181 + gimple_stmt_iterator gsi;
114182 + tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
114183 +
114184 + if (pointer_set_contains(visited->my_stmts, oldstmt))
114185 + return lhs;
114186 +
114187 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
114188 + rhs1 = gimple_assign_rhs1(oldstmt);
114189 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
114190 + }
114191 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
114192 + rhs2 = gimple_assign_rhs2(oldstmt);
114193 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
114194 + }
114195 +
114196 + stmt = gimple_copy(oldstmt);
114197 + gimple_set_location(stmt, gimple_location(oldstmt));
114198 + pointer_set_insert(visited->my_stmts, stmt);
114199 +
114200 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
114201 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
114202 +
114203 + size_overflow_type = get_size_overflow_type(visited, oldstmt, node);
114204 +
114205 + new_var = create_new_var(size_overflow_type);
114206 + new_var = make_ssa_name(new_var, stmt);
114207 + gimple_assign_set_lhs(stmt, new_var);
114208 +
114209 + if (rhs1 != NULL_TREE)
114210 + gimple_assign_set_rhs1(stmt, rhs1);
114211 +
114212 + if (rhs2 != NULL_TREE)
114213 + gimple_assign_set_rhs2(stmt, rhs2);
114214 +#if BUILDING_GCC_VERSION >= 4006
114215 + if (rhs3 != NULL_TREE)
114216 + gimple_assign_set_rhs3(stmt, rhs3);
114217 +#endif
114218 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
114219 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
114220 +
114221 + gsi = gsi_for_stmt(oldstmt);
114222 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
114223 + update_stmt(stmt);
114224 + pointer_set_insert(visited->stmts, oldstmt);
114225 + return gimple_assign_lhs(stmt);
114226 +}
114227 +
114228 +static tree cast_parm_decl(struct visited *visited, tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
114229 +{
114230 + gimple assign;
114231 + gimple_stmt_iterator gsi;
114232 + basic_block first_bb;
114233 +
114234 + gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
114235 +
114236 + if (bb->index == 0) {
114237 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
114238 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
114239 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
114240 + bb = first_bb;
114241 + }
114242 +
114243 + gsi = gsi_after_labels(bb);
114244 + assign = build_cast_stmt(visited, size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
114245 + pointer_set_insert(visited->my_stmts, assign);
114246 +
114247 + return gimple_assign_lhs(assign);
114248 +}
114249 +
114250 +static tree use_phi_ssa_name(struct visited *visited, tree ssa_name_var, tree new_arg)
114251 +{
114252 + gimple_stmt_iterator gsi;
114253 + gimple assign, def_stmt = get_def_stmt(new_arg);
114254 +
114255 + if (gimple_code(def_stmt) == GIMPLE_PHI) {
114256 + gsi = gsi_after_labels(gimple_bb(def_stmt));
114257 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
114258 + } else {
114259 + gsi = gsi_for_stmt(def_stmt);
114260 + assign = build_cast_stmt(visited, TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
114261 + }
114262 +
114263 + pointer_set_insert(visited->my_stmts, assign);
114264 + return gimple_assign_lhs(assign);
114265 +}
114266 +
114267 +static tree cast_visited_phi_arg(struct visited *visited, tree ssa_name_var, tree arg, tree size_overflow_type)
114268 +{
114269 + basic_block bb;
114270 + gimple_stmt_iterator gsi;
114271 + const_gimple def_stmt;
114272 + gimple assign;
114273 +
114274 + def_stmt = get_def_stmt(arg);
114275 + bb = gimple_bb(def_stmt);
114276 + gcc_assert(bb->index != 0);
114277 + gsi = gsi_after_labels(bb);
114278 +
114279 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
114280 + pointer_set_insert(visited->my_stmts, assign);
114281 + return gimple_assign_lhs(assign);
114282 +}
114283 +
114284 +static tree create_new_phi_arg(struct visited *visited, tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
114285 +{
114286 + tree size_overflow_type;
114287 + tree arg;
114288 + const_gimple def_stmt;
114289 +
114290 + if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
114291 + return new_arg;
114292 +
114293 + arg = gimple_phi_arg_def(oldstmt, i);
114294 + def_stmt = get_def_stmt(arg);
114295 + gcc_assert(def_stmt != NULL);
114296 + size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114297 +
114298 + switch (gimple_code(def_stmt)) {
114299 + case GIMPLE_PHI:
114300 + return cast_visited_phi_arg(visited, ssa_name_var, arg, size_overflow_type);
114301 + case GIMPLE_NOP: {
114302 + basic_block bb;
114303 +
114304 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
114305 + return cast_parm_decl(visited, ssa_name_var, arg, size_overflow_type, bb);
114306 + }
114307 + case GIMPLE_ASM: {
114308 + gimple_stmt_iterator gsi;
114309 + gimple assign, stmt = get_def_stmt(arg);
114310 +
114311 + gsi = gsi_for_stmt(stmt);
114312 + assign = build_cast_stmt(visited, size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
114313 + pointer_set_insert(visited->my_stmts, assign);
114314 + return gimple_assign_lhs(assign);
114315 + }
114316 + default:
114317 + gcc_assert(new_arg != NULL_TREE);
114318 + gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
114319 + return use_phi_ssa_name(visited, ssa_name_var, new_arg);
114320 + }
114321 +}
114322 +
114323 +static gimple overflow_create_phi_node(struct visited *visited, gimple oldstmt, tree result)
114324 +{
114325 + basic_block bb;
114326 + gimple phi;
114327 + gimple_seq seq;
114328 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
114329 +
114330 + bb = gsi_bb(gsi);
114331 +
114332 + if (result == NULL_TREE) {
114333 + tree old_result = gimple_phi_result(oldstmt);
114334 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, old_result);
114335 +
114336 + result = create_new_var(size_overflow_type);
114337 + }
114338 +
114339 + phi = create_phi_node(result, bb);
114340 + gimple_phi_set_result(phi, make_ssa_name(result, phi));
114341 + seq = phi_nodes(bb);
114342 + gsi = gsi_last(seq);
114343 + gsi_remove(&gsi, false);
114344 +
114345 + gsi = gsi_for_stmt(oldstmt);
114346 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
114347 + gimple_set_bb(phi, bb);
114348 + return phi;
114349 +}
114350 +
114351 +#if BUILDING_GCC_VERSION <= 4007
114352 +static tree create_new_phi_node(struct visited *visited, VEC(tree, heap) **args, tree ssa_name_var, gimple oldstmt)
114353 +#else
114354 +static tree create_new_phi_node(struct visited *visited, vec<tree, va_heap, vl_embed> *&args, tree ssa_name_var, gimple oldstmt)
114355 +#endif
114356 +{
114357 + gimple new_phi;
114358 + unsigned int i;
114359 + tree arg, result;
114360 + location_t loc = gimple_location(oldstmt);
114361 +
114362 +#if BUILDING_GCC_VERSION <= 4007
114363 + gcc_assert(!VEC_empty(tree, *args));
114364 +#else
114365 + gcc_assert(!args->is_empty());
114366 +#endif
114367 +
114368 + new_phi = overflow_create_phi_node(visited, oldstmt, ssa_name_var);
114369 + result = gimple_phi_result(new_phi);
114370 + ssa_name_var = SSA_NAME_VAR(result);
114371 +
114372 +#if BUILDING_GCC_VERSION <= 4007
114373 + FOR_EACH_VEC_ELT(tree, *args, i, arg) {
114374 +#else
114375 + FOR_EACH_VEC_SAFE_ELT(args, i, arg) {
114376 +#endif
114377 + arg = create_new_phi_arg(visited, ssa_name_var, arg, oldstmt, i);
114378 + add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
114379 + }
114380 +
114381 +#if BUILDING_GCC_VERSION <= 4007
114382 + VEC_free(tree, heap, *args);
114383 +#else
114384 + vec_free(args);
114385 +#endif
114386 + update_stmt(new_phi);
114387 + pointer_set_insert(visited->my_stmts, new_phi);
114388 + return result;
114389 +}
114390 +
114391 +static tree handle_phi(struct visited *visited, struct cgraph_node *caller_node, tree orig_result)
114392 +{
114393 + tree ssa_name_var = NULL_TREE;
114394 +#if BUILDING_GCC_VERSION <= 4007
114395 + VEC(tree, heap) *args = NULL;
114396 +#else
114397 + vec<tree, va_heap, vl_embed> *args = NULL;
114398 +#endif
114399 + gimple oldstmt = get_def_stmt(orig_result);
114400 + unsigned int i, len = gimple_phi_num_args(oldstmt);
114401 +
114402 + pointer_set_insert(visited->stmts, oldstmt);
114403 + for (i = 0; i < len; i++) {
114404 + tree arg, new_arg;
114405 +
114406 + arg = gimple_phi_arg_def(oldstmt, i);
114407 + new_arg = expand(visited, caller_node, arg);
114408 +
114409 + if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
114410 + ssa_name_var = SSA_NAME_VAR(new_arg);
114411 +
114412 + if (is_gimple_constant(arg)) {
114413 + tree size_overflow_type = get_size_overflow_type(visited, oldstmt, arg);
114414 +
114415 + new_arg = cast_a_tree(size_overflow_type, arg);
114416 + }
114417 +
114418 +#if BUILDING_GCC_VERSION <= 4007
114419 + VEC_safe_push(tree, heap, args, new_arg);
114420 +#else
114421 + vec_safe_push(args, new_arg);
114422 +#endif
114423 + }
114424 +
114425 +#if BUILDING_GCC_VERSION <= 4007
114426 + return create_new_phi_node(visited, &args, ssa_name_var, oldstmt);
114427 +#else
114428 + return create_new_phi_node(visited, args, ssa_name_var, oldstmt);
114429 +#endif
114430 +}
114431 +
114432 +static tree create_cast_assign(struct visited *visited, gimple stmt)
114433 +{
114434 + tree rhs1 = gimple_assign_rhs1(stmt);
114435 + tree lhs = gimple_assign_lhs(stmt);
114436 + const_tree rhs1_type = TREE_TYPE(rhs1);
114437 + const_tree lhs_type = TREE_TYPE(lhs);
114438 +
114439 + if (TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
114440 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114441 +
114442 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
114443 +}
114444 +
114445 +static bool skip_lhs_cast_check(const_gimple stmt)
114446 +{
114447 + const_tree rhs = gimple_assign_rhs1(stmt);
114448 + const_gimple def_stmt = get_def_stmt(rhs);
114449 +
114450 + // 3.8.2 kernel/futex_compat.c compat_exit_robust_list(): get_user() 64 ulong -> int (compat_long_t), int max
114451 + if (gimple_code(def_stmt) == GIMPLE_ASM)
114452 + return true;
114453 +
114454 + if (is_const_plus_unsigned_signed_truncation(rhs))
114455 + return true;
114456 +
114457 + return false;
114458 +}
114459 +
114460 +static tree create_string_param(tree string)
114461 +{
114462 + tree i_type, a_type;
114463 + const int length = TREE_STRING_LENGTH(string);
114464 +
114465 + gcc_assert(length > 0);
114466 +
114467 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
114468 + a_type = build_array_type(char_type_node, i_type);
114469 +
114470 + TREE_TYPE(string) = a_type;
114471 + TREE_CONSTANT(string) = 1;
114472 + TREE_READONLY(string) = 1;
114473 +
114474 + return build1(ADDR_EXPR, ptr_type_node, string);
114475 +}
114476 +
114477 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
114478 +{
114479 + gimple cond_stmt;
114480 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
114481 +
114482 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
114483 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
114484 + update_stmt(cond_stmt);
114485 +}
114486 +
114487 +static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
114488 +{
114489 + gimple func_stmt;
114490 + const_gimple def_stmt;
114491 + const_tree loc_line;
114492 + tree loc_file, ssa_name, current_func;
114493 + expanded_location xloc;
114494 + char *ssa_name_buf;
114495 + int len;
114496 + struct cgraph_edge *edge;
114497 + struct cgraph_node *callee_node;
114498 + int frequency;
114499 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
114500 +
114501 + def_stmt = get_def_stmt(arg);
114502 + xloc = expand_location(gimple_location(def_stmt));
114503 +
114504 + if (!gimple_has_location(def_stmt)) {
114505 + xloc = expand_location(gimple_location(stmt));
114506 + if (!gimple_has_location(stmt))
114507 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
114508 + }
114509 +
114510 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
114511 +
114512 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
114513 + loc_file = create_string_param(loc_file);
114514 +
114515 + current_func = build_string(DECL_NAME_LENGTH(current_function_decl) + 1, DECL_NAME_POINTER(current_function_decl));
114516 + current_func = create_string_param(current_func);
114517 +
114518 + gcc_assert(DECL_NAME(SSA_NAME_VAR(arg)) != NULL);
114519 + call_count++;
114520 + len = asprintf(&ssa_name_buf, "%s_%u %s, count: %u\n", DECL_NAME_POINTER(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max", call_count);
114521 + gcc_assert(len > 0);
114522 + ssa_name = build_string(len + 1, ssa_name_buf);
114523 + free(ssa_name_buf);
114524 + ssa_name = create_string_param(ssa_name);
114525 +
114526 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
114527 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
114528 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
114529 +
114530 + callee_node = cgraph_get_create_node(report_size_overflow_decl);
114531 + frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
114532 +
114533 + edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
114534 + gcc_assert(edge != NULL);
114535 +}
114536 +
114537 +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)
114538 +{
114539 + basic_block cond_bb, join_bb, bb_true;
114540 + edge e;
114541 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
114542 +
114543 + cond_bb = gimple_bb(stmt);
114544 + if (before)
114545 + gsi_prev(&gsi);
114546 + if (gsi_end_p(gsi))
114547 + e = split_block_after_labels(cond_bb);
114548 + else
114549 + e = split_block(cond_bb, gsi_stmt(gsi));
114550 + cond_bb = e->src;
114551 + join_bb = e->dest;
114552 + e->flags = EDGE_FALSE_VALUE;
114553 + e->probability = REG_BR_PROB_BASE;
114554 +
114555 + bb_true = create_empty_bb(cond_bb);
114556 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
114557 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
114558 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
114559 +
114560 + gcc_assert(dom_info_available_p(CDI_DOMINATORS));
114561 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
114562 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
114563 +
114564 + if (current_loops != NULL) {
114565 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
114566 + add_bb_to_loop(bb_true, cond_bb->loop_father);
114567 + }
114568 +
114569 + insert_cond(cond_bb, arg, cond_code, type_value);
114570 + insert_cond_result(caller_node, bb_true, stmt, arg, min);
114571 +
114572 +// print_the_code_insertions(stmt);
114573 +}
114574 +
114575 +void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
114576 +{
114577 + const_tree rhs_type = TREE_TYPE(rhs);
114578 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
114579 +
114580 + gcc_assert(rhs_type != NULL_TREE);
114581 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
114582 + return;
114583 +
114584 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
114585 +
114586 + if (is_const_plus_unsigned_signed_truncation(rhs))
114587 + return;
114588 +
114589 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
114590 + // typemax (-1) < typemin (0)
114591 + if (TREE_OVERFLOW(type_max))
114592 + return;
114593 +
114594 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
114595 +
114596 + cast_rhs_type = TREE_TYPE(cast_rhs);
114597 + type_max_type = TREE_TYPE(type_max);
114598 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
114599 +
114600 + insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
114601 +
114602 + // special case: get_size_overflow_type(), 32, u64->s
114603 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && TYPE_UNSIGNED(size_overflow_type) && !TYPE_UNSIGNED(rhs_type))
114604 + return;
114605 +
114606 + type_min_type = TREE_TYPE(type_min);
114607 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
114608 + insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
114609 +}
114610 +
114611 +static tree create_cast_overflow_check(struct visited *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
114612 +{
114613 + bool cast_lhs, cast_rhs;
114614 + tree lhs = gimple_assign_lhs(stmt);
114615 + tree rhs = gimple_assign_rhs1(stmt);
114616 + const_tree lhs_type = TREE_TYPE(lhs);
114617 + const_tree rhs_type = TREE_TYPE(rhs);
114618 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
114619 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
114620 + unsigned int lhs_size = GET_MODE_BITSIZE(lhs_mode);
114621 + unsigned int rhs_size = GET_MODE_BITSIZE(rhs_mode);
114622 +
114623 + static bool check_lhs[3][4] = {
114624 + // ss su us uu
114625 + { false, true, true, false }, // lhs > rhs
114626 + { false, false, false, false }, // lhs = rhs
114627 + { true, true, true, true }, // lhs < rhs
114628 + };
114629 +
114630 + static bool check_rhs[3][4] = {
114631 + // ss su us uu
114632 + { true, false, true, true }, // lhs > rhs
114633 + { true, false, true, true }, // lhs = rhs
114634 + { true, false, true, true }, // lhs < rhs
114635 + };
114636 +
114637 + // skip lhs check on signed SI -> HI cast or signed SI -> QI cast !!!!
114638 + if (rhs_mode == SImode && !TYPE_UNSIGNED(rhs_type) && (lhs_mode == HImode || lhs_mode == QImode))
114639 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114640 +
114641 + if (lhs_size > rhs_size) {
114642 + cast_lhs = check_lhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114643 + cast_rhs = check_rhs[0][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114644 + } else if (lhs_size == rhs_size) {
114645 + cast_lhs = check_lhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114646 + cast_rhs = check_rhs[1][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114647 + } else {
114648 + cast_lhs = check_lhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114649 + cast_rhs = check_rhs[2][TYPE_UNSIGNED(rhs_type) + 2 * TYPE_UNSIGNED(lhs_type)];
114650 + }
114651 +
114652 + if (!cast_lhs && !cast_rhs)
114653 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114654 +
114655 + if (cast_lhs && !skip_lhs_cast_check(stmt))
114656 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
114657 +
114658 + if (cast_rhs)
114659 + check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
114660 +
114661 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114662 +}
114663 +
114664 +static tree handle_unary_rhs(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114665 +{
114666 + enum tree_code rhs_code;
114667 + tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
114668 +
114669 + if (pointer_set_contains(visited->my_stmts, stmt))
114670 + return lhs;
114671 +
114672 + rhs1 = gimple_assign_rhs1(stmt);
114673 + if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
114674 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114675 +
114676 + new_rhs1 = expand(visited, caller_node, rhs1);
114677 +
114678 + if (new_rhs1 == NULL_TREE)
114679 + return create_cast_assign(visited, stmt);
114680 +
114681 + if (pointer_set_contains(visited->no_cast_check, stmt))
114682 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114683 +
114684 + rhs_code = gimple_assign_rhs_code(stmt);
114685 + if (rhs_code == BIT_NOT_EXPR || rhs_code == NEGATE_EXPR) {
114686 + tree size_overflow_type = get_size_overflow_type(visited, stmt, rhs1);
114687 +
114688 + new_rhs1 = cast_to_new_size_overflow_type(visited, stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
114689 + check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
114690 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114691 + }
114692 +
114693 + if (!gimple_assign_cast_p(stmt))
114694 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
114695 +
114696 + return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
114697 +}
114698 +
114699 +static tree handle_unary_ops(struct visited *visited, struct cgraph_node *caller_node, gimple stmt)
114700 +{
114701 + tree rhs1, lhs = gimple_assign_lhs(stmt);
114702 + gimple def_stmt = get_def_stmt(lhs);
114703 +
114704 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
114705 + rhs1 = gimple_assign_rhs1(def_stmt);
114706 +
114707 + if (is_gimple_constant(rhs1))
114708 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114709 +
114710 + switch (TREE_CODE(rhs1)) {
114711 + case SSA_NAME: {
114712 + tree ret = handle_unary_rhs(visited, caller_node, def_stmt);
114713 +
114714 + if (gimple_assign_cast_p(stmt))
114715 + unsigned_signed_cast_intentional_overflow(visited, stmt);
114716 + return ret;
114717 + }
114718 + case ARRAY_REF:
114719 + case BIT_FIELD_REF:
114720 + case ADDR_EXPR:
114721 + case COMPONENT_REF:
114722 + case INDIRECT_REF:
114723 +#if BUILDING_GCC_VERSION >= 4006
114724 + case MEM_REF:
114725 +#endif
114726 + case TARGET_MEM_REF:
114727 + case VIEW_CONVERT_EXPR:
114728 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114729 + case PARM_DECL:
114730 + case VAR_DECL:
114731 + return create_assign(visited, stmt, lhs, AFTER_STMT);
114732 +
114733 + default:
114734 + debug_gimple_stmt(def_stmt);
114735 + debug_tree(rhs1);
114736 + gcc_unreachable();
114737 + }
114738 +}
114739 +
114740 +static void __unused print_the_code_insertions(const_gimple stmt)
114741 +{
114742 + location_t loc = gimple_location(stmt);
114743 +
114744 + inform(loc, "Integer size_overflow check applied here.");
114745 +}
114746 +
114747 +static bool is_from_cast(const_tree node)
114748 +{
114749 + gimple def_stmt = get_def_stmt(node);
114750 +
114751 + if (!def_stmt)
114752 + return false;
114753 +
114754 + if (gimple_assign_cast_p(def_stmt))
114755 + return true;
114756 +
114757 + return false;
114758 +}
114759 +
114760 +// Skip duplication when there is a minus expr and the type of rhs1 or rhs2 is a pointer_type.
114761 +static bool is_a_ptr_minus(gimple stmt)
114762 +{
114763 + const_tree rhs1, rhs2, ptr1_rhs, ptr2_rhs;
114764 +
114765 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
114766 + return false;
114767 +
114768 + rhs1 = gimple_assign_rhs1(stmt);
114769 + if (!is_from_cast(rhs1))
114770 + return false;
114771 +
114772 + rhs2 = gimple_assign_rhs2(stmt);
114773 + if (!is_from_cast(rhs2))
114774 + return false;
114775 +
114776 + ptr1_rhs = gimple_assign_rhs1(get_def_stmt(rhs1));
114777 + ptr2_rhs = gimple_assign_rhs1(get_def_stmt(rhs2));
114778 +
114779 + if (TREE_CODE(TREE_TYPE(ptr1_rhs)) != POINTER_TYPE && TREE_CODE(TREE_TYPE(ptr2_rhs)) != POINTER_TYPE)
114780 + return false;
114781 +
114782 + return true;
114783 +}
114784 +
114785 +static tree handle_binary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114786 +{
114787 + enum intentional_overflow_type res;
114788 + tree rhs1, rhs2, new_lhs;
114789 + gimple def_stmt = get_def_stmt(lhs);
114790 + tree new_rhs1 = NULL_TREE;
114791 + tree new_rhs2 = NULL_TREE;
114792 +
114793 + if (is_a_ptr_minus(def_stmt))
114794 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114795 +
114796 + rhs1 = gimple_assign_rhs1(def_stmt);
114797 + rhs2 = gimple_assign_rhs2(def_stmt);
114798 +
114799 + /* no DImode/TImode division in the 32/64 bit kernel */
114800 + switch (gimple_assign_rhs_code(def_stmt)) {
114801 + case RDIV_EXPR:
114802 + case TRUNC_DIV_EXPR:
114803 + case CEIL_DIV_EXPR:
114804 + case FLOOR_DIV_EXPR:
114805 + case ROUND_DIV_EXPR:
114806 + case TRUNC_MOD_EXPR:
114807 + case CEIL_MOD_EXPR:
114808 + case FLOOR_MOD_EXPR:
114809 + case ROUND_MOD_EXPR:
114810 + case EXACT_DIV_EXPR:
114811 + case POINTER_PLUS_EXPR:
114812 + case BIT_AND_EXPR:
114813 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114814 + default:
114815 + break;
114816 + }
114817 +
114818 + new_lhs = handle_integer_truncation(visited, caller_node, lhs);
114819 + if (new_lhs != NULL_TREE)
114820 + return new_lhs;
114821 +
114822 + if (TREE_CODE(rhs1) == SSA_NAME)
114823 + new_rhs1 = expand(visited, caller_node, rhs1);
114824 + if (TREE_CODE(rhs2) == SSA_NAME)
114825 + new_rhs2 = expand(visited, caller_node, rhs2);
114826 +
114827 + res = add_mul_intentional_overflow(def_stmt);
114828 + if (res != NO_INTENTIONAL_OVERFLOW) {
114829 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114830 + insert_cast_expr(visited, get_def_stmt(new_lhs), res);
114831 + return new_lhs;
114832 + }
114833 +
114834 + if (skip_expr_on_double_type(def_stmt)) {
114835 + new_lhs = dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114836 + insert_cast_expr(visited, get_def_stmt(new_lhs), NO_INTENTIONAL_OVERFLOW);
114837 + return new_lhs;
114838 + }
114839 +
114840 + if (is_a_neg_overflow(def_stmt, rhs2))
114841 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
114842 + if (is_a_neg_overflow(def_stmt, rhs1))
114843 + return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
114844 +
114845 +
114846 + if (is_a_constant_overflow(def_stmt, rhs2))
114847 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
114848 + if (is_a_constant_overflow(def_stmt, rhs1))
114849 + return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
114850 +
114851 + // the const is between 0 and (signed) MAX
114852 + if (is_gimple_constant(rhs1))
114853 + new_rhs1 = create_assign(visited, def_stmt, rhs1, BEFORE_STMT);
114854 + if (is_gimple_constant(rhs2))
114855 + new_rhs2 = create_assign(visited, def_stmt, rhs2, BEFORE_STMT);
114856 +
114857 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
114858 +}
114859 +
114860 +#if BUILDING_GCC_VERSION >= 4006
114861 +static tree get_new_rhs(struct visited *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
114862 +{
114863 + if (is_gimple_constant(rhs))
114864 + return cast_a_tree(size_overflow_type, rhs);
114865 + if (TREE_CODE(rhs) != SSA_NAME)
114866 + return NULL_TREE;
114867 + return expand(visited, caller_node, rhs);
114868 +}
114869 +
114870 +static tree handle_ternary_ops(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114871 +{
114872 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
114873 + gimple def_stmt = get_def_stmt(lhs);
114874 +
114875 + size_overflow_type = get_size_overflow_type(visited, def_stmt, lhs);
114876 +
114877 + rhs1 = gimple_assign_rhs1(def_stmt);
114878 + rhs2 = gimple_assign_rhs2(def_stmt);
114879 + rhs3 = gimple_assign_rhs3(def_stmt);
114880 + new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
114881 + new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
114882 + new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
114883 +
114884 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
114885 +}
114886 +#endif
114887 +
114888 +static tree get_my_stmt_lhs(struct visited *visited, gimple stmt)
114889 +{
114890 + gimple_stmt_iterator gsi;
114891 + gimple next_stmt = NULL;
114892 +
114893 + gsi = gsi_for_stmt(stmt);
114894 +
114895 + do {
114896 + gsi_next(&gsi);
114897 + next_stmt = gsi_stmt(gsi);
114898 +
114899 + if (gimple_code(stmt) == GIMPLE_PHI && !pointer_set_contains(visited->my_stmts, next_stmt))
114900 + return NULL_TREE;
114901 +
114902 + if (pointer_set_contains(visited->my_stmts, next_stmt) && !pointer_set_contains(visited->skip_expr_casts, next_stmt))
114903 + break;
114904 +
114905 + gcc_assert(pointer_set_contains(visited->my_stmts, next_stmt));
114906 + } while (!gsi_end_p(gsi));
114907 +
114908 + gcc_assert(next_stmt);
114909 + return get_lhs(next_stmt);
114910 +}
114911 +
114912 +static tree expand_visited(struct visited *visited, gimple def_stmt)
114913 +{
114914 + gimple_stmt_iterator gsi;
114915 + enum gimple_code code = gimple_code(def_stmt);
114916 +
114917 + if (code == GIMPLE_ASM)
114918 + return NULL_TREE;
114919 +
114920 + gsi = gsi_for_stmt(def_stmt);
114921 + gsi_next(&gsi);
114922 +
114923 + if (gimple_code(def_stmt) == GIMPLE_PHI && gsi_end_p(gsi))
114924 + return NULL_TREE;
114925 + return get_my_stmt_lhs(visited, def_stmt);
114926 +}
114927 +
114928 +tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs)
114929 +{
114930 + gimple def_stmt;
114931 +
114932 + def_stmt = get_def_stmt(lhs);
114933 +
114934 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
114935 + return NULL_TREE;
114936 +
114937 + if (pointer_set_contains(visited->my_stmts, def_stmt))
114938 + return lhs;
114939 +
114940 + if (pointer_set_contains(visited->stmts, def_stmt))
114941 + return expand_visited(visited, def_stmt);
114942 +
114943 + switch (gimple_code(def_stmt)) {
114944 + case GIMPLE_PHI:
114945 + return handle_phi(visited, caller_node, lhs);
114946 + case GIMPLE_CALL:
114947 + case GIMPLE_ASM:
114948 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
114949 + case GIMPLE_ASSIGN:
114950 + switch (gimple_num_ops(def_stmt)) {
114951 + case 2:
114952 + return handle_unary_ops(visited, caller_node, def_stmt);
114953 + case 3:
114954 + return handle_binary_ops(visited, caller_node, lhs);
114955 +#if BUILDING_GCC_VERSION >= 4006
114956 + case 4:
114957 + return handle_ternary_ops(visited, caller_node, lhs);
114958 +#endif
114959 + }
114960 + default:
114961 + debug_gimple_stmt(def_stmt);
114962 + error("%s: unknown gimple code", __func__);
114963 + gcc_unreachable();
114964 + }
114965 +}
114966 +
114967 diff --git a/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
114968 new file mode 100644
114969 index 0000000..df50164
114970 --- /dev/null
114971 +++ b/tools/gcc/size_overflow_plugin/insert_size_overflow_check_ipa.c
114972 @@ -0,0 +1,1141 @@
114973 +/*
114974 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
114975 + * Licensed under the GPL v2, or (at your option) v3
114976 + *
114977 + * Homepage:
114978 + * http://www.grsecurity.net/~ephox/overflow_plugin/
114979 + *
114980 + * Documentation:
114981 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
114982 + *
114983 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
114984 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
114985 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
114986 + *
114987 + * Usage:
114988 + * $ make
114989 + * $ make run
114990 + */
114991 +
114992 +#include "gcc-common.h"
114993 +#include "size_overflow.h"
114994 +
114995 +#define VEC_LEN 128
114996 +#define RET_CHECK NULL_TREE
114997 +#define WRONG_NODE 32
114998 +#define NOT_INTENTIONAL_ASM NULL
114999 +
115000 +unsigned int call_count;
115001 +
115002 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
115003 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
115004 +
115005 +struct visited_fns {
115006 + struct visited_fns *next;
115007 + const_tree fndecl;
115008 + unsigned int num;
115009 + const_gimple first_stmt;
115010 +};
115011 +
115012 +struct next_cgraph_node {
115013 + struct next_cgraph_node *next;
115014 + struct cgraph_node *current_function;
115015 + tree callee_fndecl;
115016 + unsigned int num;
115017 +};
115018 +
115019 +// Don't want to duplicate entries in next_cgraph_node
115020 +static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
115021 +{
115022 + const_tree new_callee_fndecl;
115023 + struct next_cgraph_node *cur_node;
115024 +
115025 + if (fndecl == RET_CHECK)
115026 + new_callee_fndecl = NODE_DECL(node);
115027 + else
115028 + new_callee_fndecl = fndecl;
115029 +
115030 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
115031 + if (!operand_equal_p(NODE_DECL(cur_node->current_function), NODE_DECL(node), 0))
115032 + continue;
115033 + if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
115034 + continue;
115035 + if (num == cur_node->num)
115036 + return true;
115037 + }
115038 + return false;
115039 +}
115040 +
115041 +/* Add a next_cgraph_node into the list for handle_function().
115042 + * handle_function() iterates over all the next cgraph nodes and
115043 + * starts the overflow check insertion process.
115044 + */
115045 +static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
115046 +{
115047 + struct next_cgraph_node *new_node;
115048 +
115049 + if (is_in_next_cgraph_node(head, node, fndecl, num))
115050 + return head;
115051 +
115052 + new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
115053 + new_node->current_function = node;
115054 + new_node->next = NULL;
115055 + new_node->num = num;
115056 + if (fndecl == RET_CHECK)
115057 + new_node->callee_fndecl = NODE_DECL(node);
115058 + else
115059 + new_node->callee_fndecl = fndecl;
115060 +
115061 + if (!head)
115062 + return new_node;
115063 +
115064 + new_node->next = head;
115065 + return new_node;
115066 +}
115067 +
115068 +static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
115069 +{
115070 + struct cgraph_edge *e;
115071 +
115072 + if (num == 0)
115073 + return create_new_next_cgraph_node(head, node, RET_CHECK, num);
115074 +
115075 + for (e = node->callers; e; e = e->next_caller) {
115076 + tree fndecl = gimple_call_fndecl(e->call_stmt);
115077 +
115078 + gcc_assert(fndecl != NULL_TREE);
115079 + head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
115080 + }
115081 +
115082 + return head;
115083 +}
115084 +
115085 +struct missing_functions {
115086 + struct missing_functions *next;
115087 + const_tree node;
115088 + tree fndecl;
115089 +};
115090 +
115091 +static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
115092 +{
115093 + struct missing_functions *new_function;
115094 +
115095 + new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
115096 + new_function->node = node;
115097 + new_function->next = NULL;
115098 +
115099 + if (TREE_CODE(node) == FUNCTION_DECL)
115100 + new_function->fndecl = node;
115101 + else
115102 + new_function->fndecl = current_function_decl;
115103 + gcc_assert(new_function->fndecl);
115104 +
115105 + if (!missing_fn_head)
115106 + return new_function;
115107 +
115108 + new_function->next = missing_fn_head;
115109 + return new_function;
115110 +}
115111 +
115112 +/* If the function is missing from the hash table and it is a static function
115113 + * then create a next_cgraph_node from it for handle_function()
115114 + */
115115 +static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
115116 +{
115117 + unsigned int num;
115118 + const_tree orig_fndecl;
115119 + struct cgraph_node *next_node = NULL;
115120 +
115121 + orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
115122 +
115123 + num = get_function_num(missing_fn_head->node, orig_fndecl);
115124 + if (num == CANNOT_FIND_ARG)
115125 + return cnodes;
115126 +
115127 + if (!is_missing_function(orig_fndecl, num))
115128 + return cnodes;
115129 +
115130 + next_node = cgraph_get_node(missing_fn_head->fndecl);
115131 + if (next_node && next_node->local.local)
115132 + cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
115133 + return cnodes;
115134 +}
115135 +
115136 +/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
115137 + * into the next_cgraph_node list. They will be the next interesting returns or callees.
115138 + */
115139 +static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
115140 +{
115141 + unsigned int i;
115142 + tree node;
115143 + struct missing_functions *cur, *missing_fn_head = NULL;
115144 +
115145 +#if BUILDING_GCC_VERSION <= 4007
115146 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
115147 +#else
115148 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
115149 +#endif
115150 + switch (TREE_CODE(node)) {
115151 + case PARM_DECL:
115152 + if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
115153 + break;
115154 + case FUNCTION_DECL:
115155 + missing_fn_head = create_new_missing_function(missing_fn_head, node);
115156 + break;
115157 + default:
115158 + break;
115159 + }
115160 + }
115161 +
115162 + while (missing_fn_head) {
115163 + cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
115164 +
115165 + cur = missing_fn_head->next;
115166 + free(missing_fn_head);
115167 + missing_fn_head = cur;
115168 + }
115169 +
115170 + return cnodes;
115171 +}
115172 +
115173 +static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
115174 +{
115175 + gimple phi = get_def_stmt(result);
115176 + unsigned int i, n = gimple_phi_num_args(phi);
115177 +
115178 + pointer_set_insert(visited, phi);
115179 + for (i = 0; i < n; i++) {
115180 + const_tree arg = gimple_phi_arg_def(phi, i);
115181 +
115182 + set_conditions(visited, interesting_conditions, arg);
115183 + }
115184 +}
115185 +
115186 +enum conditions {
115187 + FROM_CONST, NOT_UNARY, CAST, RET, PHI
115188 +};
115189 +
115190 +// Search for constants, cast assignments and binary/ternary assignments
115191 +static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
115192 +{
115193 + gimple def_stmt = get_def_stmt(lhs);
115194 +
115195 + if (is_gimple_constant(lhs)) {
115196 + interesting_conditions[FROM_CONST] = true;
115197 + return;
115198 + }
115199 +
115200 + if (!def_stmt)
115201 + return;
115202 +
115203 + if (pointer_set_contains(visited, def_stmt))
115204 + return;
115205 +
115206 + switch (gimple_code(def_stmt)) {
115207 + case GIMPLE_CALL:
115208 + if (lhs == gimple_call_lhs(def_stmt))
115209 + interesting_conditions[RET] = true;
115210 + return;
115211 + case GIMPLE_NOP:
115212 + case GIMPLE_ASM:
115213 + return;
115214 + case GIMPLE_PHI:
115215 + interesting_conditions[PHI] = true;
115216 + return walk_phi_set_conditions(visited, interesting_conditions, lhs);
115217 + case GIMPLE_ASSIGN:
115218 + if (gimple_num_ops(def_stmt) == 2) {
115219 + const_tree rhs = gimple_assign_rhs1(def_stmt);
115220 +
115221 + if (gimple_assign_cast_p(def_stmt))
115222 + interesting_conditions[CAST] = true;
115223 +
115224 + return set_conditions(visited, interesting_conditions, rhs);
115225 + } else {
115226 + interesting_conditions[NOT_UNARY] = true;
115227 + return;
115228 + }
115229 + default:
115230 + debug_gimple_stmt(def_stmt);
115231 + gcc_unreachable();
115232 + }
115233 +}
115234 +
115235 +// determine whether duplication will be necessary or not.
115236 +static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
115237 +{
115238 + struct pointer_set_t *visited;
115239 +
115240 + if (gimple_assign_cast_p(cur_node->first_stmt))
115241 + interesting_conditions[CAST] = true;
115242 + else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
115243 + interesting_conditions[NOT_UNARY] = true;
115244 +
115245 + visited = pointer_set_create();
115246 + set_conditions(visited, interesting_conditions, cur_node->node);
115247 + pointer_set_destroy(visited);
115248 +}
115249 +
115250 +// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
115251 +static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
115252 +{
115253 + gimple assign;
115254 + gimple_stmt_iterator gsi;
115255 +
115256 + // already removed
115257 + if (gimple_bb(asm_stmt) == NULL)
115258 + return;
115259 + gsi = gsi_for_stmt(asm_stmt);
115260 +
115261 + assign = gimple_build_assign(lhs, rhs);
115262 + gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
115263 + SSA_NAME_DEF_STMT(lhs) = assign;
115264 +
115265 + gsi_remove(&gsi, true);
115266 +}
115267 +
115268 +/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
115269 + * stmt is a return otherwise it is the callee function.
115270 + */
115271 +const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
115272 +{
115273 + const_tree fndecl;
115274 +
115275 + if (argnum == 0)
115276 + fndecl = current_function_decl;
115277 + else
115278 + fndecl = gimple_call_fndecl(stmt);
115279 +
115280 + if (fndecl == NULL_TREE)
115281 + return NULL_TREE;
115282 +
115283 + return DECL_ORIGIN(fndecl);
115284 +}
115285 +
115286 +// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
115287 +static bool skip_asm(const_tree arg)
115288 +{
115289 + gimple def_stmt = get_def_stmt(arg);
115290 +
115291 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
115292 + return false;
115293 +
115294 + def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
115295 + return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
115296 +}
115297 +
115298 +static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
115299 +{
115300 + gimple phi = get_def_stmt(result);
115301 + unsigned int i, n = gimple_phi_num_args(phi);
115302 +
115303 + pointer_set_insert(visited, phi);
115304 + for (i = 0; i < n; i++) {
115305 + tree arg = gimple_phi_arg_def(phi, i);
115306 +
115307 + walk_use_def(visited, cur_node, arg);
115308 + }
115309 +}
115310 +
115311 +static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115312 +{
115313 + gimple def_stmt = get_def_stmt(lhs);
115314 + tree rhs1, rhs2;
115315 +
115316 + rhs1 = gimple_assign_rhs1(def_stmt);
115317 + rhs2 = gimple_assign_rhs2(def_stmt);
115318 +
115319 + walk_use_def(visited, cur_node, rhs1);
115320 + walk_use_def(visited, cur_node, rhs2);
115321 +}
115322 +
115323 +static void insert_last_node(struct interesting_node *cur_node, tree node)
115324 +{
115325 + unsigned int i;
115326 + tree element;
115327 + enum tree_code code;
115328 +
115329 + gcc_assert(node != NULL_TREE);
115330 +
115331 + if (is_gimple_constant(node))
115332 + return;
115333 +
115334 + code = TREE_CODE(node);
115335 + if (code == VAR_DECL) {
115336 + node = DECL_ORIGIN(node);
115337 + code = TREE_CODE(node);
115338 + }
115339 +
115340 + if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
115341 + return;
115342 +
115343 +#if BUILDING_GCC_VERSION <= 4007
115344 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
115345 +#else
115346 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
115347 +#endif
115348 + if (operand_equal_p(node, element, 0))
115349 + return;
115350 + }
115351 +
115352 +#if BUILDING_GCC_VERSION <= 4007
115353 + gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
115354 + VEC_safe_push(tree, gc, cur_node->last_nodes, node);
115355 +#else
115356 + gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
115357 + vec_safe_push(cur_node->last_nodes, node);
115358 +#endif
115359 +}
115360 +
115361 +// a size_overflow asm stmt in the control flow doesn't stop the recursion
115362 +static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
115363 +{
115364 + if (!is_size_overflow_asm(stmt))
115365 + walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115366 +}
115367 +
115368 +/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
115369 + * and component refs (for checking the intentional_overflow attribute).
115370 + */
115371 +static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
115372 +{
115373 + const_gimple def_stmt;
115374 +
115375 + if (TREE_CODE(lhs) != SSA_NAME) {
115376 + insert_last_node(cur_node, lhs);
115377 + return;
115378 + }
115379 +
115380 + def_stmt = get_def_stmt(lhs);
115381 + if (!def_stmt)
115382 + return;
115383 +
115384 + if (pointer_set_insert(visited, def_stmt))
115385 + return;
115386 +
115387 + switch (gimple_code(def_stmt)) {
115388 + case GIMPLE_NOP:
115389 + return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
115390 + case GIMPLE_ASM:
115391 + return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
115392 + case GIMPLE_CALL: {
115393 + tree fndecl = gimple_call_fndecl(def_stmt);
115394 +
115395 + if (fndecl == NULL_TREE)
115396 + return;
115397 + insert_last_node(cur_node, fndecl);
115398 + return;
115399 + }
115400 + case GIMPLE_PHI:
115401 + return walk_use_def_phi(visited, cur_node, lhs);
115402 + case GIMPLE_ASSIGN:
115403 + switch (gimple_num_ops(def_stmt)) {
115404 + case 2:
115405 + return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
115406 + case 3:
115407 + return walk_use_def_binary(visited, cur_node, lhs);
115408 + }
115409 + default:
115410 + debug_gimple_stmt((gimple)def_stmt);
115411 + error("%s: unknown gimple code", __func__);
115412 + gcc_unreachable();
115413 + }
115414 +}
115415 +
115416 +// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
115417 +static void set_last_nodes(struct interesting_node *cur_node)
115418 +{
115419 + struct pointer_set_t *visited;
115420 +
115421 + visited = pointer_set_create();
115422 + walk_use_def(visited, cur_node, cur_node->node);
115423 + pointer_set_destroy(visited);
115424 +}
115425 +
115426 +enum precond {
115427 + NO_ATTRIBUTE_SEARCH, NO_CHECK_INSERT, NONE
115428 +};
115429 +
115430 +/* 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.
115431 + * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
115432 + * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
115433 + * It skips the possible error codes too.
115434 + */
115435 +static enum precond check_preconditions(struct interesting_node *cur_node)
115436 +{
115437 + bool interesting_conditions[5] = {false, false, false, false, false};
115438 +
115439 + set_last_nodes(cur_node);
115440 +
115441 + check_intentional_attribute_ipa(cur_node);
115442 + if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
115443 + return NO_ATTRIBUTE_SEARCH;
115444 +
115445 + search_interesting_conditions(cur_node, interesting_conditions);
115446 +
115447 + // error code: a phi, unary assign (not cast) and returns only
115448 + if (!interesting_conditions[NOT_UNARY] && interesting_conditions[PHI] && interesting_conditions[RET] && !interesting_conditions[CAST])
115449 + return NO_ATTRIBUTE_SEARCH;
115450 +
115451 + // error code: def_stmts trace back to a constant and there are no binary/ternary assigments
115452 + if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
115453 + return NO_ATTRIBUTE_SEARCH;
115454 +
115455 + // unnecessary overflow check
115456 + if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
115457 + return NO_CHECK_INSERT;
115458 +
115459 + if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
115460 + return NO_CHECK_INSERT;
115461 +
115462 + return NONE;
115463 +}
115464 +
115465 +static tree cast_to_orig_type(struct visited *visited, gimple stmt, const_tree orig_node, tree new_node)
115466 +{
115467 + const_gimple assign;
115468 + tree orig_type = TREE_TYPE(orig_node);
115469 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
115470 +
115471 + assign = build_cast_stmt(visited, orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
115472 + return gimple_assign_lhs(assign);
115473 +}
115474 +
115475 +static void change_orig_node(struct visited *visited, struct interesting_node *cur_node, tree new_node)
115476 +{
115477 + void (*set_rhs)(gimple, tree);
115478 + gimple stmt = cur_node->first_stmt;
115479 + const_tree orig_node = cur_node->node;
115480 +
115481 + switch (gimple_code(stmt)) {
115482 + case GIMPLE_RETURN:
115483 + gimple_return_set_retval(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115484 + break;
115485 + case GIMPLE_CALL:
115486 + gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(visited, stmt, orig_node, new_node));
115487 + break;
115488 + case GIMPLE_ASSIGN:
115489 + switch (cur_node->num) {
115490 + case 1:
115491 + set_rhs = &gimple_assign_set_rhs1;
115492 + break;
115493 + case 2:
115494 + set_rhs = &gimple_assign_set_rhs2;
115495 + break;
115496 +#if BUILDING_GCC_VERSION >= 4006
115497 + case 3:
115498 + set_rhs = &gimple_assign_set_rhs3;
115499 + break;
115500 +#endif
115501 + default:
115502 + gcc_unreachable();
115503 + }
115504 +
115505 + set_rhs(stmt, cast_to_orig_type(visited, stmt, orig_node, new_node));
115506 + break;
115507 + default:
115508 + debug_gimple_stmt(stmt);
115509 + gcc_unreachable();
115510 + }
115511 +
115512 + update_stmt(stmt);
115513 +}
115514 +
115515 +static struct visited *create_visited(void)
115516 +{
115517 + struct visited *new_node;
115518 +
115519 + new_node = (struct visited *)xmalloc(sizeof(*new_node));
115520 + new_node->stmts = pointer_set_create();
115521 + new_node->my_stmts = pointer_set_create();
115522 + new_node->skip_expr_casts = pointer_set_create();
115523 + new_node->no_cast_check = pointer_set_create();
115524 + return new_node;
115525 +}
115526 +
115527 +static void free_visited(struct visited *visited)
115528 +{
115529 + pointer_set_destroy(visited->stmts);
115530 + pointer_set_destroy(visited->my_stmts);
115531 + pointer_set_destroy(visited->skip_expr_casts);
115532 + pointer_set_destroy(visited->no_cast_check);
115533 +
115534 + free(visited);
115535 +}
115536 +
115537 +/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
115538 + * 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
115539 + * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
115540 + */
115541 +static struct next_cgraph_node *handle_interesting_stmt(struct visited *visited, struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node)
115542 +{
115543 + enum precond ret;
115544 + tree new_node, orig_node = cur_node->node;
115545 +
115546 + ret = check_preconditions(cur_node);
115547 + if (ret == NO_ATTRIBUTE_SEARCH)
115548 + return cnodes;
115549 +
115550 + cnodes = search_overflow_attribute(cnodes, cur_node);
115551 +
115552 + if (ret == NO_CHECK_INSERT)
115553 + return cnodes;
115554 +
115555 + new_node = expand(visited, caller_node, orig_node);
115556 + if (new_node == NULL_TREE)
115557 + return cnodes;
115558 +
115559 + change_orig_node(visited, cur_node, new_node);
115560 + check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
115561 +
115562 + return cnodes;
115563 +}
115564 +
115565 +// Check visited_fns interesting nodes.
115566 +static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
115567 +{
115568 + struct interesting_node *cur;
115569 +
115570 + for (cur = head; cur; cur = cur->next) {
115571 + if (!operand_equal_p(node, cur->node, 0))
115572 + continue;
115573 + if (num != cur->num)
115574 + continue;
115575 + if (first_stmt == cur->first_stmt)
115576 + return true;
115577 + }
115578 + return false;
115579 +}
115580 +
115581 +/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
115582 + 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
115583 + 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
115584 + the intentional_overflow attribute check. They are collected by set_last_nodes().
115585 + num: arg count of a call stmt or 0 when it is a ret
115586 + node: the recursion starts from here, it is a call arg or a return value
115587 + 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.
115588 + intentional_attr_decl: intentional_overflow attribute of the callee function
115589 + intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
115590 + intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
115591 + */
115592 +static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
115593 +{
115594 + struct interesting_node *new_node;
115595 + tree fndecl;
115596 + enum gimple_code code;
115597 +
115598 + gcc_assert(node != NULL_TREE);
115599 + code = gimple_code(first_stmt);
115600 + gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
115601 +
115602 + if (num == CANNOT_FIND_ARG)
115603 + return head;
115604 +
115605 + if (skip_types(node))
115606 + return head;
115607 +
115608 + if (skip_asm(node))
115609 + return head;
115610 +
115611 + if (is_gimple_call(first_stmt))
115612 + fndecl = gimple_call_fndecl(first_stmt);
115613 + else
115614 + fndecl = current_function_decl;
115615 +
115616 + if (fndecl == NULL_TREE)
115617 + return head;
115618 +
115619 + if (is_in_interesting_node(head, first_stmt, node, num))
115620 + return head;
115621 +
115622 + new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
115623 +
115624 + new_node->next = NULL;
115625 + new_node->first_stmt = first_stmt;
115626 +#if BUILDING_GCC_VERSION <= 4007
115627 + new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
115628 +#else
115629 + vec_alloc(new_node->last_nodes, VEC_LEN);
115630 +#endif
115631 + new_node->num = num;
115632 + new_node->node = node;
115633 + new_node->fndecl = fndecl;
115634 + new_node->intentional_attr_decl = MARK_NO;
115635 + new_node->intentional_attr_cur_fndecl = MARK_NO;
115636 + new_node->intentional_mark_from_gimple = asm_stmt;
115637 +
115638 + if (!head)
115639 + return new_node;
115640 +
115641 + new_node->next = head;
115642 + return new_node;
115643 +}
115644 +
115645 +/* 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).
115646 + * If the ret stmt is in the next cgraph node list then it's an interesting ret.
115647 + */
115648 +static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115649 +{
115650 + struct next_cgraph_node *cur_node;
115651 + tree ret = gimple_return_retval(stmt);
115652 +
115653 + if (ret == NULL_TREE)
115654 + return head;
115655 +
115656 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115657 + if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
115658 + continue;
115659 + if (cur_node->num == 0)
115660 + head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
115661 + }
115662 +
115663 + return head;
115664 +}
115665 +
115666 +/* 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).
115667 + * If the call stmt is in the next cgraph node list then it's an interesting call.
115668 + */
115669 +static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
115670 +{
115671 + unsigned int argnum;
115672 + tree arg;
115673 + const_tree fndecl;
115674 + struct next_cgraph_node *cur_node;
115675 +
115676 + fndecl = gimple_call_fndecl(stmt);
115677 + if (fndecl == NULL_TREE)
115678 + return head;
115679 +
115680 + for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
115681 + if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
115682 + continue;
115683 + argnum = get_correct_arg_count(cur_node->num, fndecl);
115684 + gcc_assert(argnum != CANNOT_FIND_ARG);
115685 + if (argnum == 0)
115686 + continue;
115687 +
115688 + arg = gimple_call_arg(stmt, argnum - 1);
115689 + head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
115690 + }
115691 +
115692 + return head;
115693 +}
115694 +
115695 +static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
115696 +{
115697 + if (!operand_equal_p(orig_node, node, 0))
115698 + return WRONG_NODE;
115699 + if (skip_types(node))
115700 + return WRONG_NODE;
115701 + return ret_count;
115702 +}
115703 +
115704 +// Get the index of the rhs node in an assignment
115705 +static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
115706 +{
115707 + const_tree rhs1, rhs2;
115708 + unsigned int ret;
115709 +
115710 + gcc_assert(stmt);
115711 + gcc_assert(is_gimple_assign(stmt));
115712 +
115713 + rhs1 = gimple_assign_rhs1(stmt);
115714 + gcc_assert(rhs1 != NULL_TREE);
115715 +
115716 + switch (gimple_num_ops(stmt)) {
115717 + case 2:
115718 + return check_ops(node, rhs1, 1);
115719 + case 3:
115720 + ret = check_ops(node, rhs1, 1);
115721 + if (ret != WRONG_NODE)
115722 + return ret;
115723 +
115724 + rhs2 = gimple_assign_rhs2(stmt);
115725 + gcc_assert(rhs2 != NULL_TREE);
115726 + return check_ops(node, rhs2, 2);
115727 + default:
115728 + gcc_unreachable();
115729 + }
115730 +}
115731 +
115732 +// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
115733 +static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
115734 +{
115735 + unsigned int i;
115736 +
115737 + if (gimple_call_fndecl(stmt) == NULL_TREE)
115738 + return CANNOT_FIND_ARG;
115739 +
115740 + for (i = 0; i < gimple_call_num_args(stmt); i++) {
115741 + tree node;
115742 +
115743 + node = gimple_call_arg(stmt, i);
115744 + if (!operand_equal_p(arg, node, 0))
115745 + continue;
115746 + if (!skip_types(node))
115747 + return i + 1;
115748 + }
115749 +
115750 + return CANNOT_FIND_ARG;
115751 +}
115752 +
115753 +/* starting from the size_overflow asm stmt collect interesting stmts. They can be
115754 + * any of return, call or assignment stmts (because of inlining).
115755 + */
115756 +static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
115757 +{
115758 + use_operand_p use_p;
115759 + imm_use_iterator imm_iter;
115760 + unsigned int argnum;
115761 +
115762 + gcc_assert(TREE_CODE(node) == SSA_NAME);
115763 +
115764 + if (pointer_set_insert(visited, node))
115765 + return head;
115766 +
115767 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
115768 + gimple stmt = USE_STMT(use_p);
115769 +
115770 + if (stmt == NULL)
115771 + return head;
115772 + if (is_gimple_debug(stmt))
115773 + continue;
115774 +
115775 + switch (gimple_code(stmt)) {
115776 + case GIMPLE_CALL:
115777 + argnum = find_arg_number_gimple(node, stmt);
115778 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115779 + break;
115780 + case GIMPLE_RETURN:
115781 + head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
115782 + break;
115783 + case GIMPLE_ASSIGN:
115784 + argnum = get_assign_ops_count(stmt, node);
115785 + head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
115786 + break;
115787 + case GIMPLE_PHI: {
115788 + tree result = gimple_phi_result(stmt);
115789 + head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
115790 + break;
115791 + }
115792 + case GIMPLE_ASM:
115793 + if (gimple_asm_noutputs(stmt) != 0)
115794 + break;
115795 + if (!is_size_overflow_asm(stmt))
115796 + break;
115797 + head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
115798 + break;
115799 + case GIMPLE_COND:
115800 + case GIMPLE_SWITCH:
115801 + break;
115802 + default:
115803 + debug_gimple_stmt(stmt);
115804 + gcc_unreachable();
115805 + break;
115806 + }
115807 + }
115808 + return head;
115809 +}
115810 +
115811 +static void remove_size_overflow_asm(gimple stmt)
115812 +{
115813 + gimple_stmt_iterator gsi;
115814 + tree input, output;
115815 +
115816 + if (!is_size_overflow_asm(stmt))
115817 + return;
115818 +
115819 + if (gimple_asm_noutputs(stmt) == 0) {
115820 + gsi = gsi_for_stmt(stmt);
115821 + ipa_remove_stmt_references(cgraph_get_create_node(current_function_decl), stmt);
115822 + gsi_remove(&gsi, true);
115823 + return;
115824 + }
115825 +
115826 + input = gimple_asm_input_op(stmt, 0);
115827 + output = gimple_asm_output_op(stmt, 0);
115828 + replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
115829 +}
115830 +
115831 +/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
115832 + * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
115833 + * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
115834 + */
115835 +static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
115836 +{
115837 + const_tree output;
115838 + struct pointer_set_t *visited;
115839 + gimple intentional_asm = NOT_INTENTIONAL_ASM;
115840 +
115841 + if (!is_size_overflow_asm(stmt))
115842 + return head;
115843 +
115844 + if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
115845 + intentional_asm = stmt;
115846 +
115847 + gcc_assert(gimple_asm_ninputs(stmt) == 1);
115848 +
115849 + if (gimple_asm_noutputs(stmt) == 0 && is_size_overflow_intentional_asm_turn_off(stmt))
115850 + return head;
115851 +
115852 + if (gimple_asm_noutputs(stmt) == 0) {
115853 + const_tree input;
115854 +
115855 + if (!is_size_overflow_intentional_asm_turn_off(stmt))
115856 + return head;
115857 +
115858 + input = gimple_asm_input_op(stmt, 0);
115859 + remove_size_overflow_asm(stmt);
115860 + if (is_gimple_constant(TREE_VALUE(input)))
115861 + return head;
115862 + visited = pointer_set_create();
115863 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
115864 + pointer_set_destroy(visited);
115865 + return head;
115866 + }
115867 +
115868 + if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
115869 + remove_size_overflow_asm(stmt);
115870 +
115871 + visited = pointer_set_create();
115872 + output = gimple_asm_output_op(stmt, 0);
115873 + head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
115874 + pointer_set_destroy(visited);
115875 + return head;
115876 +}
115877 +
115878 +/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
115879 + * or a call stmt or a return stmt and store them in the interesting_node list
115880 + */
115881 +static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
115882 +{
115883 + basic_block bb;
115884 + struct interesting_node *head = NULL;
115885 +
115886 + FOR_ALL_BB_FN(bb, cfun) {
115887 + gimple_stmt_iterator gsi;
115888 +
115889 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
115890 + enum gimple_code code;
115891 + gimple stmt = gsi_stmt(gsi);
115892 +
115893 + code = gimple_code(stmt);
115894 +
115895 + if (code == GIMPLE_ASM)
115896 + head = handle_stmt_by_size_overflow_asm(stmt, head);
115897 +
115898 + if (!next_node)
115899 + continue;
115900 + if (code == GIMPLE_CALL)
115901 + head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
115902 + if (code == GIMPLE_RETURN)
115903 + head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
115904 + }
115905 + }
115906 + return head;
115907 +}
115908 +
115909 +static void free_interesting_node(struct interesting_node *head)
115910 +{
115911 + struct interesting_node *cur;
115912 +
115913 + while (head) {
115914 + cur = head->next;
115915 +#if BUILDING_GCC_VERSION <= 4007
115916 + VEC_free(tree, gc, head->last_nodes);
115917 +#else
115918 + vec_free(head->last_nodes);
115919 +#endif
115920 + free(head);
115921 + head = cur;
115922 + }
115923 +}
115924 +
115925 +static struct visited_fns *insert_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115926 +{
115927 + struct visited_fns *new_visited_fns;
115928 +
115929 + new_visited_fns = (struct visited_fns *)xmalloc(sizeof(*new_visited_fns));
115930 + new_visited_fns->fndecl = cur_node->fndecl;
115931 + new_visited_fns->num = cur_node->num;
115932 + new_visited_fns->first_stmt = cur_node->first_stmt;
115933 + new_visited_fns->next = NULL;
115934 +
115935 + if (!head)
115936 + return new_visited_fns;
115937 +
115938 + new_visited_fns->next = head;
115939 + return new_visited_fns;
115940 +}
115941 +
115942 +/* Check whether the function was already visited_fns. If the fndecl, the arg count of the fndecl and the first_stmt (call or return) are same then
115943 + * it is a visited_fns function.
115944 + */
115945 +static bool is_visited_fns_function(struct visited_fns *head, struct interesting_node *cur_node)
115946 +{
115947 + struct visited_fns *cur;
115948 +
115949 + if (!head)
115950 + return false;
115951 +
115952 + for (cur = head; cur; cur = cur->next) {
115953 + if (cur_node->first_stmt != cur->first_stmt)
115954 + continue;
115955 + if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
115956 + continue;
115957 + if (cur_node->num == cur->num)
115958 + return true;
115959 + }
115960 + return false;
115961 +}
115962 +
115963 +static void free_next_cgraph_node(struct next_cgraph_node *head)
115964 +{
115965 + struct next_cgraph_node *cur;
115966 +
115967 + while (head) {
115968 + cur = head->next;
115969 + free(head);
115970 + head = cur;
115971 + }
115972 +}
115973 +
115974 +static void remove_all_size_overflow_asm(void)
115975 +{
115976 + basic_block bb;
115977 +
115978 + FOR_ALL_BB_FN(bb, cfun) {
115979 + gimple_stmt_iterator si;
115980 +
115981 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
115982 + remove_size_overflow_asm(gsi_stmt(si));
115983 + }
115984 +}
115985 +
115986 +/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
115987 + * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
115988 + * the newly collected interesting functions (they are interesting if there is control flow between
115989 + * the interesting stmts and them).
115990 + */
115991 +static struct visited_fns *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited_fns *visited_fns)
115992 +{
115993 + struct visited *visited;
115994 + struct interesting_node *head, *cur_node;
115995 + struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
115996 +
115997 + set_current_function_decl(NODE_DECL(node));
115998 + call_count = 0;
115999 +
116000 + head = collect_interesting_stmts(next_node);
116001 +
116002 + visited = create_visited();
116003 + for (cur_node = head; cur_node; cur_node = cur_node->next) {
116004 + if (is_visited_fns_function(visited_fns, cur_node))
116005 + continue;
116006 + cnodes_head = handle_interesting_stmt(visited, cnodes_head, cur_node, node);
116007 + visited_fns = insert_visited_fns_function(visited_fns, cur_node);
116008 + }
116009 +
116010 + free_visited(visited);
116011 + free_interesting_node(head);
116012 + remove_all_size_overflow_asm();
116013 + unset_current_function_decl();
116014 +
116015 + for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
116016 + visited_fns = handle_function(cur_cnodes->current_function, cur_cnodes, visited_fns);
116017 +
116018 + free_next_cgraph_node(cnodes_head);
116019 + return visited_fns;
116020 +}
116021 +
116022 +static void free_visited_fns(struct visited_fns *head)
116023 +{
116024 + struct visited_fns *cur;
116025 +
116026 + while (head) {
116027 + cur = head->next;
116028 + free(head);
116029 + head = cur;
116030 + }
116031 +}
116032 +
116033 +// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
116034 +unsigned int search_function(void)
116035 +{
116036 + struct cgraph_node *node;
116037 + struct visited_fns *visited_fns = NULL;
116038 +
116039 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
116040 + gcc_assert(cgraph_function_flags_ready);
116041 +#if BUILDING_GCC_VERSION <= 4007
116042 + gcc_assert(node->reachable);
116043 +#endif
116044 +
116045 + visited_fns = handle_function(node, NULL, visited_fns);
116046 + }
116047 +
116048 + free_visited_fns(visited_fns);
116049 + return 0;
116050 +}
116051 +
116052 +#if BUILDING_GCC_VERSION >= 4009
116053 +static const struct pass_data insert_size_overflow_check_data = {
116054 +#else
116055 +static struct ipa_opt_pass_d insert_size_overflow_check = {
116056 + .pass = {
116057 +#endif
116058 + .type = SIMPLE_IPA_PASS,
116059 + .name = "size_overflow",
116060 +#if BUILDING_GCC_VERSION >= 4008
116061 + .optinfo_flags = OPTGROUP_NONE,
116062 +#endif
116063 +#if BUILDING_GCC_VERSION >= 4009
116064 + .has_gate = false,
116065 + .has_execute = true,
116066 +#else
116067 + .gate = NULL,
116068 + .execute = search_function,
116069 + .sub = NULL,
116070 + .next = NULL,
116071 + .static_pass_number = 0,
116072 +#endif
116073 + .tv_id = TV_NONE,
116074 + .properties_required = 0,
116075 + .properties_provided = 0,
116076 + .properties_destroyed = 0,
116077 + .todo_flags_start = 0,
116078 + .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,
116079 +#if BUILDING_GCC_VERSION < 4009
116080 + },
116081 + .generate_summary = NULL,
116082 + .write_summary = NULL,
116083 + .read_summary = NULL,
116084 +#if BUILDING_GCC_VERSION >= 4006
116085 + .write_optimization_summary = NULL,
116086 + .read_optimization_summary = NULL,
116087 +#endif
116088 + .stmt_fixup = NULL,
116089 + .function_transform_todo_flags_start = 0,
116090 + .function_transform = NULL,
116091 + .variable_transform = NULL,
116092 +#endif
116093 +};
116094 +
116095 +#if BUILDING_GCC_VERSION >= 4009
116096 +namespace {
116097 +class insert_size_overflow_check : public ipa_opt_pass_d {
116098 +public:
116099 + insert_size_overflow_check() : ipa_opt_pass_d(insert_size_overflow_check_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
116100 + unsigned int execute() { return search_function(); }
116101 +};
116102 +}
116103 +#endif
116104 +
116105 +struct opt_pass *make_insert_size_overflow_check(void)
116106 +{
116107 +#if BUILDING_GCC_VERSION >= 4009
116108 + return new insert_size_overflow_check();
116109 +#else
116110 + return &insert_size_overflow_check.pass;
116111 +#endif
116112 +}
116113 +
116114 diff --git a/tools/gcc/size_overflow_plugin/intentional_overflow.c b/tools/gcc/size_overflow_plugin/intentional_overflow.c
116115 new file mode 100644
116116 index 0000000..d71d72a
116117 --- /dev/null
116118 +++ b/tools/gcc/size_overflow_plugin/intentional_overflow.c
116119 @@ -0,0 +1,736 @@
116120 +/*
116121 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116122 + * Licensed under the GPL v2, or (at your option) v3
116123 + *
116124 + * Homepage:
116125 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116126 + *
116127 + * Documentation:
116128 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116129 + *
116130 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116131 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116132 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116133 + *
116134 + * Usage:
116135 + * $ make
116136 + * $ make run
116137 + */
116138 +
116139 +#include "gcc-common.h"
116140 +#include "size_overflow.h"
116141 +
116142 +/* Get the param of the intentional_overflow attribute.
116143 + * * 0: MARK_NOT_INTENTIONAL
116144 + * * 1..MAX_PARAM: MARK_YES
116145 + * * -1: MARK_TURN_OFF
116146 + */
116147 +static tree get_attribute_param(const_tree decl)
116148 +{
116149 + const_tree attr;
116150 +
116151 + if (decl == NULL_TREE)
116152 + return NULL_TREE;
116153 +
116154 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
116155 + if (!attr || !TREE_VALUE(attr))
116156 + return NULL_TREE;
116157 +
116158 + return TREE_VALUE(attr);
116159 +}
116160 +
116161 +// MARK_TURN_OFF
116162 +bool is_turn_off_intentional_attr(const_tree decl)
116163 +{
116164 + const_tree param_head;
116165 +
116166 + param_head = get_attribute_param(decl);
116167 + if (param_head == NULL_TREE)
116168 + return false;
116169 +
116170 + if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
116171 + return true;
116172 + return false;
116173 +}
116174 +
116175 +// MARK_NOT_INTENTIONAL
116176 +bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
116177 +{
116178 + const_tree param_head;
116179 +
116180 + if (argnum == 0)
116181 + return false;
116182 +
116183 + param_head = get_attribute_param(decl);
116184 + if (param_head == NULL_TREE)
116185 + return false;
116186 +
116187 + if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
116188 + return true;
116189 + return false;
116190 +}
116191 +
116192 +// MARK_YES
116193 +bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
116194 +{
116195 + tree param, param_head;
116196 +
116197 + if (argnum == 0)
116198 + return false;
116199 +
116200 + param_head = get_attribute_param(decl);
116201 + for (param = param_head; param; param = TREE_CHAIN(param))
116202 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
116203 + return true;
116204 + return false;
116205 +}
116206 +
116207 +void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
116208 +{
116209 + location_t loc;
116210 +
116211 + if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
116212 + return;
116213 +
116214 + if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
116215 + return;
116216 +
116217 + loc = DECL_SOURCE_LOCATION(decl);
116218 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", DECL_NAME_POINTER(decl), argnum);
116219 +}
116220 +
116221 +// Get the field decl of a component ref for intentional_overflow checking
116222 +static const_tree search_field_decl(const_tree comp_ref)
116223 +{
116224 + const_tree field = NULL_TREE;
116225 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
116226 +
116227 + for (i = 0; i < len; i++) {
116228 + field = TREE_OPERAND(comp_ref, i);
116229 + if (TREE_CODE(field) == FIELD_DECL)
116230 + break;
116231 + }
116232 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
116233 + return field;
116234 +}
116235 +
116236 +/* Get the type of the intentional_overflow attribute of a node
116237 + * * MARK_TURN_OFF
116238 + * * MARK_YES
116239 + * * MARK_NO
116240 + * * MARK_NOT_INTENTIONAL
116241 + */
116242 +enum mark get_intentional_attr_type(const_tree node)
116243 +{
116244 + const_tree cur_decl;
116245 +
116246 + if (node == NULL_TREE)
116247 + return MARK_NO;
116248 +
116249 + switch (TREE_CODE(node)) {
116250 + case COMPONENT_REF:
116251 + cur_decl = search_field_decl(node);
116252 + if (is_turn_off_intentional_attr(cur_decl))
116253 + return MARK_TURN_OFF;
116254 + if (is_end_intentional_intentional_attr(cur_decl, 1))
116255 + return MARK_YES;
116256 + break;
116257 + case PARM_DECL: {
116258 + unsigned int argnum;
116259 +
116260 + cur_decl = DECL_ORIGIN(current_function_decl);
116261 + argnum = find_arg_number_tree(node, cur_decl);
116262 + if (argnum == CANNOT_FIND_ARG)
116263 + return MARK_NO;
116264 + if (is_yes_intentional_attr(cur_decl, argnum))
116265 + return MARK_YES;
116266 + if (is_end_intentional_intentional_attr(cur_decl, argnum))
116267 + return MARK_NOT_INTENTIONAL;
116268 + break;
116269 + }
116270 + case FUNCTION_DECL:
116271 + if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
116272 + return MARK_TURN_OFF;
116273 + break;
116274 + default:
116275 + break;
116276 + }
116277 + return MARK_NO;
116278 +}
116279 +
116280 +// Search for the intentional_overflow attribute on the last nodes
116281 +static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
116282 +{
116283 + unsigned int i;
116284 + tree last_node;
116285 + enum mark mark = MARK_NO;
116286 +
116287 +#if BUILDING_GCC_VERSION <= 4007
116288 + FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
116289 +#else
116290 + FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
116291 +#endif
116292 + mark = get_intentional_attr_type(last_node);
116293 + if (mark != MARK_NO)
116294 + break;
116295 + }
116296 + return mark;
116297 +}
116298 +
116299 +/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
116300 + * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
116301 + */
116302 +static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
116303 +{
116304 + if (!cur_node->intentional_mark_from_gimple)
116305 + return false;
116306 +
116307 + if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
116308 + cur_node->intentional_attr_cur_fndecl = MARK_YES;
116309 + else
116310 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116311 +
116312 + // skip param decls
116313 + if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
116314 + return true;
116315 + return true;
116316 +}
116317 +
116318 +/* Search intentional_overflow attribute on caller and on callee too.
116319 + * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
116320 + * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
116321 + * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
116322 +*/
116323 +void check_intentional_attribute_ipa(struct interesting_node *cur_node)
116324 +{
116325 + const_tree fndecl;
116326 +
116327 + if (is_intentional_attribute_from_gimple(cur_node))
116328 + return;
116329 +
116330 + if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
116331 + cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
116332 + return;
116333 + }
116334 +
116335 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
116336 + cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
116337 + return;
116338 + }
116339 +
116340 + if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
116341 + return;
116342 +
116343 + fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
116344 + if (is_turn_off_intentional_attr(fndecl)) {
116345 + cur_node->intentional_attr_decl = MARK_TURN_OFF;
116346 + return;
116347 + }
116348 +
116349 + if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
116350 + cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
116351 + else if (is_yes_intentional_attr(fndecl, cur_node->num))
116352 + cur_node->intentional_attr_decl = MARK_YES;
116353 +
116354 + cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
116355 + print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
116356 +}
116357 +
116358 +bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
116359 +{
116360 + const_tree rhs1, lhs, rhs1_type, lhs_type;
116361 + enum machine_mode lhs_mode, rhs_mode;
116362 + gimple def_stmt = get_def_stmt(no_const_rhs);
116363 +
116364 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116365 + return false;
116366 +
116367 + rhs1 = gimple_assign_rhs1(def_stmt);
116368 + lhs = gimple_assign_lhs(def_stmt);
116369 + rhs1_type = TREE_TYPE(rhs1);
116370 + lhs_type = TREE_TYPE(lhs);
116371 + rhs_mode = TYPE_MODE(rhs1_type);
116372 + lhs_mode = TYPE_MODE(lhs_type);
116373 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
116374 + return false;
116375 +
116376 + return true;
116377 +}
116378 +
116379 +static unsigned int uses_num(tree node)
116380 +{
116381 + imm_use_iterator imm_iter;
116382 + use_operand_p use_p;
116383 + unsigned int num = 0;
116384 +
116385 + FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
116386 + gimple use_stmt = USE_STMT(use_p);
116387 +
116388 + if (use_stmt == NULL)
116389 + return num;
116390 + if (is_gimple_debug(use_stmt))
116391 + continue;
116392 + if (gimple_assign_cast_p(use_stmt) && is_size_overflow_type(gimple_assign_lhs(use_stmt)))
116393 + continue;
116394 + num++;
116395 + }
116396 + return num;
116397 +}
116398 +
116399 +static bool no_uses(tree node)
116400 +{
116401 + return !uses_num(node);
116402 +}
116403 +
116404 +// 3.8.5 mm/page-writeback.c __ilog2_u64(): ret, uint + uintmax; uint -> int; int max
116405 +bool is_const_plus_unsigned_signed_truncation(const_tree lhs)
116406 +{
116407 + tree rhs1, lhs_type, rhs_type, rhs2, not_const_rhs;
116408 + gimple def_stmt = get_def_stmt(lhs);
116409 +
116410 + if (!def_stmt || !gimple_assign_cast_p(def_stmt))
116411 + return false;
116412 +
116413 + rhs1 = gimple_assign_rhs1(def_stmt);
116414 + rhs_type = TREE_TYPE(rhs1);
116415 + lhs_type = TREE_TYPE(lhs);
116416 + if (TYPE_UNSIGNED(lhs_type) || !TYPE_UNSIGNED(rhs_type))
116417 + return false;
116418 + if (TYPE_MODE(lhs_type) != TYPE_MODE(rhs_type))
116419 + return false;
116420 +
116421 + def_stmt = get_def_stmt(rhs1);
116422 + if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
116423 + return false;
116424 +
116425 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
116426 + return false;
116427 +
116428 + rhs1 = gimple_assign_rhs1(def_stmt);
116429 + rhs2 = gimple_assign_rhs2(def_stmt);
116430 + if (!is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116431 + return false;
116432 +
116433 + if (is_gimple_constant(rhs2))
116434 + not_const_rhs = rhs1;
116435 + else
116436 + not_const_rhs = rhs2;
116437 +
116438 + return no_uses(not_const_rhs);
116439 +}
116440 +
116441 +static bool is_lt_signed_type_max(const_tree rhs)
116442 +{
116443 + const_tree new_type, type_max, type = TREE_TYPE(rhs);
116444 +
116445 + if (!TYPE_UNSIGNED(type))
116446 + return true;
116447 +
116448 + switch (TYPE_MODE(type)) {
116449 + case QImode:
116450 + new_type = intQI_type_node;
116451 + break;
116452 + case HImode:
116453 + new_type = intHI_type_node;
116454 + break;
116455 + case SImode:
116456 + new_type = intSI_type_node;
116457 + break;
116458 + case DImode:
116459 + new_type = intDI_type_node;
116460 + break;
116461 + default:
116462 + debug_tree((tree)type);
116463 + gcc_unreachable();
116464 + }
116465 +
116466 + type_max = TYPE_MAX_VALUE(new_type);
116467 + if (!tree_int_cst_lt(type_max, rhs))
116468 + return true;
116469 +
116470 + return false;
116471 +}
116472 +
116473 +static bool is_gt_zero(const_tree rhs)
116474 +{
116475 + const_tree type = TREE_TYPE(rhs);
116476 +
116477 + if (TYPE_UNSIGNED(type))
116478 + return true;
116479 +
116480 + if (!tree_int_cst_lt(rhs, integer_zero_node))
116481 + return true;
116482 +
116483 + return false;
116484 +}
116485 +
116486 +bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
116487 +{
116488 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
116489 + return false;
116490 + if (!is_gimple_constant(rhs))
116491 + return false;
116492 +
116493 + // If the const is between 0 and the max value of the signed type of the same bitsize then there is no intentional overflow
116494 + if (is_lt_signed_type_max(rhs) && is_gt_zero(rhs))
116495 + return false;
116496 +
116497 + return true;
116498 +}
116499 +
116500 +static tree change_assign_rhs(struct visited *visited, gimple stmt, const_tree orig_rhs, tree new_rhs)
116501 +{
116502 + gimple assign;
116503 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116504 + tree origtype = TREE_TYPE(orig_rhs);
116505 +
116506 + gcc_assert(is_gimple_assign(stmt));
116507 +
116508 + assign = build_cast_stmt(visited, origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116509 + pointer_set_insert(visited->my_stmts, assign);
116510 + return gimple_assign_lhs(assign);
116511 +}
116512 +
116513 +tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
116514 +{
116515 + tree new_rhs, orig_rhs;
116516 + void (*gimple_assign_set_rhs)(gimple, tree);
116517 + tree rhs1 = gimple_assign_rhs1(stmt);
116518 + tree rhs2 = gimple_assign_rhs2(stmt);
116519 + tree lhs = gimple_assign_lhs(stmt);
116520 +
116521 + if (!check_overflow)
116522 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116523 +
116524 + if (change_rhs == NULL_TREE)
116525 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116526 +
116527 + if (new_rhs2 == NULL_TREE) {
116528 + orig_rhs = rhs1;
116529 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
116530 + } else {
116531 + orig_rhs = rhs2;
116532 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
116533 + }
116534 +
116535 + check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
116536 +
116537 + new_rhs = change_assign_rhs(visited, stmt, orig_rhs, change_rhs);
116538 + gimple_assign_set_rhs(stmt, new_rhs);
116539 + update_stmt(stmt);
116540 +
116541 + return create_assign(visited, stmt, lhs, AFTER_STMT);
116542 +}
116543 +
116544 +static bool is_subtraction_special(struct visited *visited, const_gimple stmt)
116545 +{
116546 + gimple rhs1_def_stmt, rhs2_def_stmt;
116547 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
116548 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
116549 + const_tree rhs1 = gimple_assign_rhs1(stmt);
116550 + const_tree rhs2 = gimple_assign_rhs2(stmt);
116551 +
116552 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
116553 + return false;
116554 +
116555 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
116556 +
116557 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
116558 + return false;
116559 +
116560 + rhs1_def_stmt = get_def_stmt(rhs1);
116561 + rhs2_def_stmt = get_def_stmt(rhs2);
116562 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
116563 + return false;
116564 +
116565 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116566 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
116567 + rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
116568 + rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
116569 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
116570 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
116571 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
116572 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
116573 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
116574 + return false;
116575 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
116576 + return false;
116577 +
116578 + pointer_set_insert(visited->no_cast_check, rhs1_def_stmt);
116579 + pointer_set_insert(visited->no_cast_check, rhs2_def_stmt);
116580 + return true;
116581 +}
116582 +
116583 +static gimple create_binary_assign(struct visited *visited, enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
116584 +{
116585 + gimple assign;
116586 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116587 + tree type = TREE_TYPE(rhs1);
116588 + tree lhs = create_new_var(type);
116589 +
116590 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
116591 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
116592 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
116593 +
116594 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
116595 + update_stmt(assign);
116596 + pointer_set_insert(visited->my_stmts, assign);
116597 + return assign;
116598 +}
116599 +
116600 +static tree cast_to_TI_type(struct visited *visited, gimple stmt, tree node)
116601 +{
116602 + gimple_stmt_iterator gsi;
116603 + gimple cast_stmt;
116604 + tree type = TREE_TYPE(node);
116605 +
116606 + if (types_compatible_p(type, intTI_type_node))
116607 + return node;
116608 +
116609 + gsi = gsi_for_stmt(stmt);
116610 + cast_stmt = build_cast_stmt(visited, intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
116611 + pointer_set_insert(visited->my_stmts, cast_stmt);
116612 + return gimple_assign_lhs(cast_stmt);
116613 +}
116614 +
116615 +static tree get_def_stmt_rhs(struct visited *visited, const_tree var)
116616 +{
116617 + tree rhs1, def_stmt_rhs1;
116618 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
116619 +
116620 + def_stmt = get_def_stmt(var);
116621 + if (!gimple_assign_cast_p(def_stmt))
116622 + return NULL_TREE;
116623 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && pointer_set_contains(visited->my_stmts, def_stmt) && gimple_assign_cast_p(def_stmt));
116624 +
116625 + rhs1 = gimple_assign_rhs1(def_stmt);
116626 + rhs1_def_stmt = get_def_stmt(rhs1);
116627 + if (!gimple_assign_cast_p(rhs1_def_stmt))
116628 + return rhs1;
116629 +
116630 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
116631 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
116632 +
116633 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
116634 + case GIMPLE_CALL:
116635 + case GIMPLE_NOP:
116636 + case GIMPLE_ASM:
116637 + case GIMPLE_PHI:
116638 + return def_stmt_rhs1;
116639 + case GIMPLE_ASSIGN:
116640 + return rhs1;
116641 + default:
116642 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
116643 + gcc_unreachable();
116644 + }
116645 +}
116646 +
116647 +tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs)
116648 +{
116649 + tree new_rhs1, new_rhs2;
116650 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
116651 + gimple assign, stmt = get_def_stmt(lhs);
116652 + tree rhs1 = gimple_assign_rhs1(stmt);
116653 + tree rhs2 = gimple_assign_rhs2(stmt);
116654 +
116655 + if (!is_subtraction_special(visited, stmt))
116656 + return NULL_TREE;
116657 +
116658 + new_rhs1 = expand(visited, caller_node, rhs1);
116659 + new_rhs2 = expand(visited, caller_node, rhs2);
116660 +
116661 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs1);
116662 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(visited, new_rhs2);
116663 +
116664 + if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
116665 + return NULL_TREE;
116666 +
116667 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
116668 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs1_def_stmt_rhs1);
116669 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(visited, stmt, new_rhs2_def_stmt_rhs1);
116670 + }
116671 +
116672 + assign = create_binary_assign(visited, MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
116673 + new_lhs = gimple_assign_lhs(assign);
116674 + check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
116675 +
116676 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
116677 +}
116678 +
116679 +bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
116680 +{
116681 + const_gimple def_stmt;
116682 +
116683 + if (TREE_CODE(rhs) != SSA_NAME)
116684 + return false;
116685 +
116686 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
116687 + return false;
116688 +
116689 + def_stmt = get_def_stmt(rhs);
116690 + if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
116691 + return false;
116692 +
116693 + return true;
116694 +}
116695 +
116696 +/* e.g., drivers/acpi/acpica/utids.c acpi_ut_execute_CID()
116697 + * ((count - 1) * sizeof(struct acpi_pnp_dee_id_list) -> (count + fffffff) * 16
116698 + * fffffff * 16 > signed max -> truncate
116699 + */
116700 +static bool look_for_mult_and_add(const_gimple stmt)
116701 +{
116702 + const_tree res;
116703 + tree rhs1, rhs2, def_rhs1, def_rhs2, const_rhs, def_const_rhs;
116704 + const_gimple def_stmt;
116705 +
116706 + if (!stmt || gimple_code(stmt) == GIMPLE_NOP)
116707 + return false;
116708 + if (!is_gimple_assign(stmt))
116709 + return false;
116710 + if (gimple_assign_rhs_code(stmt) != MULT_EXPR)
116711 + return false;
116712 +
116713 + rhs1 = gimple_assign_rhs1(stmt);
116714 + rhs2 = gimple_assign_rhs2(stmt);
116715 + if (is_gimple_constant(rhs1)) {
116716 + const_rhs = rhs1;
116717 + def_stmt = get_def_stmt(rhs2);
116718 + } else if (is_gimple_constant(rhs2)) {
116719 + const_rhs = rhs2;
116720 + def_stmt = get_def_stmt(rhs1);
116721 + } else
116722 + return false;
116723 +
116724 + if (!is_gimple_assign(def_stmt))
116725 + return false;
116726 +
116727 + if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR && gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
116728 + return false;
116729 +
116730 + def_rhs1 = gimple_assign_rhs1(def_stmt);
116731 + def_rhs2 = gimple_assign_rhs2(def_stmt);
116732 + if (is_gimple_constant(def_rhs1))
116733 + def_const_rhs = def_rhs1;
116734 + else if (is_gimple_constant(def_rhs2))
116735 + def_const_rhs = def_rhs2;
116736 + else
116737 + return false;
116738 +
116739 + res = fold_binary_loc(gimple_location(def_stmt), MULT_EXPR, TREE_TYPE(const_rhs), const_rhs, def_const_rhs);
116740 + if (is_lt_signed_type_max(res) && is_gt_zero(res))
116741 + return false;
116742 + return true;
116743 +}
116744 +
116745 +enum intentional_overflow_type add_mul_intentional_overflow(const_gimple stmt)
116746 +{
116747 + const_gimple def_stmt_1, def_stmt_2;
116748 + const_tree rhs1, rhs2;
116749 + bool add_mul_rhs1, add_mul_rhs2;
116750 +
116751 + rhs1 = gimple_assign_rhs1(stmt);
116752 + def_stmt_1 = get_def_stmt(rhs1);
116753 + add_mul_rhs1 = look_for_mult_and_add(def_stmt_1);
116754 +
116755 + rhs2 = gimple_assign_rhs2(stmt);
116756 + def_stmt_2 = get_def_stmt(rhs2);
116757 + add_mul_rhs2 = look_for_mult_and_add(def_stmt_2);
116758 +
116759 + if (add_mul_rhs1)
116760 + return RHS1_INTENTIONAL_OVERFLOW;
116761 + if (add_mul_rhs2)
116762 + return RHS2_INTENTIONAL_OVERFLOW;
116763 + return NO_INTENTIONAL_OVERFLOW;
116764 +}
116765 +
116766 +static gimple get_dup_stmt(struct visited *visited, gimple stmt)
116767 +{
116768 + gimple my_stmt;
116769 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
116770 +
116771 + gsi_next(&gsi);
116772 + my_stmt = gsi_stmt(gsi);
116773 +
116774 + gcc_assert(pointer_set_contains(visited->my_stmts, my_stmt));
116775 + gcc_assert(gimple_assign_rhs_code(stmt) == gimple_assign_rhs_code(my_stmt));
116776 +
116777 + return my_stmt;
116778 +}
116779 +
116780 +/* unsigned type -> unary or binary assign (rhs1 or rhs2 is constant)
116781 + * unsigned type cast to signed type, unsigned type: no more uses
116782 + * e.g., lib/vsprintf.c:simple_strtol()
116783 + * _10 = (unsigned long int) _9
116784 + * _11 = -_10;
116785 + * _12 = (long int) _11; (_11_ no more uses)
116786 + */
116787 +static bool is_call_or_cast(gimple stmt)
116788 +{
116789 + return gimple_assign_cast_p(stmt) || is_gimple_call(stmt);
116790 +}
116791 +
116792 +static bool is_unsigned_cast_or_call_def_stmt(const_tree node)
116793 +{
116794 + const_tree rhs;
116795 + gimple def_stmt;
116796 +
116797 + if (node == NULL_TREE)
116798 + return true;
116799 + if (is_gimple_constant(node))
116800 + return true;
116801 +
116802 + def_stmt = get_def_stmt(node);
116803 + if (!def_stmt)
116804 + return false;
116805 +
116806 + if (is_call_or_cast(def_stmt))
116807 + return true;
116808 +
116809 + if (!is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 2)
116810 + return false;
116811 + rhs = gimple_assign_rhs1(def_stmt);
116812 + def_stmt = get_def_stmt(rhs);
116813 + if (!def_stmt)
116814 + return false;
116815 + return is_call_or_cast(def_stmt);
116816 +}
116817 +
116818 +void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt)
116819 +{
116820 + unsigned int use_num;
116821 + gimple so_stmt;
116822 + const_gimple def_stmt;
116823 + const_tree rhs1, rhs2;
116824 + tree rhs = gimple_assign_rhs1(stmt);
116825 + tree lhs_type = TREE_TYPE(gimple_assign_lhs(stmt));
116826 + const_tree rhs_type = TREE_TYPE(rhs);
116827 +
116828 + if (!(TYPE_UNSIGNED(rhs_type) && !TYPE_UNSIGNED(lhs_type)))
116829 + return;
116830 + if (GET_MODE_BITSIZE(TYPE_MODE(rhs_type)) != GET_MODE_BITSIZE(TYPE_MODE(lhs_type)))
116831 + return;
116832 + use_num = uses_num(rhs);
116833 + if (use_num != 1)
116834 + return;
116835 +
116836 + def_stmt = get_def_stmt(rhs);
116837 + if (!def_stmt)
116838 + return;
116839 + if (!is_gimple_assign(def_stmt))
116840 + return;
116841 +
116842 + rhs1 = gimple_assign_rhs1(def_stmt);
116843 + if (!is_unsigned_cast_or_call_def_stmt(rhs1))
116844 + return;
116845 +
116846 + rhs2 = gimple_assign_rhs2(def_stmt);
116847 + if (!is_unsigned_cast_or_call_def_stmt(rhs2))
116848 + return;
116849 + if (gimple_num_ops(def_stmt) == 3 && !is_gimple_constant(rhs1) && !is_gimple_constant(rhs2))
116850 + return;
116851 +
116852 + so_stmt = get_dup_stmt(visited, stmt);
116853 + create_up_and_down_cast(visited, so_stmt, lhs_type, gimple_assign_rhs1(so_stmt));
116854 +}
116855 +
116856 diff --git a/tools/gcc/size_overflow_plugin/misc.c b/tools/gcc/size_overflow_plugin/misc.c
116857 new file mode 100644
116858 index 0000000..4bddad2
116859 --- /dev/null
116860 +++ b/tools/gcc/size_overflow_plugin/misc.c
116861 @@ -0,0 +1,203 @@
116862 +/*
116863 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
116864 + * Licensed under the GPL v2, or (at your option) v3
116865 + *
116866 + * Homepage:
116867 + * http://www.grsecurity.net/~ephox/overflow_plugin/
116868 + *
116869 + * Documentation:
116870 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
116871 + *
116872 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
116873 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
116874 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
116875 + *
116876 + * Usage:
116877 + * $ make
116878 + * $ make run
116879 + */
116880 +
116881 +#include "gcc-common.h"
116882 +#include "size_overflow.h"
116883 +
116884 +void set_current_function_decl(tree fndecl)
116885 +{
116886 + gcc_assert(fndecl != NULL_TREE);
116887 +
116888 + push_cfun(DECL_STRUCT_FUNCTION(fndecl));
116889 + calculate_dominance_info(CDI_DOMINATORS);
116890 + current_function_decl = fndecl;
116891 +}
116892 +
116893 +void unset_current_function_decl(void)
116894 +{
116895 + free_dominance_info(CDI_DOMINATORS);
116896 + pop_cfun();
116897 + current_function_decl = NULL_TREE;
116898 +}
116899 +
116900 +static bool is_bool(const_tree node)
116901 +{
116902 + const_tree type;
116903 +
116904 + if (node == NULL_TREE)
116905 + return false;
116906 +
116907 + type = TREE_TYPE(node);
116908 + if (!INTEGRAL_TYPE_P(type))
116909 + return false;
116910 + if (TREE_CODE(type) == BOOLEAN_TYPE)
116911 + return true;
116912 + if (TYPE_PRECISION(type) == 1)
116913 + return true;
116914 + return false;
116915 +}
116916 +
116917 +bool skip_types(const_tree var)
116918 +{
116919 + tree type;
116920 + enum tree_code code;
116921 +
116922 + if (is_gimple_constant(var))
116923 + return true;
116924 +
116925 + switch (TREE_CODE(var)) {
116926 + case ADDR_EXPR:
116927 +#if BUILDING_GCC_VERSION >= 4006
116928 + case MEM_REF:
116929 +#endif
116930 + case ARRAY_REF:
116931 + case BIT_FIELD_REF:
116932 + case INDIRECT_REF:
116933 + case TARGET_MEM_REF:
116934 + case COMPONENT_REF:
116935 + case VAR_DECL:
116936 + case VIEW_CONVERT_EXPR:
116937 + return true;
116938 + default:
116939 + break;
116940 + }
116941 +
116942 + code = TREE_CODE(var);
116943 + gcc_assert(code == SSA_NAME || code == PARM_DECL);
116944 +
116945 + type = TREE_TYPE(var);
116946 + switch (TREE_CODE(type)) {
116947 + case INTEGER_TYPE:
116948 + case ENUMERAL_TYPE:
116949 + return false;
116950 + case BOOLEAN_TYPE:
116951 + return is_bool(var);
116952 + default:
116953 + return true;
116954 + }
116955 +}
116956 +
116957 +gimple get_def_stmt(const_tree node)
116958 +{
116959 + gcc_assert(node != NULL_TREE);
116960 +
116961 + if (skip_types(node))
116962 + return NULL;
116963 +
116964 + if (TREE_CODE(node) != SSA_NAME)
116965 + return NULL;
116966 + return SSA_NAME_DEF_STMT(node);
116967 +}
116968 +
116969 +tree create_new_var(tree type)
116970 +{
116971 + tree new_var = create_tmp_var(type, "cicus");
116972 +
116973 + add_referenced_var(new_var);
116974 + return new_var;
116975 +}
116976 +
116977 +static bool skip_cast(tree dst_type, const_tree rhs, bool force)
116978 +{
116979 + const_gimple def_stmt = get_def_stmt(rhs);
116980 +
116981 + if (force)
116982 + return false;
116983 +
116984 + if (is_gimple_constant(rhs))
116985 + return false;
116986 +
116987 + if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
116988 + return false;
116989 +
116990 + if (!types_compatible_p(dst_type, TREE_TYPE(rhs)))
116991 + return false;
116992 +
116993 + // DI type can be on 32 bit (from create_assign) but overflow type stays DI
116994 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
116995 + return false;
116996 +
116997 + return true;
116998 +}
116999 +
117000 +tree cast_a_tree(tree type, tree var)
117001 +{
117002 + gcc_assert(type != NULL_TREE);
117003 + gcc_assert(var != NULL_TREE);
117004 + gcc_assert(fold_convertible_p(type, var));
117005 +
117006 + return fold_convert(type, var);
117007 +}
117008 +
117009 +gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force)
117010 +{
117011 + gimple assign, def_stmt;
117012 +
117013 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
117014 + gcc_assert(!is_gimple_constant(rhs));
117015 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
117016 + gcc_unreachable();
117017 +
117018 + def_stmt = get_def_stmt(rhs);
117019 + if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && pointer_set_contains(visited->my_stmts, def_stmt))
117020 + return def_stmt;
117021 +
117022 + if (lhs == CREATE_NEW_VAR)
117023 + lhs = create_new_var(dst_type);
117024 +
117025 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
117026 +
117027 + if (!gsi_end_p(*gsi)) {
117028 + location_t loc = gimple_location(gsi_stmt(*gsi));
117029 + gimple_set_location(assign, loc);
117030 + }
117031 +
117032 + gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
117033 +
117034 + if (before)
117035 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
117036 + else
117037 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
117038 + update_stmt(assign);
117039 + return assign;
117040 +}
117041 +
117042 +bool is_size_overflow_type(const_tree var)
117043 +{
117044 + const char *name;
117045 + const_tree type_name, type;
117046 +
117047 + if (var == NULL_TREE)
117048 + return false;
117049 +
117050 + type = TREE_TYPE(var);
117051 + type_name = TYPE_NAME(type);
117052 + if (type_name == NULL_TREE)
117053 + return false;
117054 +
117055 + if (DECL_P(type_name))
117056 + name = DECL_NAME_POINTER(type_name);
117057 + else
117058 + name = IDENTIFIER_POINTER(type_name);
117059 +
117060 + if (!strncmp(name, "size_overflow_type", 18))
117061 + return true;
117062 + return false;
117063 +}
117064 +
117065 diff --git a/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
117066 new file mode 100644
117067 index 0000000..7c9e6d1
117068 --- /dev/null
117069 +++ b/tools/gcc/size_overflow_plugin/remove_unnecessary_dup.c
117070 @@ -0,0 +1,138 @@
117071 +/*
117072 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
117073 + * Licensed under the GPL v2, or (at your option) v3
117074 + *
117075 + * Homepage:
117076 + * http://www.grsecurity.net/~ephox/overflow_plugin/
117077 + *
117078 + * Documentation:
117079 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
117080 + *
117081 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
117082 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
117083 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
117084 + *
117085 + * Usage:
117086 + * $ make
117087 + * $ make run
117088 + */
117089 +
117090 +#include "gcc-common.h"
117091 +#include "size_overflow.h"
117092 +
117093 +bool skip_expr_on_double_type(const_gimple stmt)
117094 +{
117095 + enum tree_code code = gimple_assign_rhs_code(stmt);
117096 +
117097 + switch (code) {
117098 + case RSHIFT_EXPR:
117099 + case TRUNC_DIV_EXPR:
117100 + case CEIL_DIV_EXPR:
117101 + case FLOOR_DIV_EXPR:
117102 + case ROUND_DIV_EXPR:
117103 + case EXACT_DIV_EXPR:
117104 + case RDIV_EXPR:
117105 + case TRUNC_MOD_EXPR:
117106 + case CEIL_MOD_EXPR:
117107 + case FLOOR_MOD_EXPR:
117108 + case ROUND_MOD_EXPR:
117109 + return true;
117110 + default:
117111 + return false;
117112 + }
117113 +}
117114 +
117115 +void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs)
117116 +{
117117 + const_tree orig_rhs1;
117118 + tree down_lhs, new_lhs, dup_type = TREE_TYPE(rhs);
117119 + gimple down_cast, up_cast;
117120 + gimple_stmt_iterator gsi = gsi_for_stmt(use_stmt);
117121 +
117122 + down_cast = build_cast_stmt(visited, orig_type, rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
117123 + down_lhs = gimple_assign_lhs(down_cast);
117124 +
117125 + gsi = gsi_for_stmt(use_stmt);
117126 + up_cast = build_cast_stmt(visited, dup_type, down_lhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
117127 + new_lhs = gimple_assign_lhs(up_cast);
117128 +
117129 + orig_rhs1 = gimple_assign_rhs1(use_stmt);
117130 + if (operand_equal_p(orig_rhs1, rhs, 0))
117131 + gimple_assign_set_rhs1(use_stmt, new_lhs);
117132 + else
117133 + gimple_assign_set_rhs2(use_stmt, new_lhs);
117134 + update_stmt(use_stmt);
117135 +
117136 + pointer_set_insert(visited->my_stmts, up_cast);
117137 + pointer_set_insert(visited->my_stmts, down_cast);
117138 + pointer_set_insert(visited->skip_expr_casts, up_cast);
117139 + pointer_set_insert(visited->skip_expr_casts, down_cast);
117140 +}
117141 +
117142 +static tree get_proper_unsigned_half_type(const_tree node)
117143 +{
117144 + tree new_type, type;
117145 +
117146 + gcc_assert(is_size_overflow_type(node));
117147 +
117148 + type = TREE_TYPE(node);
117149 + switch (TYPE_MODE(type)) {
117150 + case HImode:
117151 + new_type = unsigned_intQI_type_node;
117152 + break;
117153 + case SImode:
117154 + new_type = unsigned_intHI_type_node;
117155 + break;
117156 + case DImode:
117157 + new_type = unsigned_intSI_type_node;
117158 + break;
117159 + case TImode:
117160 + new_type = unsigned_intDI_type_node;
117161 + break;
117162 + default:
117163 + gcc_unreachable();
117164 + }
117165 +
117166 + if (TYPE_QUALS(type) != 0)
117167 + return build_qualified_type(new_type, TYPE_QUALS(type));
117168 + return new_type;
117169 +}
117170 +
117171 +static void insert_cast_rhs(struct visited *visited, gimple stmt, tree rhs)
117172 +{
117173 + tree type;
117174 +
117175 + if (rhs == NULL_TREE)
117176 + return;
117177 + if (!is_size_overflow_type(rhs))
117178 + return;
117179 +
117180 + type = get_proper_unsigned_half_type(rhs);
117181 + if (is_gimple_constant(rhs))
117182 + return;
117183 + create_up_and_down_cast(visited, stmt, type, rhs);
117184 +}
117185 +
117186 +static void insert_cast(struct visited *visited, gimple stmt, tree rhs)
117187 +{
117188 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode) && !is_size_overflow_type(rhs))
117189 + return;
117190 + gcc_assert(is_size_overflow_type(rhs));
117191 + insert_cast_rhs(visited, stmt, rhs);
117192 +}
117193 +
117194 +void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type)
117195 +{
117196 + tree rhs1, rhs2;
117197 +
117198 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS1_INTENTIONAL_OVERFLOW) {
117199 + rhs1 = gimple_assign_rhs1(stmt);
117200 + insert_cast(visited, stmt, rhs1);
117201 + }
117202 +
117203 + if (type == NO_INTENTIONAL_OVERFLOW || type == RHS2_INTENTIONAL_OVERFLOW) {
117204 + rhs2 = gimple_assign_rhs2(stmt);
117205 + insert_cast(visited, stmt, rhs2);
117206 + }
117207 +}
117208 +
117209 diff --git a/tools/gcc/size_overflow_plugin/size_overflow.h b/tools/gcc/size_overflow_plugin/size_overflow.h
117210 new file mode 100644
117211 index 0000000..e5b4e50
117212 --- /dev/null
117213 +++ b/tools/gcc/size_overflow_plugin/size_overflow.h
117214 @@ -0,0 +1,127 @@
117215 +#ifndef SIZE_OVERFLOW_H
117216 +#define SIZE_OVERFLOW_H
117217 +
117218 +#define CREATE_NEW_VAR NULL_TREE
117219 +#define CANNOT_FIND_ARG 32
117220 +#define MAX_PARAM 31
117221 +#define BEFORE_STMT true
117222 +#define AFTER_STMT false
117223 +
117224 +#define TURN_OFF_ASM_STR "# size_overflow MARK_TURN_OFF "
117225 +#define YES_ASM_STR "# size_overflow MARK_YES "
117226 +#define OK_ASM_STR "# size_overflow "
117227 +
117228 +enum mark {
117229 + MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
117230 +};
117231 +
117232 +enum intentional_overflow_type {
117233 + NO_INTENTIONAL_OVERFLOW, RHS1_INTENTIONAL_OVERFLOW, RHS2_INTENTIONAL_OVERFLOW
117234 +};
117235 +
117236 +struct visited {
117237 + struct pointer_set_t *stmts;
117238 + struct pointer_set_t *my_stmts;
117239 + struct pointer_set_t *skip_expr_casts;
117240 + struct pointer_set_t *no_cast_check;
117241 +};
117242 +
117243 +// size_overflow_plugin.c
117244 +extern tree report_size_overflow_decl;
117245 +extern tree size_overflow_type_HI;
117246 +extern tree size_overflow_type_SI;
117247 +extern tree size_overflow_type_DI;
117248 +extern tree size_overflow_type_TI;
117249 +
117250 +
117251 +// size_overflow_plugin_hash.c
117252 +struct size_overflow_hash {
117253 + const struct size_overflow_hash * const next;
117254 + const char * const name;
117255 + const unsigned int param;
117256 +};
117257 +
117258 +struct interesting_node {
117259 + struct interesting_node *next;
117260 + gimple first_stmt;
117261 + const_tree fndecl;
117262 + tree node;
117263 +#if BUILDING_GCC_VERSION <= 4007
117264 + VEC(tree, gc) *last_nodes;
117265 +#else
117266 + vec<tree, va_gc> *last_nodes;
117267 +#endif
117268 + unsigned int num;
117269 + enum mark intentional_attr_decl;
117270 + enum mark intentional_attr_cur_fndecl;
117271 + gimple intentional_mark_from_gimple;
117272 +};
117273 +
117274 +extern bool is_size_overflow_asm(const_gimple stmt);
117275 +extern unsigned int get_function_num(const_tree node, const_tree orig_fndecl);
117276 +extern unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl);
117277 +extern bool is_missing_function(const_tree orig_fndecl, unsigned int num);
117278 +extern bool is_a_return_check(const_tree node);
117279 +extern const struct size_overflow_hash *get_function_hash(const_tree fndecl);
117280 +extern unsigned int find_arg_number_tree(const_tree arg, const_tree func);
117281 +
117282 +
117283 +// size_overflow_debug.c
117284 +extern struct opt_pass *make_dump_pass(void);
117285 +
117286 +
117287 +// intentional_overflow.c
117288 +extern enum mark get_intentional_attr_type(const_tree node);
117289 +extern bool is_size_overflow_intentional_asm_yes(const_gimple stmt);
117290 +extern bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt);
117291 +extern bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum);
117292 +extern bool is_yes_intentional_attr(const_tree decl, unsigned int argnum);
117293 +extern bool is_turn_off_intentional_attr(const_tree decl);
117294 +extern void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum);
117295 +extern void check_intentional_attribute_ipa(struct interesting_node *cur_node);
117296 +extern bool is_a_cast_and_const_overflow(const_tree no_const_rhs);
117297 +extern bool is_const_plus_unsigned_signed_truncation(const_tree lhs);
117298 +extern bool is_a_constant_overflow(const_gimple stmt, const_tree rhs);
117299 +extern tree handle_intentional_overflow(struct visited *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2);
117300 +extern tree handle_integer_truncation(struct visited *visited, struct cgraph_node *caller_node, const_tree lhs);
117301 +extern bool is_a_neg_overflow(const_gimple stmt, const_tree rhs);
117302 +extern enum intentional_overflow_type add_mul_intentional_overflow(const_gimple def_stmt);
117303 +extern void unsigned_signed_cast_intentional_overflow(struct visited *visited, gimple stmt);
117304 +
117305 +
117306 +// insert_size_overflow_check_ipa.c
117307 +extern unsigned int search_function(void);
117308 +extern unsigned int call_count;
117309 +extern struct opt_pass *make_insert_size_overflow_check(void);
117310 +extern const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum);
117311 +
117312 +
117313 +// insert_size_overflow_asm.c
117314 +extern struct opt_pass *make_insert_size_overflow_asm_pass(void);
117315 +
117316 +
117317 +// misc.c
117318 +extern void set_current_function_decl(tree fndecl);
117319 +extern void unset_current_function_decl(void);
117320 +extern gimple get_def_stmt(const_tree node);
117321 +extern tree create_new_var(tree type);
117322 +extern gimple build_cast_stmt(struct visited *visited, tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before, bool force);
117323 +extern bool skip_types(const_tree var);
117324 +extern tree cast_a_tree(tree type, tree var);
117325 +extern bool is_size_overflow_type(const_tree var);
117326 +
117327 +
117328 +// insert_size_overflow_check_core.c
117329 +extern tree expand(struct visited *visited, struct cgraph_node *caller_node, tree lhs);
117330 +extern void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
117331 +extern tree dup_assign(struct visited *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
117332 +extern tree create_assign(struct visited *visited, gimple oldstmt, tree rhs1, bool before);
117333 +
117334 +
117335 +// remove_unnecessary_dup.c
117336 +extern struct opt_pass *make_remove_unnecessary_dup_pass(void);
117337 +extern void insert_cast_expr(struct visited *visited, gimple stmt, enum intentional_overflow_type type);
117338 +extern bool skip_expr_on_double_type(const_gimple stmt);
117339 +extern void create_up_and_down_cast(struct visited *visited, gimple use_stmt, tree orig_type, tree rhs);
117340 +
117341 +#endif
117342 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_debug.c b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117343 new file mode 100644
117344 index 0000000..4378111
117345 --- /dev/null
117346 +++ b/tools/gcc/size_overflow_plugin/size_overflow_debug.c
117347 @@ -0,0 +1,116 @@
117348 +/*
117349 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
117350 + * Licensed under the GPL v2, or (at your option) v3
117351 + *
117352 + * Homepage:
117353 + * http://www.grsecurity.net/~ephox/overflow_plugin/
117354 + *
117355 + * Documentation:
117356 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
117357 + *
117358 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
117359 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
117360 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
117361 + *
117362 + * Usage:
117363 + * $ make
117364 + * $ make run
117365 + */
117366 +
117367 +#include "gcc-common.h"
117368 +
117369 +static unsigned int dump_functions(void)
117370 +{
117371 + struct cgraph_node *node;
117372 +
117373 + FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
117374 + basic_block bb;
117375 +
117376 + push_cfun(DECL_STRUCT_FUNCTION(NODE_DECL(node)));
117377 + current_function_decl = NODE_DECL(node);
117378 +
117379 + fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", DECL_NAME_POINTER(current_function_decl));
117380 +
117381 + FOR_ALL_BB_FN(bb, cfun) {
117382 + gimple_stmt_iterator si;
117383 +
117384 + fprintf(stderr, "<bb %u>:\n", bb->index);
117385 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
117386 + debug_gimple_stmt(gsi_stmt(si));
117387 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
117388 + debug_gimple_stmt(gsi_stmt(si));
117389 + fprintf(stderr, "\n");
117390 + }
117391 +
117392 + fprintf(stderr, "-------------------------------------------------------------------------\n");
117393 +
117394 + pop_cfun();
117395 + current_function_decl = NULL_TREE;
117396 + }
117397 +
117398 + fprintf(stderr, "###############################################################################\n");
117399 +
117400 + return 0;
117401 +}
117402 +
117403 +#if BUILDING_GCC_VERSION >= 4009
117404 +static const struct pass_data dump_pass_data = {
117405 +#else
117406 +static struct ipa_opt_pass_d dump_pass = {
117407 + .pass = {
117408 +#endif
117409 + .type = SIMPLE_IPA_PASS,
117410 + .name = "dump",
117411 +#if BUILDING_GCC_VERSION >= 4008
117412 + .optinfo_flags = OPTGROUP_NONE,
117413 +#endif
117414 +#if BUILDING_GCC_VERSION >= 4009
117415 + .has_gate = false,
117416 + .has_execute = true,
117417 +#else
117418 + .gate = NULL,
117419 + .execute = dump_functions,
117420 + .sub = NULL,
117421 + .next = NULL,
117422 + .static_pass_number = 0,
117423 +#endif
117424 + .tv_id = TV_NONE,
117425 + .properties_required = 0,
117426 + .properties_provided = 0,
117427 + .properties_destroyed = 0,
117428 + .todo_flags_start = 0,
117429 + .todo_flags_finish = 0,
117430 +#if BUILDING_GCC_VERSION < 4009
117431 + },
117432 + .generate_summary = NULL,
117433 + .write_summary = NULL,
117434 + .read_summary = NULL,
117435 +#if BUILDING_GCC_VERSION >= 4006
117436 + .write_optimization_summary = NULL,
117437 + .read_optimization_summary = NULL,
117438 +#endif
117439 + .stmt_fixup = NULL,
117440 + .function_transform_todo_flags_start = 0,
117441 + .function_transform = NULL,
117442 + .variable_transform = NULL,
117443 +#endif
117444 +};
117445 +
117446 +#if BUILDING_GCC_VERSION >= 4009
117447 +namespace {
117448 +class dump_pass : public ipa_opt_pass_d {
117449 +public:
117450 + dump_pass() : ipa_opt_pass_d(dump_pass_data, g, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL) {}
117451 + unsigned int execute() { return dump_functions(); }
117452 +};
117453 +}
117454 +#endif
117455 +
117456 +struct opt_pass *make_dump_pass(void)
117457 +{
117458 +#if BUILDING_GCC_VERSION >= 4009
117459 + return new dump_pass();
117460 +#else
117461 + return &dump_pass.pass;
117462 +#endif
117463 +}
117464 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117465 new file mode 100644
117466 index 0000000..f38f762
117467 --- /dev/null
117468 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
117469 @@ -0,0 +1,6029 @@
117470 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
117471 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
117472 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
117473 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
117474 +sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
117475 +padzero_55 padzero 1 55 &sel_read_policyvers_55
117476 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
117477 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
117478 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
117479 +load_msg_95 load_msg 2 95 NULL
117480 +ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL
117481 +init_q_132 init_q 4 132 NULL
117482 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
117483 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
117484 +ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
117485 +ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
117486 +tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
117487 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
117488 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
117489 +obd_proc_jobid_var_seq_write_199 obd_proc_jobid_var_seq_write 3 199 NULL
117490 +ll_xattr_cache_seq_write_250 ll_xattr_cache_seq_write 3 250 NULL
117491 +vpdma_create_desc_list_255 vpdma_create_desc_list 2 255 NULL
117492 +br_port_info_size_268 br_port_info_size 0 268 NULL
117493 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
117494 +SYSC_connect_304 SYSC_connect 3 304 NULL
117495 +syslog_print_307 syslog_print 2 307 NULL
117496 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
117497 +mlx5_core_access_reg_361 mlx5_core_access_reg 3-5 361 NULL
117498 +aio_read_events_ring_410 aio_read_events_ring 3-0 410 NULL
117499 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
117500 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
117501 +cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
117502 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
117503 +iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
117504 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
117505 +smp_send_cmd_512 smp_send_cmd 3 512 NULL
117506 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
117507 +zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
117508 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
117509 +sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
117510 +lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
117511 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
117512 +start_isoc_chain_565 start_isoc_chain 2 565 NULL nohasharray
117513 +dev_hard_header_565 dev_hard_header 0 565 &start_isoc_chain_565
117514 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
117515 +btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
117516 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
117517 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
117518 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
117519 +viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
117520 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
117521 +cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL
117522 +unlink_queued_645 unlink_queued 4 645 NULL
117523 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
117524 +nvif_notify_new_671 nvif_notify_new 6 671 NULL
117525 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
117526 +persistent_ram_vmap_709 persistent_ram_vmap 2-1 709 NULL
117527 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
117528 +dvb_video_write_754 dvb_video_write 3 754 NULL
117529 +cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
117530 +ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
117531 +if_writecmd_815 if_writecmd 2 815 NULL
117532 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
117533 +error_state_read_859 error_state_read 6 859 NULL
117534 +lustre_init_msg_v2_864 lustre_init_msg_v2 2 864 NULL
117535 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
117536 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
117537 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
117538 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
117539 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
117540 +bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
117541 +usnic_ib_qp_grp_dump_hdr_989 usnic_ib_qp_grp_dump_hdr 2 989 NULL
117542 +readreg_1017 readreg 0-1 1017 NULL
117543 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
117544 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
117545 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
117546 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
117547 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
117548 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
117549 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
117550 +__arch_hweight8_1105 __arch_hweight8 0 1105 NULL
117551 +utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
117552 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
117553 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
117554 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
117555 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
117556 +pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
117557 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
117558 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
117559 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
117560 +lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
117561 +kernfs_file_direct_read_1238 kernfs_file_direct_read 3 1238 NULL
117562 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
117563 +drm_primary_helper_create_plane_1262 drm_primary_helper_create_plane 3 1262 NULL
117564 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
117565 +qla4xxx_change_queue_depth_1268 qla4xxx_change_queue_depth 2 1268 NULL
117566 +ioctl_private_iw_point_1273 ioctl_private_iw_point 7 1273 NULL
117567 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
117568 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
117569 +posix_acl_xattr_set_1301 posix_acl_xattr_set 4 1301 NULL
117570 +ffs_1322 ffs 0 1322 NULL
117571 +qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
117572 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
117573 +bond_verify_device_path_1352 bond_verify_device_path 3 1352 NULL
117574 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
117575 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
117576 +fw_stats_raw_read_1369 fw_stats_raw_read 3 1369 NULL
117577 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
117578 +xpcs_reg_addr_read_1381 xpcs_reg_addr_read 3 1381 NULL
117579 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
117580 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
117581 +SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
117582 +cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
117583 +init_rs_internal_1436 init_rs_internal 1 1436 NULL
117584 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
117585 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
117586 +xprt_alloc_1475 xprt_alloc 2 1475 NULL
117587 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
117588 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
117589 +fpregs_set_1497 fpregs_set 4 1497 NULL
117590 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
117591 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
117592 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
117593 +ffs_mutex_lock_1564 ffs_mutex_lock 0 1564 NULL
117594 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
117595 +ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
117596 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
117597 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
117598 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
117599 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
117600 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
117601 +rmap_add_1677 rmap_add 3 1677 NULL
117602 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
117603 +iwl_dbgfs_d0i3_refs_read_1705 iwl_dbgfs_d0i3_refs_read 3 1705 NULL
117604 +pdu_write_u_1710 pdu_write_u 3 1710 NULL
117605 +coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
117606 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
117607 +internal_create_group_1733 internal_create_group 0 1733 NULL
117608 +dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
117609 +usb_ep_align_maybe_1743 usb_ep_align_maybe 0-3 1743 NULL
117610 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
117611 +cosa_write_1774 cosa_write 3 1774 NULL
117612 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
117613 +__nodelist_scnprintf_1815 __nodelist_scnprintf 2-0 1815 NULL
117614 +sb_issue_zeroout_1884 sb_issue_zeroout 3 1884 NULL
117615 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
117616 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
117617 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
117618 +uhid_char_read_1920 uhid_char_read 3 1920 NULL
117619 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
117620 +azx_get_position_1927 azx_get_position 0 1927 NULL
117621 +bdev_erase_1933 bdev_erase 3 1933 NULL
117622 +ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
117623 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL nohasharray
117624 +nvif_object_sclass_1940 nvif_object_sclass 3 1940 &cyttsp_probe_1940
117625 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
117626 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
117627 +qla2xxx_get_vpd_field_1965 qla2xxx_get_vpd_field 4 1965 NULL
117628 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
117629 +gpio_power_write_1991 gpio_power_write 3 1991 NULL
117630 +__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
117631 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
117632 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
117633 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
117634 +BcmCopySection_2035 BcmCopySection 5 2035 NULL
117635 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
117636 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
117637 +__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
117638 +diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL
117639 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
117640 +xgmac_reg_value_read_2095 xgmac_reg_value_read 3 2095 NULL
117641 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
117642 +audit_expand_2098 audit_expand 0 2098 NULL
117643 +__set_print_fmt_2106 __set_print_fmt 0 2106 NULL
117644 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
117645 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
117646 +btrfs_file_extent_inline_len_2116 btrfs_file_extent_inline_len 0 2116 NULL
117647 +enable_read_2117 enable_read 3 2117 NULL
117648 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
117649 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
117650 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
117651 +__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
117652 +_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
117653 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
117654 +picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
117655 +u32_array_read_2219 u32_array_read 3 2219 NULL nohasharray
117656 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 &u32_array_read_2219
117657 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
117658 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
117659 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
117660 +do_update_counters_2259 do_update_counters 4 2259 NULL
117661 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
117662 +vpdma_alloc_desc_buf_2278 vpdma_alloc_desc_buf 2 2278 NULL
117663 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
117664 +sr_read_cmd_2299 sr_read_cmd 5 2299 NULL
117665 +kvm_clear_guest_page_2308 kvm_clear_guest_page 4 2308 NULL
117666 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
117667 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 NULL nohasharray
117668 +picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318
117669 +dice_hwdep_read_2326 dice_hwdep_read 3 2326 NULL
117670 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
117671 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
117672 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
117673 +xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
117674 +rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
117675 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
117676 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
117677 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
117678 +raid1_size_2419 raid1_size 0-2 2419 NULL
117679 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
117680 +wiphy_new_2482 wiphy_new 2 2482 NULL
117681 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
117682 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
117683 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
117684 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
117685 +batadv_tvlv_container_list_size_2524 batadv_tvlv_container_list_size 0 2524 NULL
117686 +smk_write_syslog_2529 smk_write_syslog 3 2529 NULL
117687 +__ceph_setxattr_2532 __ceph_setxattr 4 2532 NULL
117688 +sfw_create_rpc_2562 sfw_create_rpc 4 2562 NULL
117689 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
117690 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
117691 +mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
117692 +slot_bytes_2609 slot_bytes 0 2609 NULL
117693 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
117694 +switch_status_2629 switch_status 5 2629 NULL
117695 +_proc_do_string_2632 _proc_do_string 2 2632 NULL
117696 +tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
117697 +osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
117698 +ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
117699 +oti6858_write_2692 oti6858_write 4 2692 NULL
117700 +copy_to_iter_iovec_2697 copy_to_iter_iovec 2 2697 NULL
117701 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
117702 +memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
117703 +lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 NULL
117704 +xfs_readdir_2767 xfs_readdir 3 2767 NULL
117705 +fsl_edma_alloc_desc_2769 fsl_edma_alloc_desc 2 2769 NULL
117706 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL
117707 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
117708 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
117709 +iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
117710 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
117711 +vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
117712 +sock_create_2838 sock_create 0 2838 NULL
117713 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
117714 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
117715 +irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
117716 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
117717 +nla_padlen_2883 nla_padlen 1 2883 NULL
117718 +cmm_write_2896 cmm_write 3 2896 NULL
117719 +osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
117720 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
117721 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
117722 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
117723 +i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
117724 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
117725 +free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
117726 +bio_setup_sector_2970 bio_setup_sector 3 2970 NULL
117727 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
117728 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
117729 +lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
117730 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
117731 +depth_write_3021 depth_write 3 3021 NULL
117732 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
117733 +nvme_split_and_submit_3027 nvme_split_and_submit 3 3027 NULL
117734 +kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
117735 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
117736 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
117737 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
117738 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
117739 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
117740 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
117741 +__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
117742 +hfsplus_asc2uni_3071 hfsplus_asc2uni 0 3071 NULL nohasharray
117743 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 &hfsplus_asc2uni_3071
117744 +read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
117745 +bio_integrity_intervals_3094 bio_integrity_intervals 0-2 3094 NULL
117746 +ttusb2_msg_3100 ttusb2_msg 4 3100 NULL
117747 +rb_alloc_3102 rb_alloc 1 3102 NULL
117748 +ufshcd_get_rsp_upiu_result_3114 ufshcd_get_rsp_upiu_result 0 3114 NULL
117749 +simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
117750 +print_time_3132 print_time 0 3132 NULL
117751 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
117752 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
117753 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
117754 +pkcs7_sig_note_signature_3178 pkcs7_sig_note_signature 5 3178 NULL
117755 +uinput_ioctl_handler_3181 uinput_ioctl_handler 2 3181 NULL nohasharray
117756 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 &uinput_ioctl_handler_3181
117757 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
117758 +mempool_create_node_3191 mempool_create_node 1 3191 NULL
117759 +alloc_context_3194 alloc_context 1 3194 NULL
117760 +dma_init_coherent_memory_3197 dma_init_coherent_memory 3 3197 NULL
117761 +shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
117762 +codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
117763 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
117764 +btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
117765 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
117766 +write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
117767 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
117768 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
117769 +key_key_read_3241 key_key_read 3 3241 NULL
117770 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
117771 +ieee80211_if_write_beacon_loss_3296 ieee80211_if_write_beacon_loss 3 3296 NULL
117772 +cgroup_name_3300 cgroup_name 3 3300 NULL
117773 +__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
117774 +_iwl_dbgfs_d3_sram_write_3315 _iwl_dbgfs_d3_sram_write 3 3315 NULL
117775 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
117776 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
117777 +sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
117778 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
117779 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
117780 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
117781 +scnprintf_3360 scnprintf 0-2 3360 NULL
117782 +sr_read_3366 sr_read 3 3366 NULL
117783 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
117784 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
117785 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
117786 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
117787 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
117788 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
117789 +softsynth_write_3455 softsynth_write 3 3455 NULL
117790 +snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 NULL
117791 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
117792 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
117793 +mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
117794 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
117795 +SyS_readv_3539 SyS_readv 3 3539 NULL
117796 +nouveau_fuse_create__3546 nouveau_fuse_create_ 4 3546 NULL
117797 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
117798 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
117799 +evtchn_read_3569 evtchn_read 3 3569 NULL
117800 +ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
117801 +vc_resize_3585 vc_resize 3-2 3585 NULL
117802 +kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
117803 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
117804 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
117805 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
117806 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
117807 +fm10k_alloc_q_vector_3638 fm10k_alloc_q_vector 4-6 3638 NULL
117808 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
117809 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
117810 +_iwl_dbgfs_tx_flush_write_3675 _iwl_dbgfs_tx_flush_write 3 3675 NULL
117811 +snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL
117812 +ci_ll_write_3740 ci_ll_write 4 3740 NULL
117813 +msm_otg_mode_write_3788 msm_otg_mode_write 3 3788 NULL
117814 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
117815 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
117816 +llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
117817 +ceph_do_getattr_3838 ceph_do_getattr 0 3838 NULL
117818 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
117819 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
117820 +get_fd_set_3866 get_fd_set 1 3866 NULL
117821 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
117822 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
117823 +nvram_write_3894 nvram_write 3 3894 NULL
117824 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
117825 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
117826 +vcs_write_3910 vcs_write 3 3910 NULL
117827 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
117828 +hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
117829 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
117830 +mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
117831 +copy_from_user_atomic_iovec_3990 copy_from_user_atomic_iovec 0-4 3990 NULL
117832 +do_add_counters_3992 do_add_counters 3 3992 NULL
117833 +userspace_status_4004 userspace_status 4 4004 NULL
117834 +xfs_check_block_4005 xfs_check_block 4 4005 NULL nohasharray
117835 +mei_write_4005 mei_write 3 4005 &xfs_check_block_4005
117836 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
117837 +blk_end_request_4024 blk_end_request 3 4024 NULL
117838 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
117839 +mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
117840 +read_file_queues_4078 read_file_queues 3 4078 NULL
117841 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
117842 +C_SYSC_rt_sigpending_4114 C_SYSC_rt_sigpending 2 4114 NULL
117843 +tm6000_read_4151 tm6000_read 3 4151 NULL
117844 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
117845 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
117846 +get_alua_req_4166 get_alua_req 3 4166 NULL
117847 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
117848 +read_file_bool_4180 read_file_bool 3 4180 NULL
117849 +lstcon_test_add_4190 lstcon_test_add 10 4190 NULL
117850 +vring_new_virtqueue_4199 vring_new_virtqueue 2 4199 NULL
117851 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
117852 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
117853 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
117854 +ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
117855 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
117856 +get_connectors_for_crtc_4291 get_connectors_for_crtc 0 4291 NULL
117857 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
117858 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 2-3-5 4303 NULL
117859 +count_strings_4315 count_strings 0 4315 NULL nohasharray
117860 +cfg80211_inform_bss_4315 cfg80211_inform_bss 9 4315 &count_strings_4315
117861 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
117862 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
117863 +ima_eventdigest_init_common_4338 ima_eventdigest_init_common 2 4338 NULL
117864 +__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
117865 +lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
117866 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
117867 +access_process_vm_4412 access_process_vm 0 4412 NULL nohasharray
117868 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
117869 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
117870 +rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
117871 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
117872 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
117873 +snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
117874 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
117875 +set_link_security_4502 set_link_security 4 4502 NULL
117876 +ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
117877 +tty_register_device_4544 tty_register_device 2 4544 NULL
117878 +fsl_edma_prep_slave_sg_4555 fsl_edma_prep_slave_sg 3 4555 NULL
117879 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
117880 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
117881 +bch_alloc_4593 bch_alloc 1 4593 NULL
117882 +ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
117883 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
117884 +nve0_gpio_intr_mask_4665 nve0_gpio_intr_mask 4-3 4665 NULL
117885 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
117886 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
117887 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
117888 +kone_receive_4690 kone_receive 4 4690 NULL
117889 +hash_netportnet6_expire_4702 hash_netportnet6_expire 4 4702 NULL
117890 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
117891 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
117892 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
117893 +ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
117894 +bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
117895 +lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
117896 +pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
117897 +create_subvol_4791 create_subvol 4 4791 NULL
117898 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
117899 +C_SYSC_setsockopt_4806 C_SYSC_setsockopt 5 4806 NULL
117900 +repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
117901 +scsi_end_request_4839 scsi_end_request 3-4 4839 NULL
117902 +comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
117903 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
117904 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
117905 +ocfs2_defrag_extent_4873 ocfs2_defrag_extent 2 4873 NULL
117906 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
117907 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
117908 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
117909 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
117910 +ath10k_read_chip_id_4969 ath10k_read_chip_id 3 4969 NULL
117911 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
117912 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
117913 +compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
117914 +do_mincore_5018 do_mincore 0-2-1 5018 NULL
117915 +cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
117916 +ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
117917 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
117918 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
117919 +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
117920 +kfifo_copy_from_user_5091 kfifo_copy_from_user 3-4-0 5091 &get_random_bytes_5091 nohasharray
117921 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
117922 +sound_write_5102 sound_write 3 5102 NULL
117923 +i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
117924 +qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
117925 +bucket_table_alloc_5149 bucket_table_alloc 1 5149 NULL
117926 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
117927 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
117928 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
117929 +trf7970a_read_cont_5179 trf7970a_read_cont 4 5179 NULL
117930 +ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
117931 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
117932 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
117933 +ipv4_tun_to_nlattr_5261 ipv4_tun_to_nlattr 4 5261 NULL
117934 +dvb_ringbuffer_write_user_5270 dvb_ringbuffer_write_user 3 5270 NULL
117935 +xgmac_reg_addr_read_5278 xgmac_reg_addr_read 3 5278 NULL
117936 +usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
117937 +r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
117938 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
117939 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
117940 +uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
117941 +cq_free_res_5355 cq_free_res 5 5355 NULL
117942 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
117943 +cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
117944 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
117945 +ll_xattr_cache_refill_5468 ll_xattr_cache_refill 0 5468 NULL
117946 +kernfs_fop_write_5471 kernfs_fop_write 3 5471 NULL
117947 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
117948 +pci_enable_msix_exact_5482 pci_enable_msix_exact 3 5482 NULL
117949 +cifs_security_flags_proc_write_5484 cifs_security_flags_proc_write 3 5484 NULL
117950 +tty_write_5494 tty_write 3 5494 NULL
117951 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
117952 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
117953 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
117954 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
117955 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
117956 +le_readq_5557 le_readq 0 5557 NULL
117957 +inw_5558 inw 0 5558 NULL
117958 +bioset_create_5580 bioset_create 1 5580 NULL
117959 +oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
117960 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
117961 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
117962 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
117963 +get_arg_5694 get_arg 3 5694 NULL
117964 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
117965 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
117966 +sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
117967 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
117968 +nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
117969 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL nohasharray
117970 +ath10k_core_create_5806 ath10k_core_create 1 5806 &skb_copy_datagram_iovec_5806
117971 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
117972 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
117973 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
117974 +setup_req_5848 setup_req 3 5848 NULL
117975 +ria_page_count_5849 ria_page_count 0 5849 NULL
117976 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
117977 +uinput_compat_ioctl_5861 uinput_compat_ioctl 2 5861 NULL
117978 +config_buf_5862 config_buf 0 5862 NULL nohasharray
117979 +ufshcd_check_query_response_5862 ufshcd_check_query_response 0 5862 &config_buf_5862
117980 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
117981 +port_show_regs_5904 port_show_regs 3 5904 NULL
117982 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
117983 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
117984 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
117985 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
117986 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
117987 +ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
117988 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
117989 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
117990 +SyS_semop_5980 SyS_semop 3 5980 NULL
117991 +btrfs_item_offset_6019 btrfs_item_offset 0 6019 NULL
117992 +alloc_msg_6072 alloc_msg 1 6072 NULL
117993 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
117994 +_random_read_6098 _random_read 3 6098 NULL
117995 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL nohasharray
117996 +force_static_address_read_6110 force_static_address_read 3 6110 &ipmi_addr_length_6110
117997 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
117998 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
117999 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
118000 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
118001 +maybe_insert_hole_6167 maybe_insert_hole 3 6167 NULL
118002 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
118003 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
118004 +snd_efw_command_get_phys_meters_6190 snd_efw_command_get_phys_meters 3 6190 NULL
118005 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
118006 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
118007 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
118008 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
118009 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
118010 +of_gpio_count_6270 of_gpio_count 0 6270 NULL
118011 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
118012 +snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
118013 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
118014 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
118015 +serial_port_in_6291 serial_port_in 0 6291 NULL
118016 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
118017 +hfsplus_direct_IO_6313 hfsplus_direct_IO 4 6313 NULL
118018 +SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
118019 +hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
118020 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
118021 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
118022 +regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
118023 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
118024 +arch_gnttab_valloc_6372 arch_gnttab_valloc 2 6372 NULL
118025 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL nohasharray
118026 +sync_fence_alloc_6378 sync_fence_alloc 1 6378 &osd_req_read_sg_kern_6378
118027 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
118028 +add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
118029 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
118030 +__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
118031 +C_SYSC_vmsplice_6470 C_SYSC_vmsplice 3 6470 NULL
118032 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
118033 +qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
118034 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
118035 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
118036 +mei_read_6507 mei_read 3 6507 NULL
118037 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
118038 +wdm_read_6549 wdm_read 3 6549 NULL
118039 +dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
118040 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
118041 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
118042 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
118043 +xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
118044 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
118045 +btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3 6696 NULL
118046 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
118047 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
118048 +mpeg_read_6708 mpeg_read 3 6708 NULL
118049 +ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
118050 +check_clk_sync_6717 check_clk_sync 2 6717 NULL
118051 +video_proc_write_6724 video_proc_write 3 6724 NULL
118052 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
118053 +inet_recv_error_6744 inet_recv_error 3 6744 NULL
118054 +kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
118055 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
118056 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
118057 +zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
118058 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
118059 +ll_xattr_cache_find_6798 ll_xattr_cache_find 0 6798 NULL
118060 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
118061 +rounded_hashtable_size_6802 rounded_hashtable_size 0 6802 NULL
118062 +lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
118063 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
118064 +blk_alloc_flush_queue_6839 blk_alloc_flush_queue 3 6839 NULL
118065 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
118066 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
118067 +perf_output_sample_ustack_6868 perf_output_sample_ustack 2 6868 NULL
118068 +dio_complete_6879 dio_complete 0-3-2 6879 NULL
118069 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 NULL nohasharray
118070 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 &raw_seticmpfilter_6888
118071 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
118072 +proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
118073 +spi_show_regs_6911 spi_show_regs 3 6911 &proc_sessionid_read_6911 nohasharray
118074 +acm_alloc_minor_6911 acm_alloc_minor 0 6911 &spi_show_regs_6911
118075 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
118076 +do_msgrcv_6921 do_msgrcv 3 6921 NULL
118077 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
118078 +ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
118079 +qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
118080 +tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
118081 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
118082 +i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
118083 +rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
118084 +lustre_pack_reply_6982 lustre_pack_reply 2 6982 NULL
118085 +request_key_async_6990 request_key_async 4 6990 NULL
118086 +tpl_write_6998 tpl_write 3 6998 NULL
118087 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
118088 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
118089 +ld_usb_write_7022 ld_usb_write 3 7022 NULL
118090 +wimax_msg_7030 wimax_msg 4 7030 NULL
118091 +ceph_kvmalloc_7033 ceph_kvmalloc 1 7033 NULL
118092 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
118093 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
118094 +nouveau_device_create__7063 nouveau_device_create_ 7 7063 NULL
118095 +hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
118096 +event_enable_read_7074 event_enable_read 3 7074 NULL
118097 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL nohasharray
118098 +tipc_send_packet_7091 tipc_send_packet 4 7091 &beacon_interval_read_7091
118099 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
118100 +osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
118101 +qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
118102 +kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
118103 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
118104 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
118105 +hdlc_loop_7255 hdlc_loop 0 7255 NULL
118106 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL nohasharray
118107 +kimage_alloc_init_7282 kimage_alloc_init 3 7282 &rx_rate_rx_frames_per_rates_read_7282
118108 +get_string_7302 get_string 0 7302 NULL
118109 +pci_vpd_info_field_size_7324 pci_vpd_info_field_size 0 7324 NULL
118110 +mgmt_control_7349 mgmt_control 3 7349 NULL
118111 +at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
118112 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
118113 +ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
118114 +hweight_long_7388 hweight_long 0-1 7388 NULL
118115 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
118116 +_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
118117 +audmux_read_file_7400 audmux_read_file 3 7400 NULL
118118 +readb_7401 readb 0 7401 NULL
118119 +tipc_recvmsg_7402 tipc_recvmsg 4 7402 NULL
118120 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
118121 +__copy_to_user_nocheck_7443 __copy_to_user_nocheck 0-3 7443 NULL
118122 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
118123 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
118124 +rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
118125 +l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
118126 +garp_request_join_7471 garp_request_join 4 7471 NULL nohasharray
118127 +ReadHSCX_7471 ReadHSCX 0 7471 &garp_request_join_7471
118128 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
118129 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 NULL nohasharray
118130 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 &ahash_instance_headroom_7509
118131 +array_zalloc_7519 array_zalloc 1-2 7519 NULL
118132 +ath10k_read_htt_stats_mask_7557 ath10k_read_htt_stats_mask 3 7557 NULL
118133 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
118134 +netvsc_get_slots_7565 netvsc_get_slots 0 7565 NULL
118135 +cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
118136 +groups_alloc_7614 groups_alloc 1 7614 NULL nohasharray
118137 +create_dir_7614 create_dir 0 7614 &groups_alloc_7614
118138 +_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
118139 +fault_inject_write_7662 fault_inject_write 3 7662 NULL
118140 +acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 NULL
118141 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
118142 +dev_write_7708 dev_write 3 7708 NULL
118143 +pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
118144 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
118145 +iwl_dbgfs_bt_cmd_read_7770 iwl_dbgfs_bt_cmd_read 3 7770 NULL
118146 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
118147 +__videobuf_read_start_7782 __videobuf_read_start 0 7782 NULL
118148 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
118149 +bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
118150 +diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
118151 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
118152 +seq_buf_alloc_7828 seq_buf_alloc 1 7828 NULL
118153 +cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
118154 +tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
118155 +config_desc_7878 config_desc 0 7878 NULL
118156 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
118157 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
118158 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
118159 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
118160 +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
118161 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
118162 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
118163 +vcs_read_8017 vcs_read 3 8017 NULL
118164 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
118165 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
118166 +spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
118167 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 NULL
118168 +venus_lookup_8121 venus_lookup 4 8121 NULL
118169 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
118170 +xfs_file_fallocate_8150 xfs_file_fallocate 3-4 8150 NULL
118171 +ufshcd_wait_for_dev_cmd_8168 ufshcd_wait_for_dev_cmd 0 8168 NULL
118172 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
118173 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
118174 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
118175 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
118176 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
118177 +play_iframe_8219 play_iframe 3 8219 NULL
118178 +kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL
118179 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
118180 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
118181 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
118182 +init_cdev_8274 init_cdev 1 8274 NULL
118183 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
118184 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
118185 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
118186 +rtw_cfg80211_rx_action_8329 rtw_cfg80211_rx_action 3 8329 NULL
118187 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
118188 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
118189 +generic_write_sync_8358 generic_write_sync 0 8358 NULL
118190 +ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
118191 +ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
118192 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
118193 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
118194 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
118195 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
118196 +roccat_common2_sysfs_read_8431 roccat_common2_sysfs_read 6 8431 NULL
118197 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
118198 +fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
118199 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
118200 +dev_config_8506 dev_config 3 8506 NULL
118201 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
118202 +nouveau_platform_device_create__8514 nouveau_platform_device_create_ 2 8514 NULL
118203 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
118204 +user_on_off_8552 user_on_off 2 8552 NULL
118205 +profile_remove_8556 profile_remove 3 8556 NULL
118206 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
118207 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
118208 +tower_write_8580 tower_write 3 8580 NULL
118209 +cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
118210 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
118211 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
118212 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
118213 +fuse_send_write_pages_8636 fuse_send_write_pages 5-0 8636 NULL
118214 +mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
118215 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
118216 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
118217 +bpf_prog_size_8685 bpf_prog_size 0 8685 NULL
118218 +rproc_trace_read_8686 rproc_trace_read 3 8686 NULL
118219 +skb_frag_size_8695 skb_frag_size 0 8695 NULL
118220 +arcfb_write_8702 arcfb_write 3 8702 NULL
118221 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
118222 +init_header_8703 init_header 0 8703 &i_size_read_8703
118223 +ufshcd_get_tr_ocs_8706 ufshcd_get_tr_ocs 0 8706 NULL
118224 +HDLC_irq_8709 HDLC_irq 2 8709 NULL
118225 +ctrl_out_8712 ctrl_out 3-5 8712 NULL
118226 +tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
118227 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
118228 +iov_iter_zero_8748 iov_iter_zero 1 8748 NULL
118229 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
118230 +compound_order_8750 compound_order 0 8750 NULL
118231 +cfg80211_inform_bss_width_8754 cfg80211_inform_bss_width 10 8754 NULL
118232 +yurex_write_8761 yurex_write 3 8761 NULL
118233 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
118234 +kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
118235 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
118236 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 4-3 8785 NULL
118237 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
118238 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
118239 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
118240 +ll_xattr_cache_get_8829 ll_xattr_cache_get 0 8829 NULL
118241 +get_queue_depth_8833 get_queue_depth 0 8833 NULL
118242 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
118243 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
118244 +iwl_rx_packet_len_8854 iwl_rx_packet_len 0 8854 NULL
118245 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
118246 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
118247 +xgmac_reg_value_write_8860 xgmac_reg_value_write 3 8860 NULL
118248 +radeon_drm_ioctl_8875 radeon_drm_ioctl 2 8875 NULL
118249 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
118250 +ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
118251 +tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
118252 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
118253 +sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
118254 +write_file_ani_8918 write_file_ani 3 8918 NULL
118255 +layout_commit_8926 layout_commit 3 8926 NULL
118256 +cp2112_hid_get_8933 cp2112_hid_get 4 8933 NULL
118257 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
118258 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
118259 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
118260 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
118261 +qib_qsfp_dump_8966 qib_qsfp_dump 0-3 8966 NULL
118262 +venus_mkdir_8967 venus_mkdir 4 8967 NULL
118263 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
118264 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
118265 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
118266 +sony_register_touchpad_8981 sony_register_touchpad 2 8981 NULL
118267 +jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
118268 +il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
118269 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
118270 +fd_ioctl_9028 fd_ioctl 3 9028 NULL
118271 +nla_put_9042 nla_put 3 9042 NULL
118272 +sta_tx_latency_stat_header_9050 sta_tx_latency_stat_header 0-3-4 9050 NULL
118273 +snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
118274 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
118275 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
118276 +create_queues_9088 create_queues 2-3 9088 NULL
118277 +nvkm_output_create__9091 nvkm_output_create_ 6 9091 NULL
118278 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
118279 +adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
118280 +gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 NULL nohasharray
118281 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 &gfn_to_rmap_9110
118282 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
118283 +vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
118284 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
118285 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
118286 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
118287 +altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
118288 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
118289 +iwl_dbgfs_frame_stats_read_9211 iwl_dbgfs_frame_stats_read 3 9211 NULL
118290 +card_send_command_9215 card_send_command 3 9215 NULL
118291 +virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
118292 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
118293 +l2cap_create_connless_pdu_9222 l2cap_create_connless_pdu 3 9222 NULL
118294 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
118295 +hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
118296 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
118297 +flakey_status_9274 flakey_status 5 9274 NULL
118298 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
118299 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
118300 +__blockdev_direct_IO_9321 __blockdev_direct_IO 0-6 9321 NULL
118301 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
118302 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
118303 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
118304 +ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
118305 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
118306 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
118307 +read_9397 read 3 9397 NULL
118308 +hash_ipportip4_expire_9415 hash_ipportip4_expire 4 9415 NULL
118309 +btrfs_drop_extents_9423 btrfs_drop_extents 4 9423 NULL
118310 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
118311 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
118312 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
118313 +get_registers_9470 get_registers 4 9470 NULL nohasharray
118314 +agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 &get_registers_9470
118315 +crypt_status_9492 crypt_status 5 9492 NULL
118316 +lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
118317 +lp_write_9511 lp_write 3 9511 NULL
118318 +mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
118319 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
118320 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
118321 +read_file_dma_9530 read_file_dma 3 9530 NULL
118322 +iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
118323 +il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
118324 +compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
118325 +fw_node_create_9559 fw_node_create 2 9559 NULL
118326 +kobj_map_9566 kobj_map 2-3 9566 NULL
118327 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
118328 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
118329 +lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
118330 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
118331 +ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
118332 +acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
118333 +ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
118334 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
118335 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
118336 +tipc_port_mcast_xmit_9663 tipc_port_mcast_xmit 4 9663 NULL
118337 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
118338 +dns_query_9676 dns_query 3 9676 NULL
118339 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
118340 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
118341 +lowpan_control_write_9699 lowpan_control_write 3 9699 NULL
118342 +vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
118343 +fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
118344 +ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
118345 +cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
118346 +parse_uac2_sample_rate_range_9718 parse_uac2_sample_rate_range 0 9718 NULL
118347 +btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
118348 +SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
118349 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
118350 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
118351 +ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
118352 +regmap_multi_reg_write_bypassed_9751 regmap_multi_reg_write_bypassed 3 9751 NULL nohasharray
118353 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 &regmap_multi_reg_write_bypassed_9751
118354 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
118355 +copy_page_from_iter_bvec_9767 copy_page_from_iter_bvec 0-3 9767 NULL
118356 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
118357 +kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
118358 +bio_alloc_map_data_9798 bio_alloc_map_data 1 9798 NULL
118359 +ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL nohasharray
118360 +udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 &ieee80211_if_read_state_9813
118361 +compat_SyS_vmsplice_9828 compat_SyS_vmsplice 3 9828 NULL
118362 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
118363 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
118364 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
118365 +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
118366 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
118367 +snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
118368 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
118369 +iwl_dbgfs_prph_reg_read_9928 iwl_dbgfs_prph_reg_read 3 9928 NULL
118370 +root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
118371 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
118372 +read_file_misc_9948 read_file_misc 3 9948 NULL
118373 +csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
118374 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
118375 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
118376 +btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
118377 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
118378 +ceph_oloc_oid_to_pg_10003 ceph_oloc_oid_to_pg 0 10003 NULL
118379 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
118380 +asymmetric_key_generate_id_10064 asymmetric_key_generate_id 2-4 10064 NULL
118381 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
118382 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
118383 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
118384 +gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
118385 +SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL
118386 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
118387 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL nohasharray
118388 +tracing_nsecs_write_10157 tracing_nsecs_write 3 10157 &rx_out_of_mem_read_10157
118389 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL
118390 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
118391 +kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
118392 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
118393 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
118394 +hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
118395 +lmv_hsm_req_count_10245 lmv_hsm_req_count 0 10245 NULL
118396 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
118397 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
118398 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
118399 +nvif_object_new_10300 nvif_object_new 5 10300 NULL
118400 +read_emulate_10310 read_emulate 2-4 10310 NULL
118401 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
118402 +compat_SyS_writev_10327 compat_SyS_writev 3 10327 NULL
118403 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
118404 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
118405 +whci_add_cap_10350 whci_add_cap 0 10350 NULL
118406 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
118407 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
118408 +sta_ht_capa_read_10366 sta_ht_capa_read 3 10366 NULL
118409 +ecryptfs_decode_and_decrypt_filename_10379 ecryptfs_decode_and_decrypt_filename 5 10379 NULL
118410 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
118411 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
118412 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
118413 +hash_ipportip6_expire_10478 hash_ipportip6_expire 4 10478 NULL
118414 +nouveau_pwr_create__10483 nouveau_pwr_create_ 4 10483 NULL
118415 +ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
118416 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
118417 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
118418 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
118419 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
118420 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL
118421 +kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 NULL nohasharray
118422 +snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 &kstrtouint_from_user_10536
118423 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
118424 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
118425 +otp_read_10594 otp_read 2-4-5 10594 NULL
118426 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
118427 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
118428 +fq_alloc_node_10633 fq_alloc_node 1 10633 NULL
118429 +nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
118430 +efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
118431 +parport_write_10669 parport_write 0 10669 NULL
118432 +edge_write_10692 edge_write 4 10692 NULL
118433 +selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
118434 +inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
118435 +pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
118436 +shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
118437 +spi_sync_10731 spi_sync 0 10731 NULL
118438 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
118439 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
118440 +SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
118441 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
118442 +rd_build_prot_space_10761 rd_build_prot_space 2-3 10761 NULL
118443 +kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4 10765 NULL
118444 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
118445 +diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
118446 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
118447 +ext4_direct_IO_10843 ext4_direct_IO 4 10843 NULL
118448 +ida_get_new_above_10853 ida_get_new_above 0 10853 NULL
118449 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
118450 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
118451 +wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
118452 +get_scq_10897 get_scq 2 10897 NULL
118453 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
118454 +lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
118455 +__copy_from_user_10918 __copy_from_user 0-3 10918 NULL
118456 +kobject_add_10919 kobject_add 0 10919 NULL
118457 +ar9003_dump_modal_eeprom_10959 ar9003_dump_modal_eeprom 3-2-0 10959 NULL
118458 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
118459 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
118460 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
118461 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
118462 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
118463 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
118464 +nouveau_gpio_create__11048 nouveau_gpio_create_ 4 11048 NULL
118465 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
118466 +insert_inline_extent_backref_11063 insert_inline_extent_backref 8 11063 NULL nohasharray
118467 +qlcnic_83xx_calculate_msix_vector_11063 qlcnic_83xx_calculate_msix_vector 0 11063 &insert_inline_extent_backref_11063
118468 +xfs_collapse_file_space_11075 xfs_collapse_file_space 2-3 11075 NULL
118469 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
118470 +count_argc_11083 count_argc 0 11083 NULL
118471 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
118472 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
118473 +tc90522_master_xfer_11119 tc90522_master_xfer 3 11119 NULL
118474 +page_offset_11120 page_offset 0 11120 NULL
118475 +tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL
118476 +alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
118477 +snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 NULL
118478 +copy_from_iter_iovec_11196 copy_from_iter_iovec 2 11196 NULL
118479 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
118480 +comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
118481 +of_irq_count_11253 of_irq_count 0 11253 NULL
118482 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
118483 +ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
118484 +SYSC_getrandom_11294 SYSC_getrandom 2 11294 NULL
118485 +tipc_msg_build_11304 tipc_msg_build 3-4-5 11304 NULL
118486 +__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
118487 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
118488 +bcache_dev_sectors_dirty_add_11315 bcache_dev_sectors_dirty_add 3-4 11315 NULL
118489 +sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
118490 +tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
118491 +construct_key_11329 construct_key 3 11329 NULL nohasharray
118492 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
118493 +next_segment_11330 next_segment 0-2-1 11330 NULL
118494 +persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
118495 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
118496 +sel_write_create_11353 sel_write_create 3 11353 NULL nohasharray
118497 +nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 &sel_write_create_11353
118498 +of_get_available_child_count_11361 of_get_available_child_count 0 11361 NULL
118499 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
118500 +tcf_register_action_11381 tcf_register_action 2 11381 NULL nohasharray
118501 +nft_value_dump_11381 nft_value_dump 3 11381 &tcf_register_action_11381
118502 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
118503 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
118504 +lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
118505 +___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
118506 +str_to_user_11411 str_to_user 2 11411 NULL
118507 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
118508 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
118509 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
118510 +trace_options_read_11419 trace_options_read 3 11419 NULL
118511 +i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
118512 +bttv_read_11432 bttv_read 3 11432 NULL
118513 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
118514 +ufshcd_change_queue_depth_11477 ufshcd_change_queue_depth 2 11477 NULL
118515 +sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL nohasharray
118516 +pci_set_power_state_11479 pci_set_power_state 0 11479 &sca3000_read_first_n_hw_rb_11479
118517 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
118518 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
118519 +ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
118520 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
118521 +skb_cow_data_11565 skb_cow_data 0 11565 NULL
118522 +lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
118523 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
118524 +batadv_iv_ogm_orig_add_if_11586 batadv_iv_ogm_orig_add_if 2 11586 NULL
118525 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
118526 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
118527 +batadv_iv_ogm_orig_del_if_11604 batadv_iv_ogm_orig_del_if 2 11604 NULL
118528 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
118529 +C_SYSC_migrate_pages_11618 C_SYSC_migrate_pages 2 11618 NULL
118530 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
118531 +nla_total_size_11658 nla_total_size 0-1 11658 NULL
118532 +srpc_create_client_rpc_11664 srpc_create_client_rpc 3 11664 NULL nohasharray
118533 +slab_ksize_11664 slab_ksize 0 11664 &srpc_create_client_rpc_11664
118534 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
118535 +compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
118536 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
118537 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
118538 +split_11691 split 2 11691 NULL
118539 +compat_SyS_keyctl_11695 compat_SyS_keyctl 4 11695 NULL nohasharray
118540 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 &compat_SyS_keyctl_11695
118541 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
118542 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
118543 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
118544 +ieee80211_get_num_supported_channels_11768 ieee80211_get_num_supported_channels 0 11768 NULL
118545 +tipc_sendmsg_11769 tipc_sendmsg 4 11769 NULL
118546 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
118547 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
118548 +pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
118549 +umc_device_register_11824 umc_device_register 0 11824 NULL
118550 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
118551 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
118552 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
118553 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
118554 +pci_enable_msix_range_11852 pci_enable_msix_range 0-4 11852 NULL
118555 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
118556 +l2cap_chan_send_11878 l2cap_chan_send 3 11878 NULL
118557 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
118558 +mdc_rename_11899 mdc_rename 4-6 11899 NULL
118559 +xstateregs_get_11906 xstateregs_get 4 11906 NULL
118560 +ti_write_11916 ti_write 4 11916 NULL
118561 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
118562 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
118563 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
118564 +r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
118565 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
118566 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
118567 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
118568 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
118569 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
118570 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
118571 +batadv_tt_global_size_mod_12085 batadv_tt_global_size_mod 3 12085 NULL
118572 +rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
118573 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
118574 +set_powered_12129 set_powered 4 12129 NULL
118575 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
118576 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
118577 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
118578 +rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
118579 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
118580 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
118581 +fnic_reset_stats_write_12177 fnic_reset_stats_write 3 12177 NULL
118582 +LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
118583 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
118584 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
118585 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
118586 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
118587 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
118588 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
118589 +__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
118590 +usnic_ib_qp_grp_dump_rows_12239 usnic_ib_qp_grp_dump_rows 3 12239 NULL
118591 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
118592 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
118593 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
118594 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
118595 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 NULL nohasharray
118596 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 &roundup_to_multiple_of_64_12288
118597 +bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
118598 +usnic_transport_sock_to_str_12322 usnic_transport_sock_to_str 2-0 12322 NULL
118599 +ufshcd_copy_query_response_12324 ufshcd_copy_query_response 0 12324 NULL
118600 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
118601 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
118602 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
118603 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
118604 +write_file_dump_12391 write_file_dump 3 12391 NULL nohasharray
118605 +btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 &write_file_dump_12391 nohasharray
118606 +populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
118607 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
118608 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
118609 +cfs_array_alloc_12441 cfs_array_alloc 1-2 12441 NULL
118610 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
118611 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
118612 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
118613 +__ceph_osdc_start_request_12502 __ceph_osdc_start_request 0 12502 NULL
118614 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
118615 +nvkm_event_init_12565 nvkm_event_init 3-2 12565 NULL
118616 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
118617 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
118618 +_iwl_dbgfs_prph_reg_write_12597 _iwl_dbgfs_prph_reg_write 3 12597 NULL
118619 +tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
118620 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
118621 +sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
118622 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
118623 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
118624 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
118625 +nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
118626 +rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
118627 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
118628 +lustre_pack_request_v2_12665 lustre_pack_request_v2 2 12665 NULL
118629 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
118630 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
118631 +ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
118632 +iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
118633 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
118634 +ivtv_write_12721 ivtv_write 3 12721 NULL
118635 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
118636 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
118637 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
118638 +listxattr_12769 listxattr 3 12769 NULL
118639 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
118640 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
118641 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
118642 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
118643 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
118644 +spidev_sync_12842 spidev_sync 0 12842 NULL
118645 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
118646 +ath9k_dump_4k_modal_eeprom_12883 ath9k_dump_4k_modal_eeprom 3-2 12883 NULL
118647 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
118648 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
118649 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
118650 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
118651 +bm_status_write_12964 bm_status_write 3 12964 NULL
118652 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
118653 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
118654 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
118655 +bset_prev_bytes_13020 bset_prev_bytes 0 13020 NULL
118656 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
118657 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
118658 +__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL nohasharray
118659 +ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 &__dn_setsockopt_13060
118660 +ufshcd_compose_upiu_13076 ufshcd_compose_upiu 0 13076 NULL
118661 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
118662 +ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
118663 +SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
118664 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
118665 +bfad_debugfs_read_13119 bfad_debugfs_read 3 13119 NULL
118666 +blk_update_request_13146 blk_update_request 3 13146 NULL
118667 +caif_stream_recvmsg_13173 caif_stream_recvmsg 4 13173 NULL
118668 +pwr_disable_ps_read_13176 pwr_disable_ps_read 3 13176 NULL
118669 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
118670 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
118671 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
118672 +comedi_read_13199 comedi_read 3 13199 NULL
118673 +hash_ipport4_expire_13201 hash_ipport4_expire 4 13201 NULL
118674 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
118675 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
118676 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
118677 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3 13243 NULL
118678 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
118679 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
118680 +bio_integrity_trim_13259 bio_integrity_trim 3-2 13259 NULL
118681 +simple_attr_write_13260 simple_attr_write 3 13260 NULL
118682 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
118683 +nvkm_ltc_create__13275 nvkm_ltc_create_ 4 13275 NULL
118684 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
118685 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
118686 +nvkm_i2c_pad_create__13292 nvkm_i2c_pad_create_ 5 13292 NULL
118687 +sd_major_13294 sd_major 0-1 13294 NULL
118688 +read_file_phy_err_13318 read_file_phy_err 3 13318 NULL
118689 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5 13337 NULL
118690 +round_event_name_len_13348 round_event_name_len 0 13348 NULL
118691 +hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
118692 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
118693 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
118694 +ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
118695 +lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
118696 +dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
118697 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
118698 +sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
118699 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 7-8-9 13443 NULL
118700 +sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
118701 +data_read_13494 data_read 3 13494 NULL nohasharray
118702 +ext_prop_data_store_13494 ext_prop_data_store 3 13494 &data_read_13494
118703 +ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 0-2 13512 NULL
118704 +core_status_13515 core_status 4 13515 NULL
118705 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
118706 +bm_init_13529 bm_init 2 13529 NULL
118707 +llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
118708 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
118709 +hash_net4_expire_13559 hash_net4_expire 4 13559 NULL
118710 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
118711 +cache_write_13589 cache_write 3 13589 NULL
118712 +Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
118713 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
118714 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
118715 +packet_snd_13634 packet_snd 3 13634 NULL
118716 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
118717 +cache_downcall_13666 cache_downcall 3 13666 NULL
118718 +usb_get_string_13693 usb_get_string 0 13693 NULL
118719 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
118720 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
118721 +udf_direct_IO_13765 udf_direct_IO 4 13765 NULL
118722 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
118723 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
118724 +alloc_indirect_13783 alloc_indirect 1 13783 NULL
118725 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
118726 +random_read_13815 random_read 3 13815 NULL
118727 +mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
118728 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
118729 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
118730 +qce_ahash_hmac_setkey_13837 qce_ahash_hmac_setkey 3 13837 NULL
118731 +enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
118732 +evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
118733 +compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
118734 +qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL
118735 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
118736 +cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
118737 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
118738 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
118739 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
118740 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
118741 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
118742 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
118743 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
118744 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
118745 +qcam_read_13977 qcam_read 3 13977 NULL
118746 +dsp_read_13980 dsp_read 2 13980 NULL
118747 +dvb_demux_read_13981 dvb_demux_read 3 13981 NULL
118748 +sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
118749 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
118750 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
118751 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
118752 +pci_add_ext_cap_save_buffer_14032 pci_add_ext_cap_save_buffer 3 14032 NULL
118753 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
118754 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
118755 +ovs_nla_alloc_flow_actions_14056 ovs_nla_alloc_flow_actions 1 14056 NULL
118756 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
118757 +lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
118758 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
118759 +ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
118760 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
118761 +em_canid_change_14150 em_canid_change 3 14150 NULL
118762 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
118763 +midi_alloc_ep_req_14159 midi_alloc_ep_req 2 14159 NULL
118764 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
118765 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
118766 +datafab_read_data_14186 datafab_read_data 4 14186 NULL
118767 +hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
118768 +alloc_async_14208 alloc_async 1 14208 NULL
118769 +ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
118770 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
118771 +dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
118772 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL
118773 +ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
118774 +rr_status_14293 rr_status 5 14293 NULL
118775 +read_default_ldt_14302 read_default_ldt 2 14302 NULL nohasharray
118776 +lustre_pack_reply_flags_14302 lustre_pack_reply_flags 2 14302 &read_default_ldt_14302
118777 +oo_objects_14319 oo_objects 0 14319 NULL
118778 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
118779 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
118780 +hash_ipportnet4_expire_14354 hash_ipportnet4_expire 4 14354 NULL
118781 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
118782 +lowpan_read_14369 lowpan_read 3 14369 NULL
118783 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
118784 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
118785 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
118786 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
118787 +_iwl_dbgfs_sram_write_14439 _iwl_dbgfs_sram_write 3 14439 NULL
118788 +block_size_14443 block_size 0 14443 NULL
118789 +lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
118790 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
118791 +ath10k_write_htt_stats_mask_14458 ath10k_write_htt_stats_mask 3 14458 NULL
118792 +lustre_msg_size_v2_14470 lustre_msg_size_v2 0-1 14470 NULL
118793 +dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
118794 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
118795 +ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
118796 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
118797 +dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 NULL nohasharray
118798 +ep0_write_14536 ep0_write 3 14536 &dataflash_read_user_otp_14536
118799 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
118800 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
118801 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
118802 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
118803 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
118804 +ufshcd_compose_dev_cmd_14626 ufshcd_compose_dev_cmd 0 14626 NULL
118805 +dbJoin_14644 dbJoin 0 14644 NULL
118806 +profile_replace_14652 profile_replace 3 14652 NULL
118807 +usnic_vnic_dump_14662 usnic_vnic_dump 3 14662 NULL
118808 +min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
118809 +nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
118810 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
118811 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
118812 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
118813 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
118814 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
118815 +rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
118816 +vfd_write_14717 vfd_write 3 14717 NULL
118817 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
118818 +raid1_resize_14740 raid1_resize 2 14740 NULL
118819 +i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
118820 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
118821 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
118822 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
118823 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
118824 +keys_proc_write_14792 keys_proc_write 3 14792 NULL
118825 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
118826 +__kfifo_in_14797 __kfifo_in 3-0 14797 NULL nohasharray
118827 +ttm_page_pool_free_14797 ttm_page_pool_free 2-0 14797 &__kfifo_in_14797
118828 +hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
118829 +snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
118830 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
118831 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
118832 +lcd_write_14857 lcd_write 3 14857 NULL
118833 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
118834 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
118835 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
118836 +netlbl_catmap_walk_14902 netlbl_catmap_walk 0-2 14902 NULL
118837 +__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
118838 +qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923 nohasharray
118839 +ptlrpc_prep_req_pool_14923 ptlrpc_prep_req_pool 4 14923 &qp_memcpy_to_queue_iov_14923
118840 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
118841 +queue_cnt_14951 queue_cnt 0 14951 NULL
118842 +unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
118843 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
118844 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
118845 +setkey_14987 setkey 3 14987 NULL nohasharray
118846 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
118847 +sctp_setsockopt_default_sndinfo_15011 sctp_setsockopt_default_sndinfo 3 15011 NULL
118848 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
118849 +read_file_node_aggr_15040 read_file_node_aggr 3 15040 NULL
118850 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
118851 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
118852 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
118853 +ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
118854 +pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
118855 +smscore_load_firmware_family2_15086 smscore_load_firmware_family2 3 15086 NULL
118856 +compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
118857 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
118858 +start_port_15124 start_port 0 15124 NULL
118859 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
118860 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
118861 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
118862 +mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
118863 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
118864 +iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
118865 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
118866 +wacom_led_putimage_15264 wacom_led_putimage 4 15264 NULL
118867 +simple_strtol_15273 simple_strtol 0 15273 NULL
118868 +fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
118869 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
118870 +ioread16_15342 ioread16 0 15342 NULL
118871 +ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
118872 +blkdev_readpages_15357 blkdev_readpages 4 15357 NULL
118873 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
118874 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
118875 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
118876 +alloc_fddidev_15382 alloc_fddidev 1 15382 NULL
118877 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
118878 +get_modalias_15406 get_modalias 2 15406 NULL
118879 +__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
118880 +tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
118881 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
118882 +memweight_15450 memweight 2 15450 NULL
118883 +__clone_and_map_data_bio_15498 __clone_and_map_data_bio 3 15498 NULL
118884 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
118885 +ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
118886 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
118887 +xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
118888 +persistent_status_15574 persistent_status 4 15574 NULL
118889 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
118890 +vme_user_write_15587 vme_user_write 3 15587 NULL
118891 +compat_fillonedir_15620 compat_fillonedir 3 15620 NULL
118892 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
118893 +tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
118894 +pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
118895 +sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
118896 +joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
118897 +fs_path_add_15648 fs_path_add 3 15648 NULL
118898 +xsd_read_15653 xsd_read 3 15653 NULL
118899 +unix_bind_15668 unix_bind 3 15668 NULL
118900 +dm_read_15674 dm_read 3 15674 NULL nohasharray
118901 +SyS_connect_15674 SyS_connect 3 15674 &dm_read_15674
118902 +uinput_str_to_user_15695 uinput_str_to_user 3 15695 NULL
118903 +__sk_migrate_realloc_15709 __sk_migrate_realloc 3 15709 NULL
118904 +tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
118905 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
118906 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
118907 +gnttab_expand_15817 gnttab_expand 1 15817 NULL nohasharray
118908 +nameseq_list_15817 nameseq_list 3-0 15817 &gnttab_expand_15817
118909 +afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
118910 +table_size_15851 table_size 0-1-2 15851 NULL
118911 +write_file_tx99_15856 write_file_tx99 3 15856 NULL
118912 +media_entity_init_15870 media_entity_init 2-4 15870 NULL
118913 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
118914 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
118915 +power_read_15939 power_read 3 15939 NULL
118916 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
118917 +snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
118918 +memblock_virt_alloc_try_nid_15954 memblock_virt_alloc_try_nid 1 15954 NULL
118919 +smk_read_ptrace_15974 smk_read_ptrace 3 15974 NULL
118920 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
118921 +dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
118922 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
118923 +SYSC_kexec_file_load_16058 SYSC_kexec_file_load 3 16058 NULL
118924 +si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
118925 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
118926 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 NULL nohasharray
118927 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 &isr_hw_pm_mode_changes_read_16110
118928 +udelay_test_write_16111 udelay_test_write 3 16111 NULL
118929 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
118930 +fsm_init_16134 fsm_init 2 16134 NULL
118931 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
118932 +optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
118933 +mapping_level_16188 mapping_level 2-0 16188 NULL
118934 +i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
118935 +ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
118936 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
118937 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
118938 +create_table_16213 create_table 2 16213 NULL
118939 +ath9k_hw_ar9287_dump_eeprom_16224 ath9k_hw_ar9287_dump_eeprom 5-4 16224 NULL
118940 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
118941 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
118942 +lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
118943 +i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL
118944 +il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
118945 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
118946 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
118947 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
118948 +nand_bch_init_16280 nand_bch_init 3-2 16280 NULL nohasharray
118949 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 &nand_bch_init_16280
118950 +account_16283 account 0-4-2 16283 NULL nohasharray
118951 +mirror_status_16283 mirror_status 5 16283 &account_16283
118952 +jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
118953 +mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
118954 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
118955 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
118956 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
118957 +kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
118958 +sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
118959 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
118960 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
118961 +nv50_pioc_create_16389 nv50_pioc_create 5 16389 NULL
118962 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
118963 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
118964 +__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
118965 +cmdline_store_16442 cmdline_store 4 16442 NULL
118966 +copy_from_user_bvec_16447 copy_from_user_bvec 0-4 16447 NULL
118967 +btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 4 16452 NULL
118968 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
118969 +req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
118970 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
118971 +KEY_OFFSET_16504 KEY_OFFSET 0 16504 NULL
118972 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
118973 +raid10_resize_16537 raid10_resize 2 16537 NULL
118974 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
118975 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
118976 +lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0-1 16589 NULL
118977 +compat_SyS_migrate_pages_16618 compat_SyS_migrate_pages 2 16618 NULL
118978 +rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
118979 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
118980 +__wa_populate_dto_urb_16699 __wa_populate_dto_urb 3-4 16699 NULL
118981 +_iwl_dbgfs_bt_force_ant_write_16701 _iwl_dbgfs_bt_force_ant_write 3 16701 NULL
118982 +__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
118983 +__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
118984 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
118985 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
118986 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
118987 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
118988 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
118989 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
118990 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
118991 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
118992 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
118993 +st_write_16874 st_write 3 16874 NULL
118994 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
118995 +psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
118996 +snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
118997 +_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
118998 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
118999 +svcxdr_dupstr_16963 svcxdr_dupstr 3 16963 NULL
119000 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
119001 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
119002 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
119003 +C_SYSC_keyctl_17041 C_SYSC_keyctl 4 17041 NULL
119004 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
119005 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
119006 +sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
119007 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
119008 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
119009 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
119010 +entry_length_17093 entry_length 0 17093 NULL
119011 +write_mem_17114 write_mem 3 17114 NULL
119012 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
119013 +do_blockdev_direct_IO_17143 do_blockdev_direct_IO 0-6 17143 NULL
119014 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
119015 +jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
119016 +mxt_upload_cfg_mem_17157 mxt_upload_cfg_mem 4 17157 NULL
119017 +sep_read_17161 sep_read 3 17161 NULL
119018 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
119019 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
119020 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
119021 +access_remote_vm_17189 access_remote_vm 0 17189 NULL nohasharray
119022 +iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
119023 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
119024 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
119025 +sync_request_17208 sync_request 2 17208 NULL
119026 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
119027 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
119028 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
119029 +alloc_ep_17269 alloc_ep 1 17269 NULL
119030 +pg_read_17276 pg_read 3 17276 NULL
119031 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
119032 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
119033 +neigh_hash_grow_17283 neigh_hash_grow 2 17283 NULL
119034 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
119035 +__ptlrpc_request_bufs_pack_17298 __ptlrpc_request_bufs_pack 4 17298 NULL
119036 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
119037 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
119038 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
119039 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
119040 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
119041 +mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
119042 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
119043 +copy_from_iter_17433 copy_from_iter 2 17433 NULL
119044 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
119045 +libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
119046 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
119047 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
119048 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
119049 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
119050 +copy_page_from_iter_17512 copy_page_from_iter 3-0 17512 NULL
119051 +reiserfs_direct_IO_17513 reiserfs_direct_IO 4 17513 NULL
119052 +lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
119053 +qp_free_res_17541 qp_free_res 5 17541 NULL
119054 +__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
119055 +copy_from_user_17559 copy_from_user 3-0 17559 NULL
119056 +hash_netport4_expire_17573 hash_netport4_expire 4 17573 NULL
119057 +wil_write_file_rxon_17581 wil_write_file_rxon 3 17581 NULL
119058 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
119059 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
119060 +osst_execute_17607 osst_execute 7-6 17607 NULL
119061 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
119062 +dma_map_page_17628 dma_map_page 0 17628 NULL
119063 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
119064 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
119065 +packet_setsockopt_17662 packet_setsockopt 5 17662 NULL
119066 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
119067 +venus_rename_17707 venus_rename 4-5 17707 NULL
119068 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
119069 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
119070 +nv92_gpio_intr_mask_17773 nv92_gpio_intr_mask 4-3 17773 NULL
119071 +shrink_slab_node_17794 shrink_slab_node 3 17794 NULL
119072 +lpuart_copy_rx_to_tty_17801 lpuart_copy_rx_to_tty 3 17801 NULL
119073 +_iwl_dbgfs_set_nic_temperature_write_17804 _iwl_dbgfs_set_nic_temperature_write 3 17804 NULL
119074 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
119075 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
119076 +em28xx_audio_ep_packet_size_17844 em28xx_audio_ep_packet_size 0 17844 NULL
119077 +dm_stats_message_17863 dm_stats_message 5 17863 NULL
119078 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
119079 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
119080 +virtio_cread32_17873 virtio_cread32 0 17873 NULL
119081 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
119082 +orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL nohasharray
119083 +i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
119084 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
119085 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
119086 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
119087 +dev_pm_opp_get_opp_count_17911 dev_pm_opp_get_opp_count 0 17911 NULL
119088 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
119089 +tipc_port_iovec_rcv_17921 tipc_port_iovec_rcv 3 17921 NULL
119090 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
119091 +__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
119092 +beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
119093 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
119094 +ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
119095 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
119096 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
119097 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
119098 +o2hb_highest_node_18034 o2hb_highest_node 0 18034 NULL
119099 +cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
119100 +__btrfs_drop_extents_18049 __btrfs_drop_extents 5 18049 NULL
119101 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
119102 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
119103 +fpregs_get_18066 fpregs_get 4 18066 NULL
119104 +kvm_read_guest_page_18074 kvm_read_guest_page 5 18074 NULL
119105 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
119106 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
119107 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
119108 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
119109 +svc_getnl_18120 svc_getnl 0 18120 NULL
119110 +paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
119111 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
119112 +enable_ints_write_18170 enable_ints_write 3 18170 NULL
119113 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
119114 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
119115 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
119116 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
119117 +fill_ext_prop_18233 fill_ext_prop 0 18233 NULL
119118 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
119119 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
119120 +rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
119121 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
119122 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
119123 +alloc_ring_18278 alloc_ring 2-4 18278 NULL
119124 +bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
119125 +nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
119126 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
119127 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
119128 +um_idi_write_18293 um_idi_write 3 18293 NULL
119129 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
119130 +lustre_msg_hdr_size_18308 lustre_msg_hdr_size 2 18308 NULL
119131 +class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
119132 +csio_mem_read_18319 csio_mem_read 3 18319 NULL
119133 +alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
119134 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
119135 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
119136 +copy_page_to_iter_18345 copy_page_to_iter 0-3 18345 NULL
119137 +lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
119138 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
119139 +SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
119140 +ep_io_18367 ep_io 0 18367 NULL
119141 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
119142 +__ceph_getxattr_18386 __ceph_getxattr 0 18386 NULL
119143 +ci_role_write_18388 ci_role_write 3 18388 NULL
119144 +hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
119145 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 NULL
119146 +nvif_device_init_18418 nvif_device_init 6 18418 NULL
119147 +memblock_virt_alloc_node_nopanic_18431 memblock_virt_alloc_node_nopanic 1 18431 NULL
119148 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 NULL
119149 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
119150 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
119151 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
119152 +pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
119153 +mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
119154 +udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
119155 +btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL
119156 +__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
119157 +snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
119158 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
119159 +nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
119160 +tipc_send2port_18531 tipc_send2port 4 18531 NULL
119161 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
119162 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
119163 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
119164 +debug_output_18575 debug_output 3 18575 NULL
119165 +filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
119166 +slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
119167 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
119168 +from_buffer_18625 from_buffer 3 18625 NULL
119169 +kmalloc_kernel_18641 kmalloc_kernel 1 18641 NULL
119170 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
119171 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
119172 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
119173 +fnic_stats_debugfs_read_18688 fnic_stats_debugfs_read 3 18688 NULL
119174 +echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
119175 +iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
119176 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
119177 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
119178 +nfs4_init_callback_netid_18717 nfs4_init_callback_netid 3 18717 NULL
119179 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
119180 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
119181 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
119182 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
119183 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
119184 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
119185 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
119186 +fence_context_alloc_18792 fence_context_alloc 1 18792 NULL
119187 +dm_stats_print_18815 dm_stats_print 7 18815 NULL
119188 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
119189 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
119190 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
119191 +ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
119192 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
119193 +devm_mdiobus_alloc_size_18902 devm_mdiobus_alloc_size 2 18902 NULL
119194 +tracing_thresh_write_18909 tracing_thresh_write 3 18909 NULL
119195 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
119196 +xfs_buf_read_uncached_18922 xfs_buf_read_uncached 3 18922 NULL
119197 +ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
119198 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
119199 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
119200 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
119201 +huge_page_size_19008 huge_page_size 0 19008 NULL
119202 +hash_netport6_expire_19013 hash_netport6_expire 4 19013 NULL
119203 +sysfs_create_dir_ns_19033 sysfs_create_dir_ns 0 19033 NULL
119204 +revalidate_19043 revalidate 2 19043 NULL
119205 +afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
119206 +osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
119207 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
119208 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
119209 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
119210 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
119211 +skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
119212 +cma_bitmap_maxno_19135 cma_bitmap_maxno 0 19135 NULL
119213 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
119214 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
119215 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
119216 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
119217 +read_extent_buffer_to_user_19189 read_extent_buffer_to_user 4-3 19189 NULL
119218 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
119219 +__copy_to_user_inatomic_19214 __copy_to_user_inatomic 0-3 19214 NULL
119220 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
119221 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
119222 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
119223 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
119224 +ucma_query_19260 ucma_query 4 19260 NULL
119225 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
119226 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL nohasharray
119227 +cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 &batadv_tt_save_orig_buffer_19288
119228 +qc_capture_19298 qc_capture 3 19298 NULL
119229 +ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
119230 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
119231 +debug_read_19322 debug_read 3 19322 NULL
119232 +lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 NULL nohasharray
119233 +cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 &lbs_host_sleep_write_19332
119234 +closure_sub_19359 closure_sub 2 19359 NULL
119235 +firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
119236 +read_zero_19366 read_zero 3 19366 NULL
119237 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
119238 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
119239 +pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
119240 +hid_hw_raw_request_19408 hid_hw_raw_request 0 19408 NULL
119241 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
119242 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
119243 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
119244 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
119245 +gp2ap020a00f_get_thresh_reg_19468 gp2ap020a00f_get_thresh_reg 0 19468 NULL
119246 +sky2_read16_19475 sky2_read16 0 19475 NULL
119247 +__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
119248 +kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
119249 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
119250 +batadv_tvlv_container_register_19520 batadv_tvlv_container_register 5 19520 NULL
119251 +ttm_dma_page_pool_free_19527 ttm_dma_page_pool_free 2-0 19527 NULL
119252 +cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL
119253 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
119254 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
119255 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
119256 +nfsd_read_19568 nfsd_read 5 19568 NULL
119257 +ieee80211_key_alloc_19575 ieee80211_key_alloc 3 19575 NULL
119258 +bm_status_read_19583 bm_status_read 3 19583 NULL
119259 +load_xattr_datum_19594 load_xattr_datum 0 19594 NULL
119260 +drbg_sec_strength_19604 drbg_sec_strength 0 19604 NULL
119261 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
119262 +parser_init_19651 parser_init 2 19651 NULL
119263 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
119264 +memblock_virt_alloc_low_nopanic_19714 memblock_virt_alloc_low_nopanic 1 19714 NULL
119265 +read_reg_19723 read_reg 0 19723 NULL
119266 +wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
119267 +memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
119268 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
119269 +p9_client_read_19750 p9_client_read 5-0 19750 NULL
119270 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
119271 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
119272 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
119273 +readhscx_19769 readhscx 0 19769 NULL
119274 +ath10k_write_htt_max_amsdu_ampdu_19820 ath10k_write_htt_max_amsdu_ampdu 3 19820 NULL
119275 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
119276 +vfs_getxattr_19832 vfs_getxattr 0 19832 NULL
119277 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
119278 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
119279 +__nla_put_19857 __nla_put 3 19857 NULL
119280 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
119281 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
119282 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
119283 +mangle_name_19923 mangle_name 0 19923 NULL
119284 +tipc_sk_show_19928 tipc_sk_show 3-0 19928 NULL
119285 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
119286 +guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
119287 +azx_get_pos_lpib_19933 azx_get_pos_lpib 0 19933 NULL
119288 +v4l2_ctrl_new_19942 v4l2_ctrl_new 8-12 19942 NULL
119289 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
119290 +cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
119291 +ll_xattr_cache_list_19954 ll_xattr_cache_list 0 19954 NULL
119292 +get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
119293 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
119294 +rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL nohasharray
119295 +i40e_reserve_msix_vectors_19989 i40e_reserve_msix_vectors 2 19989 &rtw_set_wps_probe_resp_19989
119296 +lustre_pack_request_19992 lustre_pack_request 3 19992 NULL
119297 +find_overflow_devnum_19995 find_overflow_devnum 0 19995 NULL
119298 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
119299 +lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL nohasharray
119300 +event_trigger_write_20009 event_trigger_write 3 20009 &lov_stripe_md_size_20009
119301 +tree_mod_log_eb_move_20011 tree_mod_log_eb_move 5 20011 NULL
119302 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
119303 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
119304 +iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 0-4 20067 NULL
119305 +target_message_20072 target_message 2 20072 NULL
119306 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
119307 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
119308 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
119309 +team_options_register_20091 team_options_register 3 20091 NULL
119310 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
119311 +root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
119312 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
119313 +ext4_ext_direct_IO_20165 ext4_ext_direct_IO 4 20165 NULL
119314 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
119315 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
119316 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
119317 +crystalhd_map_dio_20181 crystalhd_map_dio 3 20181 NULL
119318 +pvr2_ctrl_value_to_sym_20229 pvr2_ctrl_value_to_sym 5 20229 NULL
119319 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
119320 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
119321 +btrfs_header_nritems_20296 btrfs_header_nritems 0 20296 NULL
119322 +r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
119323 +dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
119324 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
119325 +vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
119326 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
119327 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
119328 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
119329 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
119330 +snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
119331 +SyS_get_mempolicy_20399 SyS_get_mempolicy 3 20399 NULL nohasharray
119332 +__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
119333 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
119334 +read_buf_20469 read_buf 2 20469 NULL
119335 +bio_trim_20472 bio_trim 2 20472 NULL
119336 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
119337 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
119338 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
119339 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
119340 +scsi_report_opcode_20551 scsi_report_opcode 3 20551 NULL
119341 +venus_create_20555 venus_create 4 20555 NULL
119342 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
119343 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
119344 +kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
119345 +set_secure_conn_20596 set_secure_conn 4 20596 NULL
119346 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
119347 +lirc_write_20604 lirc_write 3 20604 NULL
119348 +qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL
119349 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
119350 +get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
119351 +kfifo_copy_to_user_20646 kfifo_copy_to_user 3-4 20646 NULL
119352 +cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
119353 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
119354 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
119355 +snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
119356 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 NULL
119357 +cpumask_size_20683 cpumask_size 0 20683 NULL
119358 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
119359 +xpcs_reg_addr_write_20694 xpcs_reg_addr_write 3 20694 NULL
119360 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
119361 +__maestro_read_20700 __maestro_read 0 20700 NULL
119362 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
119363 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
119364 +hfs_direct_IO_20714 hfs_direct_IO 4 20714 NULL
119365 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
119366 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
119367 +fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
119368 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
119369 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
119370 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
119371 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
119372 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
119373 +edid_write_20797 edid_write 3 20797 NULL
119374 +lowpan_write_20800 lowpan_write 3 20800 NULL
119375 +strndup_user_20819 strndup_user 2 20819 NULL
119376 +tipc_msg_build_20825 tipc_msg_build 3 20825 NULL
119377 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
119378 +uvc_alloc_entity_20836 uvc_alloc_entity 4-3 20836 NULL
119379 +p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
119380 +nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
119381 +get_name_20855 get_name 4 20855 NULL
119382 +iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
119383 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
119384 +srq_free_res_20868 srq_free_res 5 20868 NULL
119385 +cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
119386 +req_capsule_filled_sizes_20888 req_capsule_filled_sizes 0 20888 NULL
119387 +rb_simple_write_20890 rb_simple_write 3 20890 NULL
119388 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
119389 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
119390 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
119391 +lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
119392 +htable_bits_20933 htable_bits 0 20933 NULL
119393 +cfg80211_rx_assoc_resp_20934 cfg80211_rx_assoc_resp 4 20934 NULL
119394 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
119395 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
119396 +rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
119397 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
119398 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
119399 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
119400 +qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
119401 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
119402 +arch_gnttab_init_21030 arch_gnttab_init 1 21030 NULL
119403 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
119404 +srp_change_queue_depth_21038 srp_change_queue_depth 2 21038 NULL
119405 +fsl_edma_prep_dma_cyclic_21042 fsl_edma_prep_dma_cyclic 4-3 21042 NULL
119406 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
119407 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
119408 +qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
119409 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
119410 +bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
119411 +multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
119412 +rate_control_pid_events_read_21099 rate_control_pid_events_read 3 21099 NULL
119413 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
119414 +_efx_mcdi_rpc_async_21119 _efx_mcdi_rpc_async 4-5 21119 NULL
119415 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
119416 +mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3 21172 NULL
119417 +bioset_create_nobvec_21180 bioset_create_nobvec 1 21180 NULL
119418 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
119419 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
119420 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
119421 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
119422 +input_ff_create_21240 input_ff_create 2 21240 NULL
119423 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
119424 +fru_length_21257 fru_length 0 21257 NULL
119425 +rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
119426 +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
119427 +drm_universal_plane_init_21296 drm_universal_plane_init 6 21296 NULL
119428 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
119429 +add_res_range_21310 add_res_range 4 21310 NULL
119430 +get_zeroed_page_21322 get_zeroed_page 0 21322 NULL
119431 +ftrace_profile_read_21327 ftrace_profile_read 3 21327 NULL
119432 +read_file_bool_bmps_21344 read_file_bool_bmps 3 21344 NULL
119433 +azx_get_delay_from_lpib_21348 azx_get_delay_from_lpib 3 21348 NULL
119434 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
119435 +allocate_cmdlines_buffer_21355 allocate_cmdlines_buffer 1 21355 NULL
119436 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
119437 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
119438 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
119439 +insert_ptr_21386 insert_ptr 6 21386 NULL
119440 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
119441 +snd_m3_inw_21406 snd_m3_inw 0 21406 NULL
119442 +usnic_ib_dump_vf_hdr_21423 usnic_ib_dump_vf_hdr 3 21423 NULL
119443 +snapshot_read_next_21426 snapshot_read_next 0 21426 NULL
119444 +tcp_bound_to_half_wnd_21429 tcp_bound_to_half_wnd 0-2 21429 NULL
119445 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
119446 +nouveau_clock_create__21449 nouveau_clock_create_ 8 21449 NULL
119447 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
119448 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
119449 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
119450 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
119451 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
119452 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
119453 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
119454 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
119455 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
119456 +snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
119457 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
119458 +filemap_get_page_21606 filemap_get_page 2 21606 NULL
119459 +ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
119460 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
119461 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
119462 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
119463 +regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
119464 +rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL nohasharray
119465 +proc_maps_open_21687 proc_maps_open 4 21687 &rtllib_alloc_txb_21687
119466 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
119467 +unix_skb_len_21722 unix_skb_len 0 21722 NULL
119468 +lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
119469 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
119470 +usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
119471 +gen_pool_add_21776 gen_pool_add 3 21776 NULL
119472 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
119473 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
119474 +_iwl_dbgfs_sta_drain_write_21837 _iwl_dbgfs_sta_drain_write 3 21837 NULL
119475 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
119476 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
119477 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
119478 +msix_capability_init_21870 msix_capability_init 0 21870 NULL
119479 +sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
119480 +ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
119481 +__btrfs_direct_write_21894 __btrfs_direct_write 3 21894 NULL
119482 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL nohasharray
119483 +nvme_submit_sync_cmd_21911 nvme_submit_sync_cmd 0 21911 &dbAllocCtl_21911
119484 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
119485 +twl_i2c_write_u16_21953 twl_i2c_write_u16 3 21953 NULL
119486 +__build_xattrs_21979 __build_xattrs 0 21979 NULL
119487 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
119488 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 NULL nohasharray
119489 +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 &compat_rw_copy_check_uvector_22001
119490 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
119491 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
119492 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
119493 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
119494 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
119495 +btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
119496 +mem_rw_22085 mem_rw 3 22085 NULL
119497 +kstrtos32_from_user_22087 kstrtos32_from_user 2 22087 NULL
119498 +rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
119499 +snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
119500 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
119501 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
119502 +nve0_aux_mask_22158 nve0_aux_mask 2 22158 NULL
119503 +__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
119504 +rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL
119505 +mem_write_22232 mem_write 3 22232 NULL
119506 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
119507 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
119508 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
119509 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
119510 +add_res_tree_22263 add_res_tree 7 22263 NULL
119511 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
119512 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 NULL nohasharray
119513 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 &__tun_chr_ioctl_22300
119514 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
119515 +lov_setstripe_22307 lov_setstripe 2 22307 NULL
119516 +udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
119517 +C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
119518 +atomic_read_22342 atomic_read 0 22342 NULL
119519 +ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
119520 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
119521 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
119522 +alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
119523 +zoran_write_22404 zoran_write 3 22404 NULL
119524 +queue_reply_22416 queue_reply 3 22416 NULL
119525 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
119526 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
119527 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
119528 +ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
119529 +qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL nohasharray
119530 +video_write_22490 video_write 3 22490 &qib_user_sdma_alloc_header_22490
119531 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
119532 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
119533 +trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
119534 +ntb_setup_bwd_msix_22549 ntb_setup_bwd_msix 2 22549 NULL
119535 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
119536 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
119537 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
119538 +cfs_expr_list_values_22600 cfs_expr_list_values 0 22600 NULL
119539 +snapshot_read_22601 snapshot_read 3 22601 NULL
119540 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
119541 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
119542 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
119543 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
119544 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
119545 +compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
119546 +l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 NULL
119547 +bch_dump_read_22685 bch_dump_read 3 22685 NULL
119548 +reg_umr_22686 reg_umr 5 22686 NULL
119549 +SYSC_vmsplice_22697 SYSC_vmsplice 3 22697 NULL
119550 +nr_cpusets_22705 nr_cpusets 0 22705 NULL
119551 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
119552 +cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
119553 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
119554 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
119555 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
119556 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
119557 +print_frame_22769 print_frame 0 22769 NULL
119558 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
119559 +vnic_dev_get_res_count_22791 vnic_dev_get_res_count 0 22791 NULL
119560 +__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
119561 +create_attr_set_22861 create_attr_set 1 22861 NULL
119562 +hash_ip6_expire_22867 hash_ip6_expire 4 22867 NULL
119563 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
119564 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
119565 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
119566 +ion_handle_test_kernel_22900 ion_handle_test_kernel 4-3 22900 NULL nohasharray
119567 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 &ion_handle_test_kernel_22900
119568 +nfs4_acl_bytes_22915 nfs4_acl_bytes 0-1 22915 NULL
119569 +__set_xattr_22923 __set_xattr 0 22923 NULL
119570 +xstateregs_set_22932 xstateregs_set 4 22932 NULL
119571 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
119572 +alloc_sglist_22960 alloc_sglist 2-3 22960 NULL
119573 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
119574 +vme_get_size_22964 vme_get_size 0 22964 NULL
119575 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
119576 +cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
119577 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
119578 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
119579 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
119580 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
119581 +ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 6-7 23029 NULL
119582 +st_status_23032 st_status 5 23032 NULL
119583 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
119584 +comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
119585 +reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
119586 +unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
119587 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
119588 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
119589 +raw_sendmsg_23078 raw_sendmsg 4 23078 NULL
119590 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
119591 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
119592 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
119593 +ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
119594 +dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
119595 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
119596 +bset_tree_bytes_23111 bset_tree_bytes 0 23111 NULL nohasharray
119597 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 &bset_tree_bytes_23111
119598 +__clear_user_23118 __clear_user 0-2 23118 NULL
119599 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
119600 +ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
119601 +read_file_ani_23161 read_file_ani 3 23161 NULL
119602 +usblp_write_23178 usblp_write 3 23178 NULL
119603 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
119604 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
119605 +tipc_sendmcast_23214 tipc_sendmcast 4 23214 NULL
119606 +mcryptd_alloc_instance_23221 mcryptd_alloc_instance 2-3 23221 NULL
119607 +nft_hash_tbl_alloc_23224 nft_hash_tbl_alloc 1 23224 NULL
119608 +tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
119609 +xlog_get_bp_23229 xlog_get_bp 2 23229 NULL nohasharray
119610 +__read_status_pci_23229 __read_status_pci 0 23229 &xlog_get_bp_23229
119611 +ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
119612 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
119613 +__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
119614 +nv50_ram_create__23241 nv50_ram_create_ 4 23241 NULL
119615 +sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
119616 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
119617 +ec_i2c_count_message_23285 ec_i2c_count_message 0-2 23285 NULL
119618 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
119619 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
119620 +__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
119621 +page_readlink_23346 page_readlink 3 23346 NULL
119622 +kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
119623 +get_dst_timing_23358 get_dst_timing 0 23358 NULL
119624 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
119625 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
119626 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
119627 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
119628 +__ata_change_queue_depth_23484 __ata_change_queue_depth 3 23484 NULL
119629 +linear_conf_23485 linear_conf 2 23485 NULL
119630 +event_filter_read_23494 event_filter_read 3 23494 NULL
119631 +lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
119632 +devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
119633 +__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
119634 +hash_ipmark6_expire_23518 hash_ipmark6_expire 4 23518 NULL
119635 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
119636 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
119637 +btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
119638 +venus_symlink_23570 venus_symlink 6-4 23570 NULL
119639 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
119640 +xfpregs_get_23586 xfpregs_get 4 23586 NULL
119641 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
119642 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
119643 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
119644 +sInW_23663 sInW 0 23663 NULL
119645 +SyS_connect_23669 SyS_connect 3 23669 NULL
119646 +cx18_read_23699 cx18_read 3 23699 NULL
119647 +at_get_23708 at_get 0 23708 NULL
119648 +get_conn_info_23723 get_conn_info 4 23723 NULL
119649 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
119650 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
119651 +__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
119652 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
119653 +cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
119654 +mpt_free_res_23793 mpt_free_res 5 23793 NULL
119655 +map_write_23795 map_write 3 23795 NULL
119656 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
119657 +__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
119658 +lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
119659 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
119660 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
119661 +p54_init_common_23850 p54_init_common 1 23850 NULL
119662 +bin_to_hex_dup_23853 bin_to_hex_dup 2 23853 NULL
119663 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
119664 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
119665 +tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
119666 +iov_iter_get_pages_alloc_23903 iov_iter_get_pages_alloc 3-0 23903 NULL
119667 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
119668 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
119669 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
119670 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
119671 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
119672 +kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
119673 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
119674 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
119675 +size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
119676 +sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
119677 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
119678 +xfs_zero_file_space_24000 xfs_zero_file_space 2-3 24000 NULL
119679 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
119680 +give_pages_24021 give_pages 3 24021 NULL
119681 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
119682 +hmac_setkey_24043 hmac_setkey 3 24043 NULL
119683 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
119684 +iwl_dbgfs_low_latency_read_24062 iwl_dbgfs_low_latency_read 3 24062 NULL
119685 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
119686 +C_SYSC_process_vm_writev_24102 C_SYSC_process_vm_writev 3-5 24102 NULL
119687 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
119688 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
119689 +lov_brw_24122 lov_brw 4 24122 NULL
119690 +mpu401_read_24126 mpu401_read 3 24126 NULL
119691 +_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
119692 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
119693 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
119694 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
119695 +adu_read_24177 adu_read 3 24177 NULL
119696 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
119697 +nv94_aux_24197 nv94_aux 3-6 24197 NULL
119698 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
119699 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
119700 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
119701 +pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
119702 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
119703 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
119704 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
119705 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
119706 +calculate_sizes_24273 calculate_sizes 2 24273 NULL
119707 +thin_status_24278 thin_status 5 24278 NULL
119708 +msg_size_24288 msg_size 0 24288 NULL
119709 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
119710 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
119711 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
119712 +C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
119713 +kzalloc_node_24352 kzalloc_node 1 24352 NULL
119714 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
119715 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
119716 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
119717 +igetword_24373 igetword 0 24373 NULL
119718 +mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
119719 +osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
119720 +getxattr_24398 getxattr 4 24398 NULL nohasharray
119721 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 &getxattr_24398
119722 +populate_msi_sysfs_24399 populate_msi_sysfs 0 24399 NULL
119723 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
119724 +nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
119725 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
119726 +xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
119727 +ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
119728 +copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
119729 +ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
119730 +smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
119731 +rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
119732 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
119733 +lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
119734 +skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL
119735 +dut_mode_read_24489 dut_mode_read 3 24489 NULL
119736 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
119737 +pd_video_read_24510 pd_video_read 3 24510 NULL
119738 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
119739 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
119740 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
119741 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
119742 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
119743 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
119744 +sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
119745 +lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605 nohasharray
119746 +i915_error_state_buf_init_24605 i915_error_state_buf_init 3 24605 &lov_alloc_memmd_24605
119747 +SyS_poll_24620 SyS_poll 2 24620 NULL
119748 +context_alloc_24645 context_alloc 3 24645 NULL
119749 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
119750 +datafab_write_data_24696 datafab_write_data 4 24696 NULL
119751 +intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
119752 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
119753 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
119754 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
119755 +ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
119756 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
119757 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
119758 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
119759 +cache_read_24790 cache_read 3 24790 NULL
119760 +user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
119761 +kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
119762 +ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
119763 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
119764 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
119765 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
119766 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
119767 +queues_read_24877 queues_read 3 24877 NULL
119768 +iov_iter_npages_bvec_24905 iov_iter_npages_bvec 0-2 24905 NULL
119769 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
119770 +xpcs_reg_value_write_24922 xpcs_reg_value_write 3 24922 NULL
119771 +v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
119772 +ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
119773 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
119774 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
119775 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL nohasharray
119776 +ath10k_fw_crash_dump_read_24987 ath10k_fw_crash_dump_read 3 24987 &llc_ui_sendmsg_24987
119777 +info_debugfs_read_helper_24988 info_debugfs_read_helper 0 24988 NULL
119778 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
119779 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
119780 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
119781 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
119782 +load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
119783 +btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
119784 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
119785 +ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
119786 +do_add_page_to_bio_25071 do_add_page_to_bio 2 25071 NULL
119787 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
119788 +ima_appraise_measurement_25093 ima_appraise_measurement 6 25093 NULL
119789 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
119790 +ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
119791 +kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
119792 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
119793 +security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
119794 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
119795 +stripe_status_25259 stripe_status 5 25259 NULL
119796 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
119797 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
119798 +vfs_writev_25278 vfs_writev 3 25278 NULL
119799 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
119800 +cx25821_write_frame_25315 cx25821_write_frame 3 25315 NULL
119801 +ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
119802 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
119803 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
119804 +unix_mkname_25368 unix_mkname 0-2 25368 NULL
119805 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
119806 +vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
119807 +mcp795_rtcc_read_25415 mcp795_rtcc_read 4 25415 NULL
119808 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
119809 +ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
119810 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
119811 +ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
119812 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
119813 +mxt_obj_size_25510 mxt_obj_size 0 25510 NULL
119814 +sb_permission_25523 sb_permission 0 25523 NULL
119815 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
119816 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
119817 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
119818 +ht_print_chan_25556 ht_print_chan 0-3-4 25556 NULL
119819 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
119820 +ping_recvmsg_25597 ping_recvmsg 4 25597 NULL
119821 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
119822 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
119823 +befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
119824 +__get_user_pages_25628 __get_user_pages 0 25628 &befs_utf2nls_25628
119825 +__direct_map_25647 __direct_map 6-5 25647 NULL
119826 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
119827 +lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
119828 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
119829 +prom_early_alloc_25692 prom_early_alloc 1 25692 NULL
119830 +rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
119831 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
119832 +__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 NULL nohasharray
119833 +sel_write_context_25726 sel_write_context 3 25726 &__alloc_bootmem_low_node_25726
119834 +xgbe_common_read_25743 xgbe_common_read 2 25743 NULL
119835 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
119836 +event_rx_pool_read_25792 event_rx_pool_read 3 25792 NULL
119837 +sg_read_25799 sg_read 3 25799 NULL
119838 +system_enable_read_25815 system_enable_read 3 25815 NULL
119839 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
119840 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
119841 +parport_read_25855 parport_read 0 25855 NULL
119842 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
119843 +key_attr_size_25865 key_attr_size 0 25865 NULL
119844 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
119845 +run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
119846 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
119847 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
119848 +nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
119849 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
119850 +rcname_read_25919 rcname_read 3 25919 NULL
119851 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
119852 +key_flags_read_25931 key_flags_read 3 25931 NULL
119853 +copy_play_buf_25932 copy_play_buf 3 25932 NULL
119854 +flush_25957 flush 2 25957 NULL
119855 +_regmap_multi_reg_write_25967 _regmap_multi_reg_write 3 25967 NULL
119856 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
119857 +lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
119858 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
119859 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
119860 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
119861 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
119862 +pri_wm_latency_write_26063 pri_wm_latency_write 3 26063 NULL
119863 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
119864 +i8042_pnp_id_to_string_26108 i8042_pnp_id_to_string 3 26108 NULL
119865 +read_sb_page_26119 read_sb_page 5 26119 NULL
119866 +ath9k_hw_name_26146 ath9k_hw_name 3 26146 NULL
119867 +copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
119868 +gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
119869 +ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
119870 +disk_devt_26180 disk_devt 0 26180 NULL
119871 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
119872 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
119873 +mce_write_26201 mce_write 3 26201 NULL
119874 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
119875 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
119876 +rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
119877 +nlm_end_grace_read_26234 nlm_end_grace_read 3 26234 NULL
119878 +genwqe_ffdc_buff_size_26263 genwqe_ffdc_buff_size 0 26263 NULL
119879 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
119880 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
119881 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL
119882 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
119883 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
119884 +snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
119885 +ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 6-3 26357 NULL
119886 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
119887 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
119888 +ntty_write_26404 ntty_write 3 26404 NULL
119889 +firmware_store_26408 firmware_store 4 26408 NULL
119890 +pagemap_read_26441 pagemap_read 3 26441 NULL
119891 +tower_read_26461 tower_read 3 26461 NULL nohasharray
119892 +enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461
119893 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
119894 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
119895 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL nohasharray
119896 +msi_verify_entries_26490 msi_verify_entries 0 26490 &dvb_ca_en50221_io_ioctl_26490
119897 +read_vmcore_26501 read_vmcore 3 26501 NULL
119898 +uhid_char_write_26502 uhid_char_write 3 26502 NULL
119899 +vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
119900 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
119901 +alloc_ep_req_26521 alloc_ep_req 3-2 26521 NULL
119902 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
119903 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
119904 +dio_new_bio_26562 dio_new_bio 0 26562 NULL
119905 +rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
119906 +kernfs_name_locked_26617 kernfs_name_locked 3 26617 NULL
119907 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
119908 +amdtp_stream_get_max_payload_26645 amdtp_stream_get_max_payload 0 26645 NULL
119909 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL
119910 +nouveau_volt_create__26654 nouveau_volt_create_ 4 26654 NULL
119911 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
119912 +flowinfo_read_26683 flowinfo_read 3 26683 NULL
119913 +sysfs_add_file_26716 sysfs_add_file 0 26716 NULL
119914 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
119915 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
119916 +bos_desc_26752 bos_desc 0 26752 NULL
119917 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
119918 +dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
119919 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
119920 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
119921 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
119922 +smk_write_load_26829 smk_write_load 3 26829 NULL
119923 +snd_pcm_action_mutex_26832 snd_pcm_action_mutex 0 26832 NULL
119924 +scnprint_id_26842 scnprint_id 3-0 26842 NULL
119925 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
119926 +ss_alloc_ep_req_26848 ss_alloc_ep_req 2 26848 NULL
119927 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
119928 +ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
119929 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
119930 +skb_zerocopy_headlen_26910 skb_zerocopy_headlen 0 26910 NULL
119931 +hhf_zalloc_26912 hhf_zalloc 1 26912 NULL
119932 +cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
119933 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
119934 +brcmf_usb_dl_cmd_26931 brcmf_usb_dl_cmd 4 26931 NULL
119935 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
119936 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 NULL nohasharray
119937 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 &sctp_setsockopt_adaptation_layer_26935
119938 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
119939 +do_trimming_26952 do_trimming 3 26952 NULL nohasharray
119940 +extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
119941 +do_direct_IO_26979 do_direct_IO 0 26979 NULL
119942 +lustre_msg_size_26995 lustre_msg_size 2 26995 NULL
119943 +sc16is7xx_port_read_27051 sc16is7xx_port_read 0 27051 NULL
119944 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
119945 +ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3 27064 NULL
119946 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
119947 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
119948 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
119949 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL nohasharray
119950 +ath9k_hw_4k_dump_eeprom_27089 ath9k_hw_4k_dump_eeprom 5-4 27089 &btmrvl_hscmd_write_27089
119951 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
119952 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
119953 +pms_capture_27142 pms_capture 4 27142 NULL
119954 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
119955 +wil_write_file_wmi_27150 wil_write_file_wmi 3 27150 NULL
119956 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
119957 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
119958 +write_kmem_27225 write_kmem 3 27225 NULL nohasharray
119959 +svcxdr_tmpalloc_27225 svcxdr_tmpalloc 2 27225 &write_kmem_27225
119960 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
119961 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
119962 +ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
119963 +comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
119964 +get_rx_fifo_content_27283 get_rx_fifo_content 0 27283 NULL
119965 +copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
119966 +virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
119967 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
119968 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
119969 +iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
119970 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
119971 +seq_read_27411 seq_read 3 27411 NULL
119972 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
119973 +ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
119974 +ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 3-4 27422 NULL
119975 +cypress_write_27423 cypress_write 4 27423 NULL
119976 +sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
119977 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
119978 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
119979 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
119980 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
119981 +garmin_read_process_27509 garmin_read_process 3 27509 NULL nohasharray
119982 +mcryptd_hash_setkey_27509 mcryptd_hash_setkey 3 27509 &garmin_read_process_27509
119983 +oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
119984 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
119985 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
119986 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
119987 +sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
119988 +libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
119989 +C_SYSC_mbind_27636 C_SYSC_mbind 5 27636 NULL
119990 +ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 NULL nohasharray
119991 +read_flush_procfs_27642 read_flush_procfs 3 27642 &ocfs2_xattr_ibody_get_27642 nohasharray
119992 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642
119993 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
119994 +btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
119995 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
119996 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
119997 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
119998 +fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
119999 +evm_write_key_27715 evm_write_key 3 27715 NULL
120000 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
120001 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
120002 +load_scode_27738 load_scode 2 27738 NULL
120003 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
120004 +transport_init_session_tags_27776 transport_init_session_tags 1-2 27776 NULL
120005 +__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
120006 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
120007 +SyS_readv_27804 SyS_readv 3 27804 NULL
120008 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
120009 +hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
120010 +init_header_complete_27833 init_header_complete 0 27833 NULL
120011 +read_profile_27859 read_profile 3 27859 NULL
120012 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
120013 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
120014 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
120015 +i915_error_object_create_sized_27919 i915_error_object_create_sized 4 27919 NULL
120016 +check_mapped_name_27943 check_mapped_name 3 27943 NULL
120017 +bio_next_split_27961 bio_next_split 2 27961 NULL nohasharray
120018 +tracing_clock_write_27961 tracing_clock_write 3 27961 &bio_next_split_27961
120019 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
120020 +mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL nohasharray
120021 +device_register_27972 device_register 0 27972 &mic_rx_pkts_read_27972
120022 +compat_SyS_set_mempolicy_27975 compat_SyS_set_mempolicy 3 27975 NULL
120023 +pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
120024 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
120025 +seq_get_buf_28006 seq_get_buf 0 28006 NULL
120026 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
120027 +powercap_register_zone_28028 powercap_register_zone 6 28028 NULL
120028 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
120029 +cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
120030 +pool_status_28055 pool_status 5 28055 NULL
120031 +init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
120032 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
120033 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
120034 +acpi_gsb_i2c_write_bytes_28082 acpi_gsb_i2c_write_bytes 4 28082 NULL
120035 +mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
120036 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
120037 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
120038 +m25p80_read_reg_28132 m25p80_read_reg 4 28132 NULL
120039 +video_read_28148 video_read 3 28148 NULL
120040 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
120041 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
120042 +vread_28173 vread 0-3 28173 NULL
120043 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
120044 +counter_free_res_28187 counter_free_res 5 28187 NULL
120045 +read_disk_sb_28188 read_disk_sb 2 28188 NULL
120046 +nvkm_output_dp_create__28192 nvkm_output_dp_create_ 6 28192 NULL
120047 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
120048 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
120049 +line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
120050 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
120051 +usemap_size_28281 usemap_size 0 28281 NULL
120052 +inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
120053 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
120054 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
120055 +kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
120056 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 NULL
120057 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
120058 +xpcs_mmd_read_28331 xpcs_mmd_read 3 28331 NULL
120059 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
120060 +tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
120061 +snapshot_write_28351 snapshot_write 3 28351 NULL
120062 +xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
120063 +batadv_handle_tt_response_28370 batadv_handle_tt_response 4 28370 NULL
120064 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
120065 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
120066 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
120067 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
120068 +__videobuf_mmap_setup_28421 __videobuf_mmap_setup 0 28421 NULL
120069 +ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
120070 +hid_hw_output_report_28429 hid_hw_output_report 0 28429 NULL
120071 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
120072 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
120073 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
120074 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
120075 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
120076 +sh_irda_init_iobuf_28527 sh_irda_init_iobuf 2 28527 NULL nohasharray
120077 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 &sh_irda_init_iobuf_28527
120078 +early_init_dt_alloc_memory_arch_28528 early_init_dt_alloc_memory_arch 1 28528 NULL
120079 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
120080 +run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
120081 +aio_read_events_28545 aio_read_events 3 28545 &run_delalloc_range_28545 nohasharray
120082 +mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &aio_read_events_28545
120083 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
120084 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
120085 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
120086 +task_cgroup_path_28599 task_cgroup_path 3 28599 NULL
120087 +extract_entropy_28604 extract_entropy 5-3 28604 NULL
120088 +xgbe_common_write_28609 xgbe_common_write 2 28609 NULL
120089 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
120090 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
120091 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
120092 +qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
120093 +p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
120094 +iwl_dbgfs_nic_temp_read_28662 iwl_dbgfs_nic_temp_read 3 28662 NULL
120095 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
120096 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
120097 +kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
120098 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
120099 +spi_execute_28736 spi_execute 5 28736 NULL
120100 +snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
120101 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
120102 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
120103 +nv50_dmac_create_28762 nv50_dmac_create 5 28762 NULL
120104 +rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
120105 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
120106 +sel_write_member_28800 sel_write_member 3 28800 NULL
120107 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
120108 +kernel_tree_alloc_28833 kernel_tree_alloc 1 28833 NULL
120109 +parser_init_byteStream_28841 parser_init_byteStream 2 28841 NULL
120110 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
120111 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
120112 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
120113 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
120114 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
120115 +iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
120116 +push_rx_28939 push_rx 3 28939 NULL
120117 +mxuport_prepare_write_buffer_28943 mxuport_prepare_write_buffer 3 28943 NULL
120118 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
120119 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
120120 +hash_net6_expire_28979 hash_net6_expire 4 28979 NULL
120121 +hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
120122 +bin_uuid_28999 bin_uuid 3 28999 NULL
120123 +fd_execute_rw_29004 fd_execute_rw 3 29004 NULL
120124 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
120125 +rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
120126 +btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
120127 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
120128 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
120129 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
120130 +iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
120131 +ccp_init_dm_workarea_29097 ccp_init_dm_workarea 3 29097 NULL
120132 +__compat_sys_preadv64_29103 __compat_sys_preadv64 3 29103 NULL
120133 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
120134 +snprintf_29125 snprintf 0 29125 NULL
120135 +iov_shorten_29130 iov_shorten 0 29130 NULL
120136 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
120137 +kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
120138 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
120139 +wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
120140 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
120141 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
120142 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
120143 +evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
120144 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
120145 +rbd_osd_req_create_29260 rbd_osd_req_create 3 29260 NULL
120146 +mwifiex_hscfg_write_29262 mwifiex_hscfg_write 3 29262 NULL
120147 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
120148 +ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
120149 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
120150 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
120151 +lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
120152 +kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
120153 +obd_proc_jobid_name_seq_write_29332 obd_proc_jobid_name_seq_write 3 29332 NULL
120154 +tun_put_user_29337 tun_put_user 5 29337 NULL
120155 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
120156 +l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
120157 +read_file_tx99_power_29405 read_file_tx99_power 3 29405 NULL
120158 +mempool_create_29437 mempool_create 1 29437 NULL
120159 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
120160 +p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
120161 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
120162 +memcg_update_cache_params_29465 memcg_update_cache_params 2 29465 NULL
120163 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
120164 +do_register_entry_29478 do_register_entry 4 29478 NULL
120165 +simple_strtoul_29480 simple_strtoul 0 29480 NULL
120166 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
120167 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
120168 +usnic_vnic_spec_dump_29508 usnic_vnic_spec_dump 2 29508 NULL
120169 +write_file_regidx_29517 write_file_regidx 3 29517 NULL
120170 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
120171 +pci_enable_msix_29524 pci_enable_msix 0 29524 NULL
120172 +mic_vringh_copy_29531 mic_vringh_copy 4 29531 NULL
120173 +ftrace_write_29551 ftrace_write 3 29551 NULL
120174 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
120175 +leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
120176 +kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
120177 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
120178 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
120179 +pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
120180 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
120181 +slots_per_page_29601 slots_per_page 0 29601 NULL
120182 +osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
120183 +lstcon_rpc_init_29623 lstcon_rpc_init 4 29623 NULL
120184 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
120185 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
120186 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL nohasharray
120187 +spmi_controller_alloc_29654 spmi_controller_alloc 2 29654 &sctp_make_abort_user_29654
120188 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
120189 +lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
120190 +posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
120191 +probes_write_29711 probes_write 3 29711 NULL
120192 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
120193 +xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
120194 +std_nic_write_29752 std_nic_write 3 29752 NULL
120195 +static_key_count_29771 static_key_count 0 29771 NULL
120196 +tg3_irq_count_29786 tg3_irq_count 0 29786 NULL
120197 +dbAlloc_29794 dbAlloc 0 29794 NULL
120198 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
120199 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
120200 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
120201 +count_partial_29850 count_partial 0 29850 NULL
120202 +write_file_bool_bmps_29870 write_file_bool_bmps 3 29870 NULL
120203 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
120204 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
120205 +rtw_cfg80211_indicate_sta_assoc_29897 rtw_cfg80211_indicate_sta_assoc 3 29897 NULL
120206 +nv94_gpio_intr_mask_29907 nv94_gpio_intr_mask 4-3 29907 NULL
120207 +lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
120208 +write_file_queue_29922 write_file_queue 3 29922 NULL
120209 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL nohasharray
120210 +ipv6_recv_error_29947 ipv6_recv_error 3 29947 &__btrfs_getxattr_29947
120211 +zero_iovec_29955 zero_iovec 1 29955 NULL
120212 +dev_mem_write_30028 dev_mem_write 3 30028 NULL
120213 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
120214 +sysfs_add_file_mode_ns_30038 sysfs_add_file_mode_ns 0 30038 NULL
120215 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 0-4 30040 NULL
120216 +drp_wmove_30043 drp_wmove 4 30043 NULL
120217 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
120218 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
120219 +rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
120220 +defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
120221 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
120222 +u_memcpya_30139 u_memcpya 3-2 30139 NULL
120223 +dbg_port_buf_30145 dbg_port_buf 2 30145 NULL
120224 +elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
120225 +alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
120226 +expand_inode_data_30169 expand_inode_data 3-2 30169 NULL
120227 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
120228 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
120229 +__genwqe_readq_30197 __genwqe_readq 0 30197 NULL
120230 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
120231 +SyS_semop_30227 SyS_semop 3 30227 NULL
120232 +bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
120233 +rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
120234 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
120235 +compat_readv_30273 compat_readv 3 30273 NULL
120236 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
120237 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
120238 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
120239 +osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
120240 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
120241 +i8254_read_30330 i8254_read 0 30330 NULL
120242 +resource_from_user_30341 resource_from_user 3 30341 NULL
120243 +o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
120244 +kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
120245 +pvscsi_change_queue_depth_30365 pvscsi_change_queue_depth 2 30365 NULL
120246 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
120247 +blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3 30392 NULL
120248 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
120249 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
120250 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
120251 +lstcon_session_info_30425 lstcon_session_info 6 30425 NULL
120252 +enable_write_30456 enable_write 3 30456 NULL
120253 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
120254 +urandom_read_30462 urandom_read 3 30462 NULL
120255 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
120256 +adu_write_30487 adu_write 3 30487 NULL
120257 +dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
120258 +batadv_send_tt_request_30493 batadv_send_tt_request 5 30493 NULL
120259 +memblock_virt_alloc_node_30515 memblock_virt_alloc_node 1 30515 NULL
120260 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
120261 +debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
120262 +set_config_30526 set_config 0 30526 &debug_debug2_read_30526
120263 +xfs_sb_version_hasftype_30559 xfs_sb_version_hasftype 0 30559 NULL nohasharray
120264 +ixgbevf_acquire_msix_vectors_30559 ixgbevf_acquire_msix_vectors 2 30559 &xfs_sb_version_hasftype_30559
120265 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
120266 +set_le_30581 set_le 4 30581 NULL
120267 +blk_init_tags_30592 blk_init_tags 1 30592 NULL
120268 +sgl_map_user_pages_30610 sgl_map_user_pages 2 30610 NULL
120269 +SyS_msgrcv_30611 SyS_msgrcv 3 30611 NULL
120270 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
120271 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
120272 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
120273 +mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
120274 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
120275 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
120276 +ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
120277 +sst_hsw_get_dsp_position_30691 sst_hsw_get_dsp_position 0 30691 NULL
120278 +get_pages_alloc_iovec_30699 get_pages_alloc_iovec 3-0 30699 NULL
120279 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
120280 +lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
120281 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
120282 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
120283 +snapshot_status_30744 snapshot_status 5 30744 NULL
120284 +fuse_direct_IO_30753 fuse_direct_IO 4 30753 NULL
120285 +fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
120286 +__bio_alloc_30787 __bio_alloc 3 30787 NULL
120287 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
120288 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
120289 +ath10k_write_fw_dbglog_30835 ath10k_write_fw_dbglog 3 30835 NULL
120290 +of_gpio_named_count_30841 of_gpio_named_count 0 30841 NULL
120291 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
120292 +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
120293 +wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
120294 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
120295 +pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
120296 +copy_to_iter_30901 copy_to_iter 2 30901 NULL
120297 +usnic_debugfs_buildinfo_read_30928 usnic_debugfs_buildinfo_read 3 30928 NULL
120298 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
120299 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
120300 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
120301 +read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
120302 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
120303 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
120304 +template_fmt_size_31033 template_fmt_size 0 31033 NULL
120305 +stride_pg_count_31053 stride_pg_count 0-3-2-1-4-5 31053 NULL
120306 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
120307 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
120308 +proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
120309 +depth_read_31112 depth_read 3 31112 NULL
120310 +hash_ipportnet6_expire_31118 hash_ipportnet6_expire 4 31118 NULL
120311 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
120312 +size_inside_page_31141 size_inside_page 0 31141 NULL
120313 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
120314 +nvme_set_features_31169 nvme_set_features 0 31169 NULL
120315 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
120316 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
120317 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
120318 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
120319 +__read_reg_31216 __read_reg 0 31216 NULL
120320 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
120321 +tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
120322 +cyy_readb_31240 cyy_readb 0 31240 NULL
120323 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
120324 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
120325 +hash_netportnet4_expire_31290 hash_netportnet4_expire 4 31290 NULL
120326 +iwl_dbgfs_set_nic_temperature_read_31300 iwl_dbgfs_set_nic_temperature_read 3 31300 NULL
120327 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
120328 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
120329 +command_file_write_31318 command_file_write 3 31318 NULL
120330 +hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
120331 +_regmap_raw_multi_reg_write_31336 _regmap_raw_multi_reg_write 3 31336 NULL
120332 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
120333 +outlen_write_31358 outlen_write 3 31358 NULL
120334 +ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
120335 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
120336 +vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
120337 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
120338 +inb_31388 inb 0 31388 NULL
120339 +mp_ioapic_pin_count_31393 mp_ioapic_pin_count 0 31393 NULL
120340 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
120341 +_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
120342 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
120343 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
120344 +transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
120345 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
120346 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
120347 +alg_setkey_31485 alg_setkey 3 31485 NULL
120348 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
120349 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
120350 +__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
120351 +hidraw_write_31536 hidraw_write 3 31536 NULL
120352 +usbvision_read_31555 usbvision_read 3 31555 NULL
120353 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
120354 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
120355 +osst_write_31581 osst_write 3 31581 NULL
120356 +snd_compr_get_avail_31584 snd_compr_get_avail 0 31584 NULL
120357 +iwl_dbgfs_ucode_tx_stats_read_31611 iwl_dbgfs_ucode_tx_stats_read 3 31611 NULL
120358 +memblock_virt_alloc_nopanic_31617 memblock_virt_alloc_nopanic 1 31617 NULL nohasharray
120359 +arvo_sysfs_read_31617 arvo_sysfs_read 6 31617 &memblock_virt_alloc_nopanic_31617
120360 +usnic_ib_dump_vf_31623 usnic_ib_dump_vf 3 31623 NULL
120361 +videobuf_read_one_31637 videobuf_read_one 3 31637 NULL
120362 +pod_alloc_sysex_buffer_31651 pod_alloc_sysex_buffer 3 31651 NULL
120363 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
120364 +__lgread_31668 __lgread 4 31668 NULL
120365 +copy_from_user_nmi_31672 copy_from_user_nmi 3-0 31672 NULL
120366 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
120367 +fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
120368 +rs_pretty_print_rate_31727 rs_pretty_print_rate 0 31727 NULL
120369 +lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 NULL nohasharray
120370 +utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 &lu_buf_check_and_grow_31735
120371 +shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
120372 +input_abs_get_max_31742 input_abs_get_max 0 31742 NULL nohasharray
120373 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 &input_abs_get_max_31742
120374 +bcm_char_read_31750 bcm_char_read 3 31750 NULL
120375 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
120376 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
120377 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
120378 +get_count_order_31800 get_count_order 0 31800 NULL
120379 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
120380 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
120381 +data_write_31805 data_write 3 31805 NULL
120382 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
120383 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
120384 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
120385 +clone_bio_31854 clone_bio 4-3 31854 NULL
120386 +SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
120387 +iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
120388 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
120389 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
120390 +xattr_permission_31907 xattr_permission 0 31907 NULL
120391 +lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
120392 +new_dir_31919 new_dir 3 31919 NULL
120393 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
120394 +era_status_31934 era_status 5 31934 NULL
120395 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
120396 +read_mem_31942 read_mem 3 31942 NULL
120397 +ext4_zero_range_31944 ext4_zero_range 3-2 31944 NULL
120398 +vb2_write_31948 vb2_write 3 31948 NULL
120399 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
120400 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
120401 +iwl_rx_packet_payload_len_31965 iwl_rx_packet_payload_len 0 31965 NULL
120402 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
120403 +iblock_execute_rw_31982 iblock_execute_rw 3 31982 NULL nohasharray
120404 +vx_read_status_31982 vx_read_status 0 31982 &iblock_execute_rw_31982
120405 +find_next_zero_bit_31990 find_next_zero_bit 0 31990 NULL
120406 +lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
120407 +sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
120408 +calc_hmac_32010 calc_hmac 3 32010 NULL
120409 +aead_len_32021 aead_len 0 32021 NULL
120410 +sci_dma_rx_push_32029 sci_dma_rx_push 2 32029 NULL
120411 +stk_read_32038 stk_read 3 32038 NULL
120412 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
120413 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
120414 +cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
120415 +kiblnd_alloc_pages_32092 kiblnd_alloc_pages 3 32092 NULL
120416 +bio_alloc_32095 bio_alloc 2 32095 NULL
120417 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
120418 +wil_read_file_recovery_32104 wil_read_file_recovery 3 32104 NULL
120419 +disk_status_32120 disk_status 4 32120 NULL
120420 +kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
120421 +venus_link_32165 venus_link 5 32165 NULL
120422 +ocfs2_direct_IO_32168 ocfs2_direct_IO 4 32168 NULL
120423 +do_writepages_32173 do_writepages 0 32173 NULL
120424 +del_ptr_32197 del_ptr 4 32197 NULL
120425 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
120426 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
120427 +caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
120428 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
120429 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
120430 +kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
120431 +cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
120432 +SyS_select_32319 SyS_select 1 32319 NULL
120433 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
120434 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
120435 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
120436 +dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
120437 +rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
120438 +sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
120439 +ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
120440 +ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
120441 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
120442 +vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
120443 +cache_status_32462 cache_status 5 32462 NULL
120444 +fill_readbuf_32464 fill_readbuf 3 32464 NULL
120445 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
120446 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
120447 +mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
120448 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
120449 +disconnect_32521 disconnect 4 32521 NULL
120450 +qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
120451 +ilo_read_32531 ilo_read 3 32531 NULL
120452 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
120453 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
120454 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
120455 +osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
120456 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
120457 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
120458 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
120459 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
120460 +irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
120461 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
120462 +xpcs_reg_value_read_32644 xpcs_reg_value_read 3 32644 NULL
120463 +kvmalloc_32646 kvmalloc 1 32646 NULL
120464 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
120465 +generic_readlink_32654 generic_readlink 3 32654 NULL
120466 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
120467 +compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
120468 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
120469 +rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
120470 +_xfs_buf_get_pages_32715 _xfs_buf_get_pages 2 32715 NULL
120471 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
120472 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
120473 +vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
120474 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
120475 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
120476 +sta_tx_latency_stat_read_32862 sta_tx_latency_stat_read 3 32862 NULL
120477 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
120478 +cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
120479 +ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
120480 +vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 4-6 32884 NULL
120481 +visorchannel_dump_section_32893 visorchannel_dump_section 4 32893 NULL
120482 +tipc_link_iovec_xmit_fast_32913 tipc_link_iovec_xmit_fast 3 32913 NULL nohasharray
120483 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 &tipc_link_iovec_xmit_fast_32913
120484 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
120485 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
120486 +ptlrpc_prep_bulk_imp_32997 ptlrpc_prep_bulk_imp 2 32997 NULL
120487 +compat_filldir_32999 compat_filldir 3 32999 NULL
120488 +SyS_syslog_33007 SyS_syslog 3 33007 NULL
120489 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
120490 +write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
120491 +mic_virtio_copy_to_user_33048 mic_virtio_copy_to_user 3 33048 NULL
120492 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
120493 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
120494 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
120495 +bitmap_resize_33054 bitmap_resize 2 33054 NULL
120496 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
120497 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
120498 +alloc_tio_33077 alloc_tio 3 33077 NULL
120499 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
120500 +f2fs_llseek_33098 f2fs_llseek 2 33098 NULL
120501 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
120502 +SyS_poll_33152 SyS_poll 2 33152 NULL
120503 +_pci_add_cap_save_buffer_33153 _pci_add_cap_save_buffer 4 33153 NULL
120504 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
120505 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
120506 +pp_read_33210 pp_read 3 33210 NULL
120507 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
120508 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
120509 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
120510 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
120511 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
120512 +vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
120513 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
120514 +lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
120515 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
120516 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
120517 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
120518 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
120519 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
120520 +nvc0_ram_create__33391 nvc0_ram_create_ 5 33391 NULL
120521 +ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
120522 +cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
120523 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 NULL
120524 +hash_netiface6_expire_33421 hash_netiface6_expire 4 33421 NULL
120525 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
120526 +message_stats_list_33440 message_stats_list 5 33440 NULL
120527 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
120528 +create_entry_33479 create_entry 2 33479 NULL
120529 +ip_setsockopt_33487 ip_setsockopt 5 33487 NULL
120530 +res_counter_read_33499 res_counter_read 4 33499 NULL
120531 +hash_netnet4_expire_33500 hash_netnet4_expire 4 33500 NULL
120532 +fb_read_33506 fb_read 3 33506 NULL
120533 +musb_test_mode_write_33518 musb_test_mode_write 3 33518 NULL
120534 +ahash_setkey_unaligned_33521 ahash_setkey_unaligned 3 33521 NULL
120535 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
120536 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
120537 +tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL nohasharray
120538 +osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 &tomoyo_read_self_33539
120539 +count_subheaders_33591 count_subheaders 0 33591 NULL
120540 +scsi_execute_33596 scsi_execute 5 33596 NULL
120541 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
120542 +xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
120543 +il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL nohasharray
120544 +usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 &il_dbgfs_qos_read_33615
120545 +stride_page_count_33641 stride_page_count 2 33641 NULL
120546 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
120547 +inw_p_33668 inw_p 0 33668 NULL
120548 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
120549 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
120550 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
120551 +netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
120552 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
120553 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
120554 +write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL
120555 +read_file_node_recv_33729 read_file_node_recv 3 33729 NULL
120556 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
120557 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
120558 +hashtab_create_33769 hashtab_create 3 33769 NULL
120559 +__btrfs_free_reserved_extent_33782 __btrfs_free_reserved_extent 2 33782 NULL
120560 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
120561 +filter_write_33819 filter_write 3 33819 NULL
120562 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
120563 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
120564 +ext4_journal_extend_33835 ext4_journal_extend 2 33835 NULL
120565 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
120566 +azx_get_pos_posbuf_33867 azx_get_pos_posbuf 0 33867 NULL
120567 +get_user_pages_33908 get_user_pages 0 33908 NULL
120568 +sg_nents_33909 sg_nents 0 33909 NULL
120569 +ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
120570 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
120571 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
120572 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
120573 +read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
120574 +rs_sta_dbgfs_drv_tx_stats_read_33946 rs_sta_dbgfs_drv_tx_stats_read 3 33946 NULL
120575 +__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
120576 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
120577 +lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
120578 +ppp_write_34034 ppp_write 3 34034 NULL
120579 +tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
120580 +bm_page_io_async_34050 bm_page_io_async 2 34050 NULL
120581 +calc_linear_pos_34067 calc_linear_pos 0-4 34067 NULL
120582 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
120583 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
120584 +__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
120585 +proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
120586 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
120587 +ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
120588 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
120589 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
120590 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
120591 +rsi_debug_zone_write_34206 rsi_debug_zone_write 3 34206 NULL nohasharray
120592 +rbd_osd_req_create_34206 rbd_osd_req_create 3 34206 &rsi_debug_zone_write_34206
120593 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
120594 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
120595 +device_private_init_34279 device_private_init 0 34279 NULL
120596 +xgmac_reg_addr_write_34284 xgmac_reg_addr_write 3 34284 NULL
120597 +ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
120598 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 NULL nohasharray
120599 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 &pcpu_need_to_extend_34326
120600 +proc_thread_self_readlink_34357 proc_thread_self_readlink 3 34357 NULL
120601 +crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL nohasharray
120602 +sync_page_io_34363 sync_page_io 3 34363 &crypto_ablkcipher_ivsize_34363
120603 +rngapi_reset_34366 rngapi_reset 3 34366 NULL
120604 +ea_read_34378 ea_read 0 34378 NULL nohasharray
120605 +_iwl_dbgfs_low_latency_write_34378 _iwl_dbgfs_low_latency_write 3 34378 &ea_read_34378
120606 +fuse_send_read_34379 fuse_send_read 0-4 34379 NULL
120607 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
120608 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
120609 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
120610 +ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray
120611 +iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400
120612 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
120613 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
120614 +security_socket_create_34439 security_socket_create 0 34439 NULL
120615 +usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
120616 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
120617 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
120618 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
120619 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
120620 +SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
120621 +qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
120622 +lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
120623 +ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
120624 +tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
120625 +hugetlbfs_read_actor_34547 hugetlbfs_read_actor 2-5-4-0 34547 NULL
120626 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
120627 +alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
120628 +ext4_ind_direct_IO_34574 ext4_ind_direct_IO 4 34574 NULL
120629 +lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
120630 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
120631 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
120632 +ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
120633 +cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
120634 +bio_integrity_bytes_34602 bio_integrity_bytes 2 34602 NULL
120635 +__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
120636 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
120637 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
120638 +kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
120639 +sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
120640 +f2fs_direct_IO_34685 f2fs_direct_IO 4 34685 NULL
120641 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
120642 +batadv_tvlv_realloc_packet_buff_34688 batadv_tvlv_realloc_packet_buff 3-4 34688 NULL
120643 +port_print_34704 port_print 3 34704 NULL
120644 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
120645 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
120646 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
120647 +lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
120648 +bootmode_store_34762 bootmode_store 4 34762 NULL
120649 +device_add_34766 device_add 0 34766 NULL
120650 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
120651 +ext3_direct_IO_34798 ext3_direct_IO 4 34798 NULL
120652 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
120653 +can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
120654 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
120655 +ll_setxattr_34806 ll_setxattr 4 34806 NULL
120656 +file_page_index_34820 file_page_index 0-2 34820 NULL
120657 +bio_segments_34832 bio_segments 0 34832 NULL
120658 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
120659 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
120660 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
120661 +usb_serial_generic_prepare_write_buffer_34857 usb_serial_generic_prepare_write_buffer 3 34857 NULL
120662 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
120663 +msg_print_text_34889 msg_print_text 0 34889 NULL
120664 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
120665 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
120666 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 NULL nohasharray
120667 +__inode_permission_34925 __inode_permission 0 34925 &btrfs_super_chunk_root_34925
120668 +sec_flags2str_34933 sec_flags2str 3 34933 NULL
120669 +snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
120670 +compat_SyS_kexec_load_34947 compat_SyS_kexec_load 2 34947 NULL
120671 +do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
120672 +sdebug_change_qdepth_34994 sdebug_change_qdepth 2 34994 NULL
120673 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
120674 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
120675 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
120676 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
120677 +hwdep_read_locked_35037 hwdep_read_locked 3 35037 NULL
120678 +proc_setgroups_write_35039 proc_setgroups_write 3 35039 NULL
120679 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
120680 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
120681 +capi_write_35104 capi_write 3 35104 NULL nohasharray
120682 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
120683 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
120684 +ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
120685 +addrs_per_inode_35151 addrs_per_inode 0 35151 NULL
120686 +message_stats_print_35158 message_stats_print 6 35158 NULL
120687 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
120688 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
120689 +compat_SyS_pselect6_35203 compat_SyS_pselect6 1 35203 NULL
120690 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
120691 +striped_read_35218 striped_read 0-2 35218 NULL nohasharray
120692 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
120693 +rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL
120694 +kimage_file_prepare_segments_35232 kimage_file_prepare_segments 5 35232 NULL
120695 +set_fd_set_35249 set_fd_set 1 35249 NULL
120696 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
120697 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
120698 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
120699 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
120700 +i2o_block_end_request_35282 i2o_block_end_request 3 35282 NULL
120701 +isr_rx_rdys_read_35283 isr_rx_rdys_read 3 35283 NULL nohasharray
120702 +nvkm_notify_init_35283 nvkm_notify_init 7 35283 &isr_rx_rdys_read_35283
120703 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 NULL nohasharray
120704 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 &__btrfs_buffered_write_35311
120705 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
120706 +sta_tx_latency_stat_write_35323 sta_tx_latency_stat_write 3 35323 NULL
120707 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
120708 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
120709 +ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
120710 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
120711 +read_kmem_35372 read_kmem 3 35372 NULL
120712 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
120713 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
120714 +iwl_dbgfs_drv_rx_stats_read_35430 iwl_dbgfs_drv_rx_stats_read 3 35430 NULL
120715 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
120716 +efx_mcdi_rpc_async_quiet_35460 efx_mcdi_rpc_async_quiet 4-5 35460 NULL
120717 +macvtap_do_read_35475 macvtap_do_read 3 35475 NULL
120718 +fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
120719 +btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4 35500 NULL
120720 +async_setkey_35521 async_setkey 3 35521 NULL
120721 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
120722 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
120723 +pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
120724 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
120725 +ocfs2_write_zero_page_35539 ocfs2_write_zero_page 3 35539 NULL
120726 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
120727 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
120728 +C_SYSC_kexec_load_35565 C_SYSC_kexec_load 2 35565 NULL
120729 +ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
120730 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
120731 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
120732 +kernel_readv_35617 kernel_readv 3 35617 NULL
120733 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
120734 +ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
120735 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
120736 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
120737 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
120738 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
120739 +md_super_write_35703 md_super_write 4 35703 NULL
120740 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
120741 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
120742 +alloc_netdev_mqs_35806 alloc_netdev_mqs 1 35806 NULL
120743 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
120744 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
120745 +vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
120746 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
120747 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
120748 +ieee80211_if_fmt_dot11MeshRetryTimeout_35890 ieee80211_if_fmt_dot11MeshRetryTimeout 3 35890 NULL
120749 +uwb_rc_cmd_done_35892 uwb_rc_cmd_done 4 35892 NULL
120750 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
120751 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
120752 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
120753 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
120754 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
120755 +generic_ocp_read_35974 generic_ocp_read 3 35974 NULL nohasharray
120756 +ceph_buffer_new_35974 ceph_buffer_new 1 35974 &generic_ocp_read_35974
120757 +acl_alloc_35979 acl_alloc 1 35979 NULL
120758 +device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
120759 +write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
120760 +kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
120761 +lov_mds_md_max_stripe_count_36008 lov_mds_md_max_stripe_count 0-1 36008 NULL
120762 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
120763 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
120764 +account_shadowed_36048 account_shadowed 2 36048 NULL
120765 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
120766 +write_emulate_36065 write_emulate 2-4 36065 NULL
120767 +stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
120768 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
120769 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
120770 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
120771 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
120772 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
120773 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
120774 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
120775 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
120776 +twl_set_36154 twl_set 2 36154 NULL
120777 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
120778 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
120779 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
120780 +ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
120781 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
120782 +SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
120783 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
120784 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
120785 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
120786 +vmsplice_to_user_36245 vmsplice_to_user 3 36245 NULL nohasharray
120787 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 &vmsplice_to_user_36245
120788 +cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 NULL
120789 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
120790 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
120791 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
120792 +cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
120793 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
120794 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL nohasharray
120795 +__compat_sys_pwritev64_36328 __compat_sys_pwritev64 3 36328 &fat_compat_ioctl_filldir_36328
120796 +lc_create_36332 lc_create 4 36332 NULL
120797 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
120798 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
120799 +ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
120800 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL
120801 +to_sector_36361 to_sector 0-1 36361 NULL
120802 +tunables_read_36385 tunables_read 3 36385 NULL
120803 +afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
120804 +sierra_write_36402 sierra_write 4 36402 NULL
120805 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
120806 +soc_pcm_codec_params_fixup_36434 soc_pcm_codec_params_fixup 2 36434 NULL
120807 +ReadW6692B_36445 ReadW6692B 0 36445 NULL
120808 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
120809 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
120810 +SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
120811 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
120812 +ds1343_nvram_write_36489 ds1343_nvram_write 5-6 36489 NULL
120813 +tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL nohasharray
120814 +ip6_append_data_36490 ip6_append_data 4 36490 &tx_tx_checksum_result_read_36490
120815 +cmd_loop_36491 cmd_loop 0 36491 NULL
120816 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
120817 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
120818 +_iwl_dbgfs_fw_nmi_write_36515 _iwl_dbgfs_fw_nmi_write 3 36515 NULL
120819 +get_param_l_36518 get_param_l 0 36518 NULL
120820 +ieee80211_if_read_fwded_frames_36520 ieee80211_if_read_fwded_frames 3 36520 NULL
120821 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
120822 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
120823 +__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL
120824 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
120825 +__erst_read_36579 __erst_read 0 36579 NULL
120826 +put_cmsg_36589 put_cmsg 4 36589 NULL
120827 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
120828 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
120829 +convert_extent_item_v0_36645 convert_extent_item_v0 4 36645 NULL
120830 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
120831 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
120832 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
120833 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
120834 +xillybus_read_36678 xillybus_read 3 36678 NULL
120835 +gsmtty_write_36702 gsmtty_write 3 36702 NULL
120836 +path_getxattr_36717 path_getxattr 4 36717 NULL
120837 +snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
120838 +cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
120839 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
120840 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
120841 +i40e_init_lan_hmc_36796 i40e_init_lan_hmc 5-4-3-2 36796 NULL
120842 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
120843 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
120844 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
120845 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
120846 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
120847 +cm_write_36858 cm_write 3 36858 NULL
120848 +tipc_link_iovec_long_xmit_36871 tipc_link_iovec_long_xmit 3 36871 NULL nohasharray
120849 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 &tipc_link_iovec_long_xmit_36871
120850 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
120851 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
120852 +__btrfs_map_block_36883 __btrfs_map_block 3 36883 NULL
120853 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
120854 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
120855 +il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
120856 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
120857 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
120858 +setxattr_37006 setxattr 4 37006 NULL
120859 +ec_i2c_xfer_37029 ec_i2c_xfer 3 37029 NULL
120860 +ieee80211_chsw_switch_vifs_37030 ieee80211_chsw_switch_vifs 2 37030 NULL
120861 +command_file_read_37038 command_file_read 3 37038 NULL
120862 +figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
120863 +qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
120864 +ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
120865 +_iwl_dbgfs_bcast_filters_macs_write_37069 _iwl_dbgfs_bcast_filters_macs_write 3 37069 NULL
120866 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
120867 +parse_command_37079 parse_command 2 37079 NULL
120868 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
120869 +tun_get_user_37094 tun_get_user 5 37094 NULL
120870 +has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
120871 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
120872 +mtt_free_res_37144 mtt_free_res 5 37144 NULL
120873 +msg_word_37164 msg_word 0 37164 NULL
120874 +vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
120875 +forced_ps_write_37209 forced_ps_write 3 37209 NULL
120876 +crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
120877 +bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
120878 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
120879 +__do_replace_37227 __do_replace 5 37227 NULL
120880 +iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
120881 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL nohasharray
120882 +__btrfs_inc_extent_ref_37238 __btrfs_inc_extent_ref 7 37238 &rx_filter_dup_filter_read_37238
120883 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
120884 +_iwl_dbgfs_fw_restart_write_37270 _iwl_dbgfs_fw_restart_write 3 37270 NULL
120885 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
120886 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
120887 +tipc_send_37315 tipc_send 3 37315 NULL
120888 +l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
120889 +bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
120890 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
120891 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
120892 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
120893 +seek_firmware_37372 seek_firmware 2 37372 NULL
120894 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
120895 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL
120896 +tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
120897 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
120898 +fru_alloc_37442 fru_alloc 1 37442 NULL
120899 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
120900 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
120901 +get_est_timing_37484 get_est_timing 0 37484 NULL
120902 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
120903 +bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
120904 +osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
120905 +bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL
120906 +xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
120907 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
120908 +hdr_size_37536 hdr_size 0 37536 NULL
120909 +extent_map_end_37550 extent_map_end 0 37550 NULL
120910 +sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
120911 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
120912 +qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
120913 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6 37611 NULL
120914 +SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
120915 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
120916 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
120917 +vmw_framebuffer_dmabuf_dirty_37661 vmw_framebuffer_dmabuf_dirty 6 37661 NULL nohasharray
120918 +rfcomm_sock_sendmsg_37661 rfcomm_sock_sendmsg 4 37661 &vmw_framebuffer_dmabuf_dirty_37661
120919 +SYSC_get_mempolicy_37664 SYSC_get_mempolicy 3 37664 NULL
120920 +__wa_seg_calculate_isoc_frame_count_37672 __wa_seg_calculate_isoc_frame_count 0 37672 NULL
120921 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
120922 +tracing_saved_cmdlines_size_write_37684 tracing_saved_cmdlines_size_write 3 37684 NULL
120923 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
120924 +nametbl_header_37698 nametbl_header 2-0 37698 NULL
120925 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
120926 +dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
120927 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
120928 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
120929 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
120930 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
120931 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
120932 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
120933 +nvkm_notify_init_37806 nvkm_notify_init 6 37806 NULL
120934 +ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
120935 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
120936 +android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
120937 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
120938 +xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
120939 +btrfs_leaf_data_37869 btrfs_leaf_data 0 37869 NULL
120940 +btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
120941 +_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
120942 +pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
120943 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
120944 +write_file_bool_37957 write_file_bool 3 37957 NULL
120945 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
120946 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
120947 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
120948 +vfs_readv_38011 vfs_readv 3 38011 NULL
120949 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
120950 +il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
120951 +klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
120952 +parser_init_guts_38046 parser_init_guts 2 38046 NULL
120953 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
120954 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
120955 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL
120956 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
120957 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
120958 +cifs_send_async_read_38077 cifs_send_async_read 2 38077 NULL
120959 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
120960 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
120961 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
120962 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
120963 +ep0_read_38095 ep0_read 3 38095 NULL
120964 +osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 NULL nohasharray
120965 +sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 &osc_checksum_seq_write_38096
120966 +o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
120967 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
120968 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
120969 +__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4-0 38153 NULL
120970 +btrfs_extent_same_38163 btrfs_extent_same 3-2-5 38163 NULL
120971 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
120972 +cdev_add_38176 cdev_add 2-3 38176 NULL
120973 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
120974 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
120975 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
120976 +ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
120977 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
120978 +nvkm_dmaobj_create__38250 nvkm_dmaobj_create_ 6 38250 NULL
120979 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 NULL nohasharray
120980 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &mthca_alloc_icm_table_38268 nohasharray
120981 +SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 &ieee80211_if_read_auto_open_plinks_38268
120982 +xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
120983 +xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
120984 +ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
120985 +C_SYSC_pselect6_38296 C_SYSC_pselect6 1 38296 NULL
120986 +ucma_query_path_38305 ucma_query_path 3 38305 NULL
120987 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
120988 +ida_simple_get_38326 ida_simple_get 0 38326 NULL
120989 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
120990 +usb_ext_prop_put_name_38352 usb_ext_prop_put_name 0-3 38352 NULL
120991 +btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
120992 +xfs_free_file_space_38383 xfs_free_file_space 2-3 38383 NULL
120993 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
120994 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
120995 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
120996 +iov_iter_npages_iovec_38448 iov_iter_npages_iovec 0-2 38448 NULL
120997 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
120998 +videobuf_waiton_38459 videobuf_waiton 0 38459 NULL
120999 +_iwl_dbgfs_scan_ant_rxchain_write_38479 _iwl_dbgfs_scan_ant_rxchain_write 3 38479 NULL
121000 +blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
121001 +dev_names_read_38509 dev_names_read 3 38509 NULL
121002 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
121003 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
121004 +set_queue_count_38519 set_queue_count 0 38519 NULL
121005 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
121006 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
121007 +kuc_len_38557 kuc_len 0-1 38557 NULL
121008 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
121009 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
121010 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
121011 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
121012 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
121013 +rd_allocate_sgl_table_38607 rd_allocate_sgl_table 3 38607 NULL
121014 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
121015 +write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
121016 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
121017 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
121018 +qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
121019 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
121020 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
121021 +ufshcd_read_sdev_qdepth_38676 ufshcd_read_sdev_qdepth 0 38676 NULL
121022 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
121023 +tracing_nsecs_read_38689 tracing_nsecs_read 3 38689 NULL
121024 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
121025 +w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
121026 +udf_readpages_38761 udf_readpages 4 38761 NULL
121027 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
121028 +bcache_device_init_38781 bcache_device_init 3 38781 NULL
121029 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
121030 +do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
121031 +err_decode_38804 err_decode 2 38804 NULL
121032 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
121033 +direct_entry_38836 direct_entry 3 38836 NULL
121034 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
121035 +interfaces_38859 interfaces 2 38859 NULL
121036 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
121037 +il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
121038 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
121039 +usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
121040 +C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
121041 +OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
121042 +bio_clone_range_38997 bio_clone_range 2 38997 NULL
121043 +lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
121044 +get_nodes_39012 get_nodes 3 39012 NULL
121045 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
121046 +force_sc_support_read_39014 force_sc_support_read 3 39014 NULL
121047 +__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
121048 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
121049 +do_write_kmem_39051 do_write_kmem 0-1-3 39051 NULL
121050 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
121051 +__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
121052 +ea_foreach_39133 ea_foreach 0 39133 NULL
121053 +generic_permission_39150 generic_permission 0 39150 NULL
121054 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
121055 +ath9k_hw_ar9003_dump_eeprom_39156 ath9k_hw_ar9003_dump_eeprom 5-4 39156 NULL
121056 +echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
121057 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
121058 +mlx4_en_create_tx_ring_39179 mlx4_en_create_tx_ring 4 39179 NULL
121059 +ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
121060 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
121061 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
121062 +SyS_getrandom_39235 SyS_getrandom 2 39235 NULL
121063 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
121064 +snd_pcm_capture_forward_39248 snd_pcm_capture_forward 2 39248 NULL
121065 +r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
121066 +pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
121067 +i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
121068 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
121069 +_iwl_dbgfs_pm_params_write_39325 _iwl_dbgfs_pm_params_write 3 39325 NULL
121070 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
121071 +insert_reserved_file_extent_39327 insert_reserved_file_extent 3 39327 NULL
121072 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
121073 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
121074 +do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
121075 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
121076 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
121077 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
121078 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
121079 +__send_to_port_39386 __send_to_port 3 39386 NULL
121080 +user_power_read_39414 user_power_read 3 39414 NULL
121081 +hash_ipmark4_expire_39419 hash_ipmark4_expire 4 39419 NULL
121082 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
121083 +mic_desc_size_39464 mic_desc_size 0 39464 NULL
121084 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
121085 +usif_ioctl_39481 usif_ioctl 3 39481 NULL
121086 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
121087 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
121088 +int_proc_write_39542 int_proc_write 3 39542 NULL
121089 +pp_write_39554 pp_write 3 39554 NULL
121090 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
121091 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
121092 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL
121093 +ext_depth_39607 ext_depth 0 39607 NULL
121094 +batadv_tt_tvlv_generate_39615 batadv_tt_tvlv_generate 4 39615 NULL
121095 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
121096 +sdio_readb_39618 sdio_readb 0 39618 NULL
121097 +set_dev_class_39645 set_dev_class 4 39645 NULL
121098 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
121099 +tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
121100 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
121101 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
121102 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
121103 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
121104 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
121105 +adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
121106 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
121107 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
121108 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
121109 +netlbl_catmap_walkrng_39885 netlbl_catmap_walkrng 0-2 39885 NULL
121110 +pkt_add_39897 pkt_add 3 39897 NULL
121111 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
121112 +gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
121113 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
121114 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
121115 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 NULL nohasharray
121116 +exofs_read_kern_39921 exofs_read_kern 6 39921 &oom_score_adj_read_39921
121117 +__spi_async_39932 __spi_async 0 39932 NULL
121118 +__get_order_39935 __get_order 0 39935 NULL
121119 +error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
121120 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
121121 +lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
121122 +bio_chain_clone_range_39967 bio_chain_clone_range 3 39967 NULL
121123 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
121124 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
121125 +lustre_pack_reply_v2_39978 lustre_pack_reply_v2 2 39978 NULL
121126 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
121127 +fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
121128 +server_name2svname_39998 server_name2svname 4 39998 NULL
121129 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
121130 +ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
121131 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
121132 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
121133 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
121134 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 NULL nohasharray
121135 +add_tty_40055 add_tty 1 40055 &l2cap_create_iframe_pdu_40055
121136 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
121137 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
121138 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
121139 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
121140 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL nohasharray
121141 +kvm_mmu_notifier_clear_flush_young_40143 kvm_mmu_notifier_clear_flush_young 3-4 40143 &ath10k_write_simulate_fw_crash_40143
121142 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
121143 +pt_write_40159 pt_write 3 40159 NULL
121144 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
121145 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL
121146 +allocate_probes_40204 allocate_probes 1 40204 NULL
121147 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
121148 +compress_file_range_40225 compress_file_range 3-4 40225 NULL
121149 +ocrdma_dbgfs_ops_read_40232 ocrdma_dbgfs_ops_read 3 40232 NULL
121150 +osst_read_40237 osst_read 3 40237 NULL
121151 +lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
121152 +ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
121153 +of_get_child_count_40254 of_get_child_count 0 40254 NULL nohasharray
121154 +fsl_edma_prep_dma_cyclic_40254 fsl_edma_prep_dma_cyclic 3-4 40254 &of_get_child_count_40254
121155 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
121156 +ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
121157 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
121158 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
121159 +tracing_thresh_read_40295 tracing_thresh_read 3 40295 NULL
121160 +SyS_bind_40303 SyS_bind 3 40303 NULL
121161 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
121162 +mmio_read_40348 mmio_read 4 40348 NULL
121163 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
121164 +ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
121165 +get_chars_40373 get_chars 3 40373 NULL
121166 +fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
121167 +proc_write_driver_40432 proc_write_driver 3 40432 NULL
121168 +repair_io_failure_40452 repair_io_failure 4-3 40452 NULL
121169 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
121170 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
121171 +gp2ap020a00f_write_event_threshold_40461 gp2ap020a00f_write_event_threshold 2 40461 NULL
121172 +SyS_writev_40467 SyS_writev 3 40467 NULL
121173 +SyS_select_40473 SyS_select 1 40473 NULL
121174 +afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
121175 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
121176 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
121177 +__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
121178 +TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
121179 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
121180 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
121181 +esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
121182 +bl_alloc_init_bio_40569 bl_alloc_init_bio 1 40569 NULL
121183 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
121184 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
121185 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
121186 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
121187 +fops_read_40672 fops_read 3 40672 NULL
121188 +idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
121189 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
121190 +videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 4-3 40678 NULL
121191 +pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
121192 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
121193 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
121194 +lnet_new_text_buf_40717 lnet_new_text_buf 1 40717 NULL
121195 +ip_skb_dst_mtu_40718 ip_skb_dst_mtu 0 40718 NULL
121196 +of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
121197 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
121198 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL
121199 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
121200 +card_send_command_40757 card_send_command 3 40757 NULL
121201 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
121202 +pg_write_40766 pg_write 3 40766 NULL
121203 +kernfs_fop_read_40770 kernfs_fop_read 3 40770 NULL
121204 +show_list_40775 show_list 3-0 40775 NULL
121205 +kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
121206 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
121207 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
121208 +rtw_add_beacon_40801 rtw_add_beacon 3-5 40801 NULL
121209 +add_action_40811 add_action 4 40811 NULL
121210 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
121211 +nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
121212 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
121213 +read_file_queue_40895 read_file_queue 3 40895 NULL
121214 +waiters_read_40902 waiters_read 3 40902 NULL
121215 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
121216 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
121217 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
121218 +snd_vx_create_40948 snd_vx_create 4 40948 NULL
121219 +path_listxattr_40949 path_listxattr 3 40949 NULL
121220 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
121221 +ima_appraise_measurement_40978 ima_appraise_measurement 6 40978 NULL
121222 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
121223 +iwl_dbgfs_scan_ant_rxchain_read_40999 iwl_dbgfs_scan_ant_rxchain_read 3 40999 NULL
121224 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
121225 +get_pages_alloc_bvec_41012 get_pages_alloc_bvec 0-3 41012 NULL
121226 +__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
121227 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
121228 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
121229 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
121230 +lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
121231 +vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
121232 +beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
121233 +sc_only_mode_read_41076 sc_only_mode_read 3 41076 NULL
121234 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
121235 +nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 NULL nohasharray
121236 +roccat_read_41093 roccat_read 3 41093 &nvme_map_user_pages_41093
121237 +dma_attach_41094 dma_attach 5-6 41094 NULL
121238 +nl80211_send_mlme_event_41099 nl80211_send_mlme_event 4 41099 NULL
121239 +provide_user_output_41105 provide_user_output 3 41105 NULL
121240 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
121241 +ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
121242 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
121243 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
121244 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
121245 +netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
121246 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
121247 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
121248 +cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
121249 +hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
121250 +erst_read_41260 erst_read 0 41260 NULL
121251 +alloc_context_41283 alloc_context 1 41283 NULL
121252 +of_count_phandle_with_args_41291 of_count_phandle_with_args 0 41291 NULL
121253 +virtscsi_change_queue_depth_41327 virtscsi_change_queue_depth 2 41327 NULL
121254 +o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
121255 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
121256 +rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
121257 +ceph_do_getattr_41349 ceph_do_getattr 0 41349 NULL
121258 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
121259 +kmp_init_41373 kmp_init 2 41373 NULL
121260 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
121261 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
121262 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
121263 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
121264 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
121265 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
121266 +ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
121267 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
121268 +se_io_cb_41461 se_io_cb 3 41461 NULL
121269 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
121270 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
121271 +bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
121272 +kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
121273 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
121274 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
121275 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
121276 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
121277 +dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
121278 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
121279 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
121280 +nr_status_frames_41559 nr_status_frames 0-1 41559 NULL nohasharray
121281 +si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 &nr_status_frames_41559
121282 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
121283 +nfsd_readv_41585 nfsd_readv 4 41585 NULL
121284 +batadv_tvlv_container_ogm_append_41588 batadv_tvlv_container_ogm_append 4 41588 NULL
121285 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
121286 +lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
121287 +usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
121288 +a2mp_send_41615 a2mp_send 4 41615 NULL
121289 +lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
121290 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
121291 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
121292 +get_std_timing_41654 get_std_timing 0 41654 NULL
121293 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
121294 +fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
121295 +lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
121296 +connector_write_41709 connector_write 3 41709 NULL
121297 +fillonedir_41746 fillonedir 3 41746 NULL
121298 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
121299 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
121300 +ptlrpc_new_bulk_41804 ptlrpc_new_bulk 1 41804 NULL
121301 +rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
121302 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
121303 +kimage_file_alloc_init_41827 kimage_file_alloc_init 5 41827 NULL
121304 +copy_page_to_iter_bvec_41830 copy_page_to_iter_bvec 0-3 41830 NULL
121305 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
121306 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
121307 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
121308 +pci_map_single_41869 pci_map_single 0 41869 NULL
121309 +usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
121310 +v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
121311 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
121312 +ext4_da_write_inline_data_begin_41935 ext4_da_write_inline_data_begin 4-3 41935 NULL
121313 +sci_rxfill_41945 sci_rxfill 0 41945 NULL
121314 +read_gssp_41947 read_gssp 3 41947 NULL
121315 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
121316 +portnames_read_41958 portnames_read 3 41958 NULL
121317 +dst_mtu_41969 dst_mtu 0 41969 NULL
121318 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
121319 +pool_allocate_42012 pool_allocate 3 42012 NULL
121320 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
121321 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
121322 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
121323 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
121324 +alloc_trace_kprobe_42041 alloc_trace_kprobe 6 42041 NULL
121325 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
121326 +jffs2_do_link_42048 jffs2_do_link 6 42048 NULL
121327 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
121328 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
121329 +ufshcd_dev_cmd_completion_42080 ufshcd_dev_cmd_completion 0 42080 NULL
121330 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
121331 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
121332 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
121333 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 NULL
121334 +blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
121335 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
121336 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
121337 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
121338 +write_file_beacon_42185 write_file_beacon 3 42185 NULL
121339 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
121340 +blockdev_direct_IO_42235 blockdev_direct_IO 5 42235 NULL nohasharray
121341 +pla_ocp_read_42235 pla_ocp_read 3 42235 &blockdev_direct_IO_42235
121342 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
121343 +find_last_bit_42260 find_last_bit 0 42260 NULL
121344 +__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
121345 +__tty_buffer_request_room_42276 __tty_buffer_request_room 2-0 42276 NULL
121346 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
121347 +__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
121348 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
121349 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
121350 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
121351 +xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
121352 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
121353 +tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
121354 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
121355 +drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
121356 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
121357 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
121358 +krng_get_random_42420 krng_get_random 3 42420 NULL
121359 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
121360 +spr_wm_latency_write_42441 spr_wm_latency_write 3 42441 NULL
121361 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
121362 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
121363 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
121364 +kuc_free_42455 kuc_free 2 42455 NULL
121365 +cp2112_gpio_get_42467 cp2112_gpio_get 2 42467 NULL
121366 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
121367 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
121368 +bypass_write_42498 bypass_write 3 42498 NULL
121369 +SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
121370 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
121371 +dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
121372 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
121373 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
121374 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
121375 +udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
121376 +iwl_print_event_log_42566 iwl_print_event_log 0-7-5 42566 NULL
121377 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
121378 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
121379 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
121380 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
121381 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
121382 +parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL nohasharray
121383 +num_controllers_42644 num_controllers 0 42644 &parport_pc_compat_write_block_pio_42644
121384 +_regmap_raw_write_42652 _regmap_raw_write 4-2 42652 NULL
121385 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
121386 +vb2_read_42703 vb2_read 3 42703 NULL
121387 +read_status_42722 read_status 0 42722 NULL
121388 +iwl_mvm_coex_dump_mbox_old_42727 iwl_mvm_coex_dump_mbox_old 4-3-0 42727 NULL
121389 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
121390 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
121391 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
121392 +dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
121393 +x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
121394 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
121395 +cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
121396 +isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
121397 +elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
121398 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
121399 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0 42796 NULL
121400 +fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
121401 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
121402 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
121403 +set_arg_42824 set_arg 3 42824 NULL
121404 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
121405 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
121406 +nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
121407 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
121408 +hd_end_request_42904 hd_end_request 2 42904 NULL
121409 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
121410 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
121411 +vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
121412 +ntb_setup_snb_msix_42971 ntb_setup_snb_msix 2 42971 NULL
121413 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
121414 +nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL nohasharray
121415 +rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
121416 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
121417 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
121418 +__bioset_create_43059 __bioset_create 1 43059 NULL
121419 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
121420 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
121421 +_xfer_secondary_pool_43089 _xfer_secondary_pool 2 43089 NULL
121422 +sysfs_create_file_ns_43103 sysfs_create_file_ns 0 43103 NULL
121423 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
121424 +calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
121425 +read_file_dfs_43145 read_file_dfs 3 43145 NULL
121426 +cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
121427 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
121428 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
121429 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
121430 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
121431 +uio_write_43202 uio_write 3 43202 NULL
121432 +iso_callback_43208 iso_callback 3 43208 NULL
121433 +ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
121434 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
121435 +atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
121436 +gfs2_direct_IO_43220 gfs2_direct_IO 4 43220 NULL
121437 +batadv_tt_tvlv_unicast_handler_v1_43239 batadv_tt_tvlv_unicast_handler_v1 5 43239 NULL
121438 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
121439 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
121440 +evtchn_write_43278 evtchn_write 3 43278 NULL nohasharray
121441 +parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 &evtchn_write_43278
121442 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
121443 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
121444 +mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
121445 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
121446 +xenfb_write_43412 xenfb_write 3 43412 NULL
121447 +ext4_xattr_check_names_43422 ext4_xattr_check_names 0 43422 NULL
121448 +__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
121449 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
121450 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
121451 +usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
121452 +usb_string_43443 usb_string 0 43443 &usemap_size_43443
121453 +get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
121454 +fs_path_prepare_for_add_43453 fs_path_prepare_for_add 2 43453 NULL
121455 +nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
121456 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
121457 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
121458 +ll_direct_IO_26_43530 ll_direct_IO_26 4 43530 NULL
121459 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
121460 +read_events_43534 read_events 3 43534 NULL
121461 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
121462 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL
121463 +request_resource_43548 request_resource 0 43548 NULL
121464 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
121465 +handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
121466 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
121467 +proc_read_43614 proc_read 3 43614 NULL
121468 +disable_dma_on_even_43618 disable_dma_on_even 0 43618 NULL
121469 +alloc_thread_groups_43625 alloc_thread_groups 2 43625 NULL
121470 +random_write_43656 random_write 3 43656 NULL
121471 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
121472 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
121473 +write_file_tx99_power_43670 write_file_tx99_power 3 43670 NULL
121474 +dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
121475 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
121476 +nvkm_connector_create__43711 nvkm_connector_create_ 6 43711 NULL
121477 +fuse_send_read_43725 fuse_send_read 4-0 43725 NULL
121478 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
121479 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
121480 +__alloc_alien_cache_43734 __alloc_alien_cache 2 43734 NULL
121481 +fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
121482 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
121483 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
121484 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
121485 +byte_pos_43787 byte_pos 0 43787 &ocfs2_xattr_get_value_outside_43787
121486 +btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
121487 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
121488 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
121489 +read_flush_43851 read_flush 3 43851 NULL
121490 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
121491 +ec_dbgfs_cmd_write_43895 ec_dbgfs_cmd_write 3 43895 NULL
121492 +SendString_43928 SendString 3 43928 NULL
121493 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
121494 +__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
121495 +nla_reserve_43984 nla_reserve 3 43984 NULL
121496 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
121497 +kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 NULL nohasharray
121498 +scsi_command_size_43992 scsi_command_size 0 43992 &kvm_read_guest_virt_43992 nohasharray
121499 +bcm_recvmsg_43992 bcm_recvmsg 4 43992 &scsi_command_size_43992
121500 +emit_flags_44006 emit_flags 4-3 44006 NULL
121501 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
121502 +fru_strlen_44046 fru_strlen 0 44046 NULL
121503 +ath9k_def_dump_modal_eeprom_44078 ath9k_def_dump_modal_eeprom 3-2-0 44078 NULL
121504 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
121505 +pci_msix_vec_count_44093 pci_msix_vec_count 0 44093 NULL
121506 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
121507 +skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
121508 +nouveau_clock_create__44116 nouveau_clock_create_ 6 44116 NULL
121509 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
121510 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
121511 +tracing_resize_saved_cmdlines_44140 tracing_resize_saved_cmdlines 1 44140 NULL
121512 +ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
121513 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
121514 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
121515 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
121516 +readreg_ipac_44186 readreg_ipac 0 44186 NULL
121517 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
121518 +btrfs_item_offset_nr_44220 btrfs_item_offset_nr 0 44220 NULL
121519 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
121520 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
121521 +sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
121522 +device_create_file_44285 device_create_file 0 44285 NULL
121523 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
121524 +bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
121525 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
121526 +ccp_init_data_44324 ccp_init_data 5 44324 NULL
121527 +rs_init_44327 rs_init 1 44327 NULL
121528 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
121529 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
121530 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
121531 +mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
121532 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
121533 +strlcpy_44400 strlcpy 3 44400 NULL
121534 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
121535 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
121536 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
121537 +mic_virtio_copy_to_user_44472 mic_virtio_copy_to_user 3-4 44472 NULL
121538 +write_file_debug_44476 write_file_debug 3 44476 NULL
121539 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
121540 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
121541 +bio_advance_44496 bio_advance 2 44496 NULL
121542 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
121543 +ac_register_board_44504 ac_register_board 3 44504 NULL
121544 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
121545 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
121546 +spidev_write_44510 spidev_write 3 44510 NULL
121547 +SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
121548 +ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
121549 +comm_write_44537 comm_write 3 44537 NULL
121550 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
121551 +l2cap_sock_memcpy_fromiovec_cb_44573 l2cap_sock_memcpy_fromiovec_cb 4 44573 NULL
121552 +nouveau_perfmon_create__44602 nouveau_perfmon_create_ 4 44602 NULL
121553 +xpcs_mmd_write_44633 xpcs_mmd_write 3 44633 NULL
121554 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
121555 +mpi_resize_44674 mpi_resize 2 44674 NULL
121556 +sysfs_create_link_44685 sysfs_create_link 0 44685 NULL
121557 +ts_read_44687 ts_read 3 44687 NULL
121558 +write_file_spectral_bins_44696 write_file_spectral_bins 3 44696 NULL
121559 +lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
121560 +C_SYSC_select_44701 C_SYSC_select 1 44701 NULL
121561 +__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 NULL nohasharray
121562 +xfer_to_user_44713 xfer_to_user 3 44713 &__generic_block_fiemap_44713
121563 +nft_hash_tbl_size_44724 nft_hash_tbl_size 0 44724 NULL
121564 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
121565 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
121566 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
121567 +efx_wanted_parallelism_44732 efx_wanted_parallelism 0 44732 NULL
121568 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
121569 +bch_bio_max_sectors_44755 bch_bio_max_sectors 0 44755 NULL
121570 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
121571 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
121572 +__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
121573 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
121574 +irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
121575 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
121576 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
121577 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
121578 +force_static_address_write_44819 force_static_address_write 3 44819 NULL
121579 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
121580 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
121581 +sisusb_write_44834 sisusb_write 3 44834 NULL
121582 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
121583 +qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
121584 +copydesc_user_44855 copydesc_user 3 44855 NULL
121585 +set_advertising_44870 set_advertising 4 44870 NULL
121586 +init_rs_44873 init_rs 1 44873 NULL
121587 +skb_availroom_44883 skb_availroom 0 44883 NULL
121588 +do_tty_write_44896 do_tty_write 5 44896 NULL
121589 +regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
121590 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
121591 +bytepos_delta_45017 bytepos_delta 0 45017 NULL
121592 +ptrace_writedata_45021 ptrace_writedata 4 45021 NULL
121593 +dm_kvzalloc_45025 dm_kvzalloc 1 45025 NULL
121594 +sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
121595 +sel_write_user_45060 sel_write_user 3 45060 NULL
121596 +snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
121597 +lnet_expand1tb_45102 lnet_expand1tb 6 45102 NULL
121598 +snd_card_new_45104 snd_card_new 5 45104 NULL
121599 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
121600 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
121601 +usbdev_read_45114 usbdev_read 3 45114 NULL
121602 +send_to_tty_45141 send_to_tty 3 45141 NULL
121603 +cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
121604 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
121605 +device_write_45156 device_write 3 45156 NULL nohasharray
121606 +ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 &device_write_45156
121607 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
121608 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
121609 +snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL nohasharray
121610 +sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 &snd_sb_csp_load_user_45190
121611 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
121612 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
121613 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
121614 +event_enable_write_45238 event_enable_write 3 45238 NULL
121615 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
121616 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
121617 +gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
121618 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
121619 +e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
121620 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
121621 +brcmf_sdio_died_dump_45359 brcmf_sdio_died_dump 3 45359 NULL
121622 +null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
121623 +count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
121624 +sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
121625 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL
121626 +ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
121627 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
121628 +blkdev_direct_IO_45440 blkdev_direct_IO 4 45440 NULL
121629 +__node_remap_45458 __node_remap 4 45458 NULL
121630 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
121631 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
121632 +__calc_request_pg_45470 __calc_request_pg 0 45470 NULL
121633 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
121634 +copy_macs_45534 copy_macs 4 45534 NULL
121635 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
121636 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
121637 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
121638 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
121639 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
121640 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
121641 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
121642 +ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
121643 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
121644 +ip_dst_mtu_maybe_forward_45627 ip_dst_mtu_maybe_forward 0 45627 NULL
121645 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
121646 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
121647 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
121648 +bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
121649 +unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
121650 +sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
121651 +wlcore_smart_config_decode_event_45714 wlcore_smart_config_decode_event 2-4 45714 NULL
121652 +snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
121653 +rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
121654 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
121655 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
121656 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
121657 +osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
121658 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
121659 +rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
121660 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
121661 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
121662 +ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
121663 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
121664 +ipv6_recv_rxpmtu_45830 ipv6_recv_rxpmtu 3 45830 NULL
121665 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
121666 +efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
121667 +isdn_write_45863 isdn_write 3 45863 NULL
121668 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
121669 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
121670 +cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
121671 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
121672 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
121673 +btree_keys_cachelines_45928 btree_keys_cachelines 0 45928 NULL
121674 +alloc_mr_45935 alloc_mr 1 45935 NULL
121675 +copy_to_45969 copy_to 3 45969 NULL
121676 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
121677 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
121678 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
121679 +fnic_reset_stats_read_46030 fnic_reset_stats_read 3 46030 NULL nohasharray
121680 +get_free_entries_46030 get_free_entries 1 46030 &fnic_reset_stats_read_46030
121681 +__access_remote_vm_46031 __access_remote_vm 0 46031 NULL
121682 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
121683 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 NULL nohasharray
121684 +__ocfs2_move_extent_46060 __ocfs2_move_extent 3-4 46060 &dma_tx_errors_read_46060
121685 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
121686 +memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
121687 +il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
121688 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
121689 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
121690 +rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
121691 +vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 3-2 46146 NULL
121692 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
121693 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
121694 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
121695 +fq_resize_46195 fq_resize 2 46195 NULL
121696 +add_conn_list_46197 add_conn_list 3-0 46197 NULL
121697 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
121698 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
121699 +dsp_write_46218 dsp_write 2 46218 NULL
121700 +hash_netiface4_expire_46226 hash_netiface4_expire 4 46226 NULL
121701 +xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
121702 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
121703 +sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
121704 +C_SYSC_ppoll_46319 C_SYSC_ppoll 2 46319 NULL
121705 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
121706 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
121707 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
121708 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
121709 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
121710 +ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
121711 +cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
121712 +wdata_alloc_and_fillpages_46437 wdata_alloc_and_fillpages 1 46437 NULL
121713 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
121714 +parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
121715 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
121716 +filldir64_46469 filldir64 3 46469 NULL
121717 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
121718 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
121719 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
121720 +kmsg_read_46514 kmsg_read 3 46514 NULL nohasharray
121721 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
121722 +nlm_end_grace_write_46517 nlm_end_grace_write 3 46517 NULL
121723 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
121724 +__btrfs_free_extent_46573 __btrfs_free_extent 7 46573 NULL
121725 +dn_current_mss_46574 dn_current_mss 0 46574 NULL
121726 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
121727 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
121728 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
121729 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
121730 +__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
121731 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
121732 +pci_enable_device_46642 pci_enable_device 0 46642 NULL
121733 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
121734 +e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
121735 +l2cap_create_le_flowctl_pdu_46682 l2cap_create_le_flowctl_pdu 3 46682 NULL
121736 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
121737 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
121738 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
121739 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
121740 +irq_domain_add_simple_46734 irq_domain_add_simple 2 46734 NULL
121741 +read_file_tx99_46741 read_file_tx99 3 46741 NULL
121742 +ext4_count_free_46754 ext4_count_free 2 46754 NULL
121743 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
121744 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
121745 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
121746 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
121747 +readreg_46845 readreg 0 46845 NULL
121748 +spi_async_46857 spi_async 0 46857 NULL
121749 +vsnprintf_46863 vsnprintf 0 46863 NULL
121750 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
121751 +qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
121752 +lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
121753 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
121754 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
121755 +alloc_cmdid_46904 alloc_cmdid 0 46904 NULL
121756 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
121757 +wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
121758 +fb_write_46924 fb_write 3 46924 NULL
121759 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
121760 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
121761 +SYSC_poll_46965 SYSC_poll 2 46965 NULL
121762 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
121763 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
121764 +strlcat_46985 strlcat 3 46985 NULL
121765 +bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
121766 +sel_write_bool_46996 sel_write_bool 3 46996 NULL
121767 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
121768 +cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
121769 +fs_path_len_47060 fs_path_len 0 47060 NULL
121770 +event_trigger_regex_write_47067 event_trigger_regex_write 3 47067 NULL
121771 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
121772 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
121773 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
121774 +ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
121775 +mousedev_read_47123 mousedev_read 3 47123 NULL
121776 +upcall_msg_size_47141 upcall_msg_size 2 47141 NULL
121777 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 NULL nohasharray
121778 +ses_recv_diag_47143 ses_recv_diag 4 47143 &acpi_ut_initialize_buffer_47143
121779 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
121780 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
121781 +options_write_47243 options_write 3 47243 NULL
121782 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
121783 +ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
121784 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
121785 +vsnprintf_47291 vsnprintf 0 47291 NULL
121786 +SYSC_semop_47292 SYSC_semop 3 47292 NULL
121787 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
121788 +virtqueue_add_47306 virtqueue_add 3 47306 NULL
121789 +nouveau_fb_create__47316 nouveau_fb_create_ 4 47316 NULL
121790 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
121791 +nvme_submit_admin_cmd_47357 nvme_submit_admin_cmd 0 47357 NULL
121792 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
121793 +kvm_arch_create_memslot_47364 kvm_arch_create_memslot 3 47364 NULL nohasharray
121794 +__output_copy_user_47364 __output_copy_user 3 47364 &kvm_arch_create_memslot_47364
121795 +__bio_map_kern_47379 __bio_map_kern 3 47379 NULL
121796 +nv_rd32_47390 nv_rd32 0 47390 NULL nohasharray
121797 +trace_options_core_read_47390 trace_options_core_read 3 47390 &nv_rd32_47390
121798 +nametbl_list_47391 nametbl_list 2 47391 NULL
121799 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
121800 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
121801 +lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
121802 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
121803 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
121804 +lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
121805 +C_SYSC_set_mempolicy_47466 C_SYSC_set_mempolicy 3 47466 NULL
121806 +lprocfs_fid_write_common_47471 lprocfs_fid_write_common 2 47471 NULL
121807 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
121808 +newpart_47485 newpart 6-4 47485 NULL
121809 +mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
121810 +core_sys_select_47494 core_sys_select 1 47494 NULL
121811 +as3722_block_write_47503 as3722_block_write 2-3 47503 NULL
121812 +alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
121813 +unlink_simple_47506 unlink_simple 3 47506 NULL
121814 +pstore_decompress_47510 pstore_decompress 0 47510 NULL
121815 +ec_i2c_count_response_47518 ec_i2c_count_response 0 47518 NULL
121816 +__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
121817 +process_vm_rw_47533 process_vm_rw 3-5 47533 NULL nohasharray
121818 +vscnprintf_47533 vscnprintf 0-2 47533 &process_vm_rw_47533
121819 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
121820 +drbg_statelen_47551 drbg_statelen 0 47551 NULL
121821 +read_ldt_47570 read_ldt 2 47570 NULL
121822 +isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
121823 +btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
121824 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
121825 +sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
121826 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
121827 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
121828 +ccp_sha_setkey_47633 ccp_sha_setkey 3 47633 NULL
121829 +get_size_47644 get_size 1-2 47644 NULL
121830 +osc_brw_prep_request_47680 osc_brw_prep_request 5 47680 NULL
121831 +packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
121832 +ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
121833 +save_microcode_47717 save_microcode 3 47717 NULL
121834 +bits_to_user_47733 bits_to_user 2-3 47733 NULL
121835 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
121836 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
121837 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
121838 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
121839 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
121840 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
121841 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
121842 +ptlrpc_prep_req_47792 ptlrpc_prep_req 4 47792 NULL
121843 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
121844 +W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
121845 +lov_packmd_47810 lov_packmd 0 47810 NULL
121846 +tree_mod_log_insert_move_47823 tree_mod_log_insert_move 5 47823 NULL
121847 +read_file_spectral_bins_47829 read_file_spectral_bins 3 47829 NULL
121848 +pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
121849 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
121850 +vhci_read_47878 vhci_read 3 47878 NULL
121851 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
121852 +cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
121853 +comedi_write_47926 comedi_write 3 47926 NULL
121854 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
121855 +arch_setup_msi_irq_47959 arch_setup_msi_irq 0 47959 NULL
121856 +gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
121857 +mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
121858 +iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
121859 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
121860 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
121861 +lustre_cfg_len_48002 lustre_cfg_len 0-1 48002 NULL
121862 +gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
121863 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
121864 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
121865 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
121866 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
121867 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
121868 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
121869 +disc_write_48070 disc_write 3 48070 NULL
121870 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
121871 +skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
121872 +wm_latency_write_48125 wm_latency_write 3 48125 NULL
121873 +load_firmware_48128 load_firmware 2 48128 NULL
121874 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
121875 +set_discoverable_48141 set_discoverable 4 48141 NULL
121876 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
121877 +SyS_vmsplice_48150 SyS_vmsplice 3 48150 NULL
121878 +_add_to_r4w_48152 _add_to_r4w 4 48152 NULL
121879 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
121880 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
121881 +rbd_obj_method_sync_48170 rbd_obj_method_sync 8 48170 NULL
121882 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
121883 +cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
121884 +ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
121885 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
121886 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
121887 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
121888 +read_file_recv_48232 read_file_recv 3 48232 NULL
121889 +unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
121890 +nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
121891 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
121892 +batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
121893 +__videobuf_free_48260 __videobuf_free 0 48260 NULL
121894 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
121895 +trace_options_write_48275 trace_options_write 3 48275 NULL
121896 +send_set_info_48288 send_set_info 7 48288 NULL
121897 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
121898 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
121899 +hash_setkey_48310 hash_setkey 3 48310 NULL
121900 +kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
121901 +skb_add_data_48363 skb_add_data 3 48363 NULL
121902 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
121903 +ath10k_read_htt_max_amsdu_ampdu_48401 ath10k_read_htt_max_amsdu_ampdu 3 48401 NULL
121904 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
121905 +uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
121906 +div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
121907 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
121908 +print_filtered_48442 print_filtered 2-0 48442 NULL
121909 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
121910 +copy_page_from_iter_iovec_48466 copy_page_from_iter_iovec 3-0 48466 NULL
121911 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
121912 +_iwl_dbgfs_bt_tx_prio_write_48473 _iwl_dbgfs_bt_tx_prio_write 3 48473 NULL
121913 +ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
121914 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
121915 +ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
121916 +send_control_msg_48498 send_control_msg 6 48498 NULL
121917 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
121918 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
121919 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
121920 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
121921 +drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
121922 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
121923 +nvif_notify_init_48578 nvif_notify_init 7 48578 NULL
121924 +llog_data_len_48607 llog_data_len 1 48607 NULL
121925 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
121926 +kernel_sock_ioctl_48644 kernel_sock_ioctl 0 48644 NULL
121927 +ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
121928 +mtd_read_48655 mtd_read 0 48655 NULL
121929 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
121930 +sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL
121931 +hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
121932 +altera_drscan_48698 altera_drscan 2 48698 NULL
121933 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
121934 +lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
121935 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
121936 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
121937 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
121938 +l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
121939 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
121940 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
121941 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
121942 +azx_get_position_48841 azx_get_position 0 48841 NULL
121943 +vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
121944 +comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
121945 +suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
121946 +viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL nohasharray
121947 +C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 &viafb_dvp1_proc_write_48864
121948 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
121949 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
121950 +joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
121951 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
121952 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
121953 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
121954 +si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
121955 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
121956 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
121957 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
121958 +nilfs_direct_IO_48981 nilfs_direct_IO 4 48981 NULL
121959 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
121960 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
121961 +null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
121962 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
121963 +transient_status_49027 transient_status 4 49027 NULL
121964 +ll_xattr_cache_add_49032 ll_xattr_cache_add 4-0 49032 NULL
121965 +scsi_register_49094 scsi_register 2 49094 NULL
121966 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
121967 +xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
121968 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
121969 +pt_read_49136 pt_read 3 49136 NULL nohasharray
121970 +netxen_setup_msi_interrupts_49136 netxen_setup_msi_interrupts 2 49136 &pt_read_49136
121971 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
121972 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
121973 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
121974 +__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
121975 +ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
121976 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
121977 +print_queue_49191 print_queue 0-4 49191 NULL
121978 +root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
121979 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
121980 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
121981 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
121982 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
121983 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
121984 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
121985 +ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
121986 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
121987 +viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
121988 +uio_read_49300 uio_read 3 49300 NULL
121989 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
121990 +SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
121991 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
121992 +srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
121993 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
121994 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
121995 +ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
121996 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
121997 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
121998 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
121999 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
122000 +__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
122001 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
122002 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
122003 +tipc_bclink_get_mtu_49483 tipc_bclink_get_mtu 0 49483 NULL
122004 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
122005 +iwl_dbgfs_disable_power_off_read_49517 iwl_dbgfs_disable_power_off_read 3 49517 NULL
122006 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
122007 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
122008 +smk_write_access_49561 smk_write_access 3 49561 NULL
122009 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
122010 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
122011 +readfifo_49583 readfifo 1 49583 NULL
122012 +tap_write_49595 tap_write 3 49595 NULL
122013 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
122014 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
122015 +heap_init_49617 heap_init 2 49617 NULL
122016 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
122017 +port_fops_read_49626 port_fops_read 3 49626 NULL
122018 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
122019 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
122020 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
122021 +__copy_from_user_nocheck_49699 __copy_from_user_nocheck 0-3 49699 NULL
122022 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
122023 +write_pool_49718 write_pool 3 49718 NULL
122024 +kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL nohasharray
122025 +sfw_create_test_rpc_49723 sfw_create_test_rpc 4 49723 &kvm_mmu_notifier_invalidate_page_49723
122026 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
122027 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
122028 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
122029 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
122030 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
122031 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
122032 +w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
122033 +ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
122034 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
122035 +__of_parse_phandle_with_args_49807 __of_parse_phandle_with_args 0 49807 NULL
122036 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
122037 +add_uuid_49831 add_uuid 4 49831 NULL
122038 +iraw_loop_49842 iraw_loop 0-1 49842 NULL
122039 +twl4030_write_49846 twl4030_write 2 49846 NULL
122040 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
122041 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
122042 +fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
122043 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
122044 +osc_brw_49896 osc_brw 4 49896 NULL
122045 +fuse_send_write_49915 fuse_send_write 4-0 49915 NULL
122046 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
122047 +drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
122048 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
122049 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
122050 +security_context_to_sid_50019 security_context_to_sid 2 50019 NULL
122051 +isdn_read_50021 isdn_read 3 50021 NULL
122052 +mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
122053 +xlog_recovery_process_trans_50028 xlog_recovery_process_trans 4 50028 NULL
122054 +brcmf_debugfs_chipinfo_read_50033 brcmf_debugfs_chipinfo_read 3 50033 NULL
122055 +ioread8_50049 ioread8 0 50049 NULL
122056 +fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
122057 +__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
122058 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
122059 +libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
122060 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
122061 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
122062 +android_set_cntry_50100 android_set_cntry 0 50100 NULL
122063 +read_file_slot_50111 read_file_slot 3 50111 NULL
122064 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
122065 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
122066 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
122067 +kmalloc_node_50163 kmalloc_node 1 50163 NULL
122068 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
122069 +ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
122070 +odev_update_50169 odev_update 2 50169 NULL
122071 +ubi_resize_volume_50172 ubi_resize_volume 2 50172 NULL nohasharray
122072 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 &ubi_resize_volume_50172
122073 +cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
122074 +cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
122075 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
122076 +l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
122077 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
122078 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
122079 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
122080 +soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
122081 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
122082 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
122083 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
122084 +do_launder_page_50329 do_launder_page 0 50329 NULL
122085 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
122086 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
122087 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 NULL
122088 +tpm_read_50344 tpm_read 3 50344 NULL
122089 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
122090 +iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 NULL
122091 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
122092 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
122093 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
122094 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
122095 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
122096 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
122097 +btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
122098 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
122099 +device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
122100 +cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
122101 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
122102 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
122103 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
122104 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
122105 +trigger_request_store_50548 trigger_request_store 4 50548 NULL
122106 +usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
122107 +fat_readpages_50582 fat_readpages 4 50582 NULL
122108 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
122109 +xillybus_write_50605 xillybus_write 3 50605 NULL
122110 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
122111 +sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
122112 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
122113 +ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
122114 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
122115 +prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL
122116 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
122117 +dev_mem_read_50706 dev_mem_read 3 50706 NULL
122118 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
122119 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
122120 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
122121 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
122122 +tpm_write_50798 tpm_write 3 50798 NULL
122123 +tun_do_read_50800 tun_do_read 4 50800 NULL
122124 +write_flush_50803 write_flush 3 50803 NULL
122125 +dvb_play_50814 dvb_play 3 50814 NULL
122126 +btrfs_stack_file_extent_disk_num_bytes_50825 btrfs_stack_file_extent_disk_num_bytes 0 50825 NULL
122127 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
122128 +SetArea_50835 SetArea 4 50835 NULL
122129 +nft_trans_alloc_50836 nft_trans_alloc 3 50836 NULL
122130 +videobuf_dma_init_user_50839 videobuf_dma_init_user 4-3 50839 NULL
122131 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
122132 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
122133 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
122134 +__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
122135 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
122136 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
122137 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
122138 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
122139 +show_device_status_50947 show_device_status 0 50947 NULL
122140 +irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
122141 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
122142 +sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
122143 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
122144 +of_modalias_node_50975 of_modalias_node 3 50975 NULL
122145 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
122146 +timeout_write_50991 timeout_write 3 50991 NULL
122147 +proc_write_51003 proc_write 3 51003 NULL
122148 +jbd2_journal_extend_51012 jbd2_journal_extend 2 51012 NULL
122149 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
122150 +fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL
122151 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
122152 +dump_midi_51040 dump_midi 3 51040 NULL
122153 +usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
122154 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
122155 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
122156 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
122157 +rsc_mgr_init_51067 rsc_mgr_init 3 51067 NULL
122158 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
122159 +__ipv4_tun_to_nlattr_51095 __ipv4_tun_to_nlattr 4 51095 NULL
122160 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
122161 +ti_recv_51110 ti_recv 3 51110 NULL
122162 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
122163 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
122164 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
122165 +i40evf_acquire_msix_vectors_51190 i40evf_acquire_msix_vectors 2 51190 NULL
122166 +iwl_dbgfs_bcast_filters_macs_read_51231 iwl_dbgfs_bcast_filters_macs_read 3 51231 NULL
122167 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
122168 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
122169 +drm_property_create_51239 drm_property_create 4 51239 NULL
122170 +st_read_51251 st_read 3 51251 NULL
122171 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
122172 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
122173 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
122174 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
122175 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
122176 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
122177 +init_map_ipmac_51317 init_map_ipmac 5 51317 NULL
122178 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
122179 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
122180 +smk_write_ptrace_51333 smk_write_ptrace 3 51333 NULL
122181 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL
122182 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
122183 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
122184 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
122185 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
122186 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
122187 +hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
122188 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
122189 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
122190 +vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
122191 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
122192 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
122193 +osc_brw_internal_51489 osc_brw_internal 5 51489 NULL
122194 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
122195 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
122196 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
122197 +batadv_tt_prepare_tvlv_local_data_51568 batadv_tt_prepare_tvlv_local_data 0 51568 NULL
122198 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
122199 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
122200 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
122201 +extent_fiemap_51621 extent_fiemap 3 51621 NULL
122202 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
122203 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
122204 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
122205 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
122206 +rtw_os_xmit_resource_alloc23a_51693 rtw_os_xmit_resource_alloc23a 3 51693 NULL
122207 +host_mapping_level_51696 host_mapping_level 0 51696 NULL
122208 +sel_write_access_51704 sel_write_access 3 51704 NULL
122209 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
122210 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
122211 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
122212 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
122213 +str_read_51731 str_read 4 51731 NULL
122214 +cm4040_read_51732 cm4040_read 3 51732 NULL
122215 +get_user_pages_fast_51751 get_user_pages_fast 0 51751 NULL
122216 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
122217 +if_write_51756 if_write 3 51756 NULL
122218 +ssd1307fb_alloc_array_51788 ssd1307fb_alloc_array 1 51788 NULL
122219 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
122220 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
122221 +ioread32_51847 ioread32 0 51847 NULL nohasharray
122222 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
122223 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
122224 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
122225 +bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
122226 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
122227 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
122228 +user_read_51881 user_read 3 51881 NULL
122229 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
122230 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL
122231 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
122232 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
122233 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
122234 +xfrm_alg_len_51940 xfrm_alg_len 0 51940 NULL
122235 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
122236 +get_clock_info_51952 get_clock_info 4 51952 NULL
122237 +snd_mask_min_51969 snd_mask_min 0 51969 NULL
122238 +get_zone_51981 get_zone 0-1 51981 NULL
122239 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
122240 +_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
122241 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
122242 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
122243 +rdmalt_52022 rdmalt 0 52022 NULL
122244 +override_release_52032 override_release 2 52032 NULL
122245 +end_port_52042 end_port 0 52042 NULL
122246 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
122247 +msnd_fifo_write_52052 msnd_fifo_write 0-3 52052 NULL
122248 +dvb_ringbuffer_avail_52057 dvb_ringbuffer_avail 0 52057 NULL
122249 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
122250 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
122251 +mxuport_process_read_urb_data_52072 mxuport_process_read_urb_data 3 52072 NULL
122252 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
122253 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
122254 +smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL
122255 +split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
122256 +retry_count_read_52129 retry_count_read 3 52129 NULL
122257 +gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
122258 +sub_alloc_52140 sub_alloc 0 52140 NULL
122259 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL
122260 +htable_size_52148 htable_size 0-1 52148 NULL
122261 +smk_write_load2_52155 smk_write_load2 3 52155 NULL
122262 +tipc_node_get_mtu_52157 tipc_node_get_mtu 0 52157 NULL
122263 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
122264 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
122265 +print_prefix_52176 print_prefix 0 52176 NULL
122266 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
122267 +reiserfs_posix_acl_from_disk_52191 reiserfs_posix_acl_from_disk 2 52191 NULL
122268 +f2fs_seek_block_52194 f2fs_seek_block 2 52194 NULL
122269 +vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
122270 +fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
122271 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
122272 +shrink_slab_52261 shrink_slab 2 52261 NULL
122273 +ext2_direct_IO_52270 ext2_direct_IO 4 52270 NULL
122274 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
122275 +handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
122276 +kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
122277 +read_file_reset_52310 read_file_reset 3 52310 NULL
122278 +ssd1307fb_write_52315 ssd1307fb_write 3 52315 NULL
122279 +request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
122280 +hwflags_read_52318 hwflags_read 3 52318 NULL
122281 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
122282 +hur_len_52339 hur_len 0 52339 NULL
122283 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
122284 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
122285 +iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
122286 +hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
122287 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
122288 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
122289 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
122290 +aer_inject_write_52399 aer_inject_write 3 52399 NULL
122291 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
122292 +hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
122293 +delay_status_52431 delay_status 5 52431 NULL
122294 +ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
122295 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
122296 +alauda_read_data_52452 alauda_read_data 3 52452 NULL
122297 +bt_alloc_52457 bt_alloc 2 52457 NULL
122298 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
122299 +usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
122300 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
122301 +fd_do_rw_52495 fd_do_rw 3 52495 NULL
122302 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
122303 +lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
122304 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
122305 +bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
122306 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
122307 +raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
122308 +SyS_vmsplice_52540 SyS_vmsplice 3 52540 NULL
122309 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
122310 +debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
122311 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
122312 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
122313 +ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
122314 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
122315 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
122316 +nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
122317 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
122318 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
122319 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
122320 +__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
122321 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
122322 +blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
122323 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
122324 +hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
122325 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
122326 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
122327 +nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
122328 +xenvif_write_io_ring_52802 xenvif_write_io_ring 3 52802 NULL
122329 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
122330 +lb_alloc_ep_req_52837 lb_alloc_ep_req 2 52837 NULL
122331 +mon_bin_get_event_52863 mon_bin_get_event 4-6 52863 NULL
122332 +twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
122333 +qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
122334 +twlreg_write_52880 twlreg_write 3 52880 NULL
122335 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
122336 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
122337 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
122338 +copy_from_iter_bvec_52912 copy_from_iter_bvec 0-2 52912 NULL
122339 +dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
122340 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
122341 +iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
122342 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
122343 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
122344 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
122345 +num_node_state_52989 num_node_state 0 52989 NULL
122346 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
122347 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
122348 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
122349 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
122350 +nv50_chan_create_53039 nv50_chan_create 5 53039 NULL
122351 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
122352 +fimc_get_alpha_mask_53057 fimc_get_alpha_mask 0 53057 NULL
122353 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
122354 +iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
122355 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
122356 +mic_virtio_copy_from_user_53107 mic_virtio_copy_from_user 3 53107 NULL
122357 +ath10k_mac_create_53118 ath10k_mac_create 1 53118 NULL
122358 +verity_status_53120 verity_status 5 53120 NULL
122359 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
122360 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
122361 +copy_user_segment_list_53150 copy_user_segment_list 2 53150 NULL
122362 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
122363 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
122364 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
122365 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
122366 +ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
122367 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
122368 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
122369 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
122370 +f2fs_fiemap_53310 f2fs_fiemap 4 53310 NULL
122371 +ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
122372 +find_nr_power_limit_53330 find_nr_power_limit 0 53330 NULL
122373 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
122374 +btree_keys_bytes_53348 btree_keys_bytes 0 53348 NULL
122375 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
122376 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
122377 +test_fw_misc_read_53384 test_fw_misc_read 3 53384 NULL
122378 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
122379 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
122380 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
122381 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
122382 +ima_write_template_field_data_53475 ima_write_template_field_data 2 53475 NULL nohasharray
122383 +create_trace_kprobe_53475 create_trace_kprobe 1 53475 &ima_write_template_field_data_53475
122384 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
122385 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
122386 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
122387 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
122388 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
122389 +check_acl_53512 check_acl 0 53512 NULL nohasharray
122390 +force_sc_support_write_53512 force_sc_support_write 3 53512 &check_acl_53512
122391 +nft_data_dump_53549 nft_data_dump 5 53549 NULL
122392 +SYSC_bind_53582 SYSC_bind 3 53582 NULL
122393 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
122394 +proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
122395 +pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
122396 +___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL nohasharray
122397 +wil_write_file_txmgmt_53626 wil_write_file_txmgmt 3 53626 &___alloc_bootmem_nopanic_53626
122398 +ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
122399 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
122400 +fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
122401 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
122402 +bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
122403 +igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 &bdev_logical_block_size_53690
122404 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
122405 +__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
122406 +wdm_write_53735 wdm_write 3 53735 NULL
122407 +lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL
122408 +wa_populate_buf_in_urb_53758 wa_populate_buf_in_urb 3-4 53758 NULL
122409 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
122410 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
122411 +qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
122412 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
122413 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
122414 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
122415 +setup_data_read_53822 setup_data_read 3 53822 NULL
122416 +btrfs_free_reserved_extent_53873 btrfs_free_reserved_extent 2 53873 NULL nohasharray
122417 +pms_read_53873 pms_read 3 53873 &btrfs_free_reserved_extent_53873
122418 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
122419 +SyS_setgroups_53900 SyS_setgroups 1 53900 NULL
122420 +batadv_tt_tvlv_ogm_handler_v1_53909 batadv_tt_tvlv_ogm_handler_v1 5 53909 NULL
122421 +azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
122422 +usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
122423 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
122424 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
122425 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
122426 +hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
122427 +snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
122428 +mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
122429 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
122430 +batadv_tt_update_orig_54049 batadv_tt_update_orig 6-4 54049 NULL
122431 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
122432 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
122433 +rproc_state_read_54057 rproc_state_read 3 54057 NULL
122434 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
122435 +altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
122436 +lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
122437 +__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
122438 +strn_len_54122 strn_len 0 54122 NULL
122439 +isku_receive_54130 isku_receive 4 54130 NULL
122440 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
122441 +irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
122442 +memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
122443 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
122444 +p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
122445 +do_sys_poll_54221 do_sys_poll 2 54221 NULL
122446 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
122447 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
122448 +mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
122449 +reada_add_block_54247 reada_add_block 2 54247 NULL
122450 +write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
122451 +xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
122452 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
122453 +audio_write_54261 audio_write 4 54261 NULL nohasharray
122454 +wusb_prf_54261 wusb_prf 7 54261 &audio_write_54261
122455 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
122456 +kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
122457 +sizeof_long_54276 sizeof_long 0 54276 NULL
122458 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
122459 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
122460 +reclaim_pages_54301 reclaim_pages 3 54301 NULL
122461 +sprintf_54306 sprintf 0 54306 NULL
122462 +path_setxattr_54308 path_setxattr 4 54308 NULL
122463 +bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
122464 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
122465 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
122466 +__get_free_pages_54352 __get_free_pages 0 54352 NULL
122467 +readlink_copy_54366 readlink_copy 2 54366 NULL
122468 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
122469 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 NULL nohasharray
122470 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 &intel_sdvo_write_cmd_54377
122471 +ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
122472 +snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
122473 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL nohasharray
122474 +hash_mac4_expire_54392 hash_mac4_expire 4 54392 &iwl_dbgfs_power_save_status_read_54392
122475 +ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
122476 +copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
122477 +sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
122478 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
122479 +l2cap_create_basic_pdu_54508 l2cap_create_basic_pdu 3 54508 NULL
122480 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
122481 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
122482 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
122483 +viacam_read_54526 viacam_read 3 54526 NULL
122484 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
122485 +setsockopt_54539 setsockopt 5 54539 NULL
122486 +lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
122487 +SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
122488 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
122489 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
122490 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
122491 +irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
122492 +port_fops_write_54627 port_fops_write 3 54627 NULL
122493 +tipc_send_stream_54648 tipc_send_stream 4 54648 NULL
122494 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
122495 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
122496 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
122497 +simple_alloc_urb_54661 simple_alloc_urb 3 54661 NULL
122498 +tdp_page_fault_54663 tdp_page_fault 2 54663 NULL
122499 +bus_add_device_54665 bus_add_device 0 54665 NULL
122500 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
122501 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
122502 +evm_read_key_54674 evm_read_key 3 54674 NULL
122503 +jfs_direct_IO_54687 jfs_direct_IO 4 54687 NULL
122504 +rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
122505 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
122506 +kzalloc_54740 kzalloc 1 54740 NULL
122507 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
122508 +lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
122509 +crystalhd_user_data_54754 crystalhd_user_data 3 54754 NULL
122510 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
122511 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
122512 +ldsem_atomic_update_54774 ldsem_atomic_update 1 54774 NULL
122513 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
122514 +nfsd_write_54809 nfsd_write 6 54809 NULL
122515 +ar9287_dump_modal_eeprom_54814 ar9287_dump_modal_eeprom 3-2 54814 NULL
122516 +kvzalloc_54815 kvzalloc 1 54815 NULL nohasharray
122517 +crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815 nohasharray
122518 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 &crypto_tfm_ctx_alignment_54815
122519 +generic_perform_write_54832 generic_perform_write 3 54832 NULL
122520 +write_rio_54837 write_rio 3 54837 NULL
122521 +ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
122522 +nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
122523 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
122524 +printer_read_54851 printer_read 3 54851 NULL
122525 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
122526 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
122527 +iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL nohasharray
122528 +kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
122529 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
122530 +bio_add_page_54933 bio_add_page 0-3 54933 NULL
122531 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
122532 +add_port_54941 add_port 2 54941 NULL
122533 +tipc_send2name_54946 tipc_send2name 5 54946 NULL
122534 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0-3 54949 NULL
122535 +alauda_write_data_54967 alauda_write_data 3 54967 NULL
122536 +c4_add_card_54968 c4_add_card 3 54968 NULL
122537 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
122538 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
122539 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
122540 +efw_transaction_55052 efw_transaction 5-7 55052 NULL
122541 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
122542 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
122543 +read_dma_55086 read_dma 3 55086 NULL
122544 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
122545 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
122546 +filldir_55137 filldir 3 55137 NULL
122547 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
122548 +npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
122549 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
122550 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
122551 +compat_SyS_ppoll_55196 compat_SyS_ppoll 2 55196 NULL
122552 +sched_feat_write_55202 sched_feat_write 3 55202 NULL
122553 +ht40allow_map_read_55209 ht40allow_map_read 3 55209 NULL
122554 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
122555 +mlx4_load_one_55213 mlx4_load_one 3 55213 NULL
122556 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
122557 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
122558 +nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
122559 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
122560 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
122561 +lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
122562 +persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
122563 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
122564 +lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
122565 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
122566 +wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
122567 +qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 NULL nohasharray
122568 +compat_SyS_process_vm_readv_55305 compat_SyS_process_vm_readv 3-5 55305 &qp_alloc_guest_work_55305
122569 +compat_SyS_mbind_55329 compat_SyS_mbind 5 55329 NULL
122570 +vme_user_read_55338 vme_user_read 3 55338 NULL
122571 +__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
122572 +sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
122573 +cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
122574 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
122575 +nouveau_cli_create_55425 nouveau_cli_create 3 55425 NULL
122576 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
122577 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
122578 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
122579 +ufshcd_exec_dev_cmd_55479 ufshcd_exec_dev_cmd 0 55479 NULL
122580 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
122581 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
122582 +batadv_tt_entries_55487 batadv_tt_entries 0-1 55487 NULL
122583 +ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 NULL
122584 +tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
122585 +ea_get_55522 ea_get 3-0 55522 NULL
122586 +buffer_size_55534 buffer_size 0 55534 NULL
122587 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
122588 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
122589 +hash_ipport6_expire_55549 hash_ipport6_expire 4 55549 NULL
122590 +dm_stats_list_55551 dm_stats_list 4 55551 NULL
122591 +compat_SyS_setsockopt_55581 compat_SyS_setsockopt 5 55581 NULL
122592 +add_partition_55588 add_partition 2 55588 NULL
122593 +kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
122594 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
122595 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
122596 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
122597 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
122598 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
122599 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
122600 +osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
122601 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
122602 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
122603 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
122604 +get_info_55681 get_info 3 55681 NULL
122605 +iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
122606 +ext4_alloc_file_blocks_55689 ext4_alloc_file_blocks 3 55689 NULL
122607 +genl_allocate_reserve_groups_55705 genl_allocate_reserve_groups 1 55705 NULL
122608 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
122609 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
122610 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
122611 +set_local_name_55757 set_local_name 4 55757 NULL
122612 +ethtool_copy_validate_indir_55769 ethtool_copy_validate_indir 4 55769 NULL
122613 +strlen_55778 strlen 0 55778 NULL
122614 +set_spte_55783 set_spte 4-5 55783 NULL
122615 +conf_read_55786 conf_read 3 55786 NULL nohasharray
122616 +req_bio_endio_55786 req_bio_endio 3 55786 &conf_read_55786
122617 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
122618 +sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
122619 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
122620 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
122621 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
122622 +hsc_write_55875 hsc_write 3 55875 NULL
122623 +ramdisk_store_55885 ramdisk_store 4 55885 NULL
122624 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
122625 +hash_ip4_expire_55911 hash_ip4_expire 4 55911 NULL
122626 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
122627 +kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
122628 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
122629 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
122630 +simple_read_from_buffer_55957 simple_read_from_buffer 5-2-0 55957 NULL
122631 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
122632 +btrfs_clone_55977 btrfs_clone 5-3-6 55977 NULL
122633 +wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 3-2 55992 NULL
122634 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
122635 +iwl_trans_read_prph_56052 iwl_trans_read_prph 0 56052 NULL
122636 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
122637 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
122638 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
122639 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
122640 +write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
122641 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
122642 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0-3 56194 NULL
122643 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
122644 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
122645 +ufshcd_query_descriptor_56236 ufshcd_query_descriptor 0 56236 NULL
122646 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
122647 +fd_copyin_56247 fd_copyin 3 56247 NULL
122648 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
122649 +acpi_ex_get_serial_access_length_56275 acpi_ex_get_serial_access_length 0-2 56275 NULL
122650 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
122651 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
122652 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
122653 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
122654 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
122655 +speakup_file_write_56310 speakup_file_write 3 56310 NULL
122656 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
122657 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
122658 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
122659 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
122660 +mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
122661 +iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
122662 +dev_read_56369 dev_read 3 56369 NULL
122663 +ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
122664 +lnet_ping_56378 lnet_ping 4 56378 NULL
122665 +write_gssp_56404 write_gssp 3 56404 NULL
122666 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
122667 +store_msg_56417 store_msg 3 56417 NULL
122668 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
122669 +l2cap_segment_le_sdu_56426 l2cap_segment_le_sdu 4 56426 NULL nohasharray
122670 +nvme_submit_cmd_56426 nvme_submit_cmd 0 56426 &l2cap_segment_le_sdu_56426
122671 +lprocfs_fid_space_seq_write_56431 lprocfs_fid_space_seq_write 3 56431 NULL nohasharray
122672 +ec_dbgfs_cmd_read_56431 ec_dbgfs_cmd_read 3 56431 &lprocfs_fid_space_seq_write_56431
122673 +fl_create_56435 fl_create 5 56435 NULL
122674 +gnttab_map_56439 gnttab_map 2 56439 NULL
122675 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
122676 +set_connectable_56458 set_connectable 4 56458 NULL
122677 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
122678 +putused_user_56467 putused_user 3 56467 NULL
122679 +ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 3-2 56468 NULL
122680 +lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
122681 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
122682 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
122683 +memblock_virt_alloc_56501 memblock_virt_alloc 1 56501 NULL
122684 +init_map_ip_56508 init_map_ip 5 56508 NULL
122685 +lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
122686 +cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
122687 +ip_options_get_56538 ip_options_get 4 56538 NULL
122688 +ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
122689 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
122690 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
122691 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
122692 +gro_pull_from_frag0_56593 gro_pull_from_frag0 2 56593 NULL
122693 +event_filter_write_56609 event_filter_write 3 56609 NULL
122694 +nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
122695 +gather_array_56641 gather_array 3 56641 NULL
122696 +lookup_extent_backref_56644 lookup_extent_backref 9 56644 NULL
122697 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
122698 +nv50_gpio_intr_mask_56665 nv50_gpio_intr_mask 4-3 56665 NULL
122699 +tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
122700 +snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL
122701 +dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
122702 +sfw_alloc_pages_56709 sfw_alloc_pages 3 56709 NULL
122703 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
122704 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
122705 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
122706 +__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
122707 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
122708 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
122709 +ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 NULL
122710 +ion_ioctl_56806 ion_ioctl 2 56806 NULL
122711 +do_syslog_56807 do_syslog 3 56807 NULL
122712 +mtdchar_write_56831 mtdchar_write 3 56831 NULL
122713 +snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
122714 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
122715 +gk20a_ram_get_56863 gk20a_ram_get 2 56863 NULL
122716 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
122717 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
122718 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
122719 +le_auto_conn_write_56895 le_auto_conn_write 3 56895 NULL nohasharray
122720 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 &le_auto_conn_write_56895
122721 +hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
122722 +strcspn_56913 strcspn 0 56913 NULL
122723 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
122724 +journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
122725 +nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
122726 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
122727 +sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
122728 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
122729 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
122730 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
122731 +ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
122732 +skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
122733 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
122734 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
122735 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
122736 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
122737 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
122738 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
122739 +altera_get_note_57099 altera_get_note 6 57099 NULL
122740 +hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
122741 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
122742 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
122743 +ima_show_htable_value_57136 ima_show_htable_value 2 57136 NULL nohasharray
122744 +rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136 nohasharray
122745 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 &rds_ib_sub_signaled_57136
122746 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
122747 +_iwl_dbgfs_bf_params_write_57141 _iwl_dbgfs_bf_params_write 3 57141 NULL
122748 +acpi_gsb_i2c_read_bytes_57145 acpi_gsb_i2c_read_bytes 4 57145 NULL
122749 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
122750 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
122751 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
122752 +hash_netnet6_expire_57191 hash_netnet6_expire 4 57191 NULL
122753 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
122754 +dma_fifo_alloc_57236 dma_fifo_alloc 2-3-5 57236 NULL
122755 +drbg_blocklen_57239 drbg_blocklen 0 57239 NULL
122756 +rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
122757 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
122758 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
122759 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
122760 +lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
122761 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
122762 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
122763 +string_length_no_trail_57290 string_length_no_trail 0-2 57290 NULL
122764 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
122765 +write_file_regval_57313 write_file_regval 3 57313 NULL
122766 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
122767 +usblp_read_57342 usblp_read 3 57342 NULL
122768 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
122769 +dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
122770 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
122771 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
122772 +bzImage64_load_57388 bzImage64_load 7 57388 NULL
122773 +read_file_blob_57406 read_file_blob 3 57406 NULL
122774 +enclosure_register_57412 enclosure_register 3 57412 NULL
122775 +read_file_eeprom_57428 read_file_eeprom 3 57428 NULL
122776 +compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
122777 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
122778 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
122779 +sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
122780 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL
122781 +read_file_skb_rx_57490 read_file_skb_rx 3 57490 NULL
122782 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
122783 +skb_headlen_57501 skb_headlen 0 57501 NULL
122784 +copy_in_user_57502 copy_in_user 3 57502 NULL
122785 +ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
122786 +init_tag_map_57515 init_tag_map 3 57515 NULL
122787 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
122788 +il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
122789 +cmm_read_57520 cmm_read 3 57520 NULL
122790 +inode_permission_57531 inode_permission 0 57531 NULL
122791 +acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
122792 +ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
122793 +compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
122794 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL
122795 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
122796 +get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
122797 +ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
122798 +il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
122799 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
122800 +copy_to_iter_bvec_57604 copy_to_iter_bvec 0-2 57604 NULL
122801 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
122802 +sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
122803 +mem_read_57631 mem_read 3 57631 NULL
122804 +r3964_write_57662 r3964_write 4 57662 NULL
122805 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
122806 +__lgwrite_57669 __lgwrite 4 57669 NULL
122807 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
122808 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
122809 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
122810 +pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 NULL
122811 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
122812 +SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
122813 +ld2_57794 ld2 0 57794 NULL
122814 +ivtv_read_57796 ivtv_read 3 57796 NULL
122815 +ion_test_ioctl_57799 ion_test_ioctl 2 57799 NULL
122816 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
122817 +copy_to_user_57835 copy_to_user 3-0 57835 NULL
122818 +flash_read_57843 flash_read 3 57843 NULL
122819 +kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
122820 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3 57879 NULL
122821 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
122822 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
122823 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
122824 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
122825 +mwifiex_hscfg_read_57920 mwifiex_hscfg_read 3 57920 NULL
122826 +twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
122827 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
122828 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
122829 +xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
122830 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
122831 +arch_gnttab_init_57948 arch_gnttab_init 2-1 57948 NULL
122832 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
122833 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
122834 +iov_iter_npages_57979 iov_iter_npages 0-2 57979 NULL
122835 +do_rx_dma_57996 do_rx_dma 5 57996 NULL
122836 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
122837 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
122838 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
122839 +mce_async_out_58056 mce_async_out 3 58056 NULL
122840 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
122841 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
122842 +cm4040_write_58079 cm4040_write 3 58079 NULL
122843 +savemem_58129 savemem 3 58129 NULL
122844 +ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
122845 +slhc_init_58135 slhc_init 1-2 58135 &ipv6_flowlabel_opt_58135
122846 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
122847 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
122848 +i40evf_allocate_virt_mem_d_58210 i40evf_allocate_virt_mem_d 3 58210 NULL
122849 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
122850 +read_file_debug_58256 read_file_debug 3 58256 NULL
122851 +osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
122852 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
122853 +profile_load_58267 profile_load 3 58267 NULL
122854 +kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
122855 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
122856 +r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL
122857 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
122858 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
122859 +mic_virtio_copy_from_user_58323 mic_virtio_copy_from_user 3 58323 NULL
122860 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
122861 +lstcon_rpc_prep_58325 lstcon_rpc_prep 4 58325 NULL
122862 +ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
122863 +__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
122864 +ec_i2c_parse_response_58347 ec_i2c_parse_response 0 58347 NULL
122865 +brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
122866 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
122867 +_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
122868 +kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL nohasharray
122869 +idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
122870 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
122871 +capabilities_read_58457 capabilities_read 3 58457 NULL
122872 +usnic_vnic_get_resources_58462 usnic_vnic_get_resources 3 58462 NULL
122873 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 NULL nohasharray
122874 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 &compat_do_ipt_set_ctl_58466
122875 +nv_rd08_58472 nv_rd08 0 58472 NULL
122876 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
122877 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
122878 +dw_spi_show_regs_58486 dw_spi_show_regs 3 58486 NULL
122879 +btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
122880 +tcf_hash_create_58507 tcf_hash_create 4 58507 NULL
122881 +cifs_write_from_iter_58526 cifs_write_from_iter 2 58526 NULL
122882 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
122883 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
122884 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
122885 +cur_wm_latency_write_58581 cur_wm_latency_write 3 58581 NULL
122886 +get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
122887 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
122888 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
122889 +xip_file_read_58592 xip_file_read 3 58592 NULL
122890 +ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
122891 +radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
122892 +btrfs_direct_IO_58608 btrfs_direct_IO 4 58608 NULL
122893 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
122894 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
122895 +iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
122896 +find_zero_58685 find_zero 0-1 58685 NULL
122897 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
122898 +tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
122899 +visor_charqueue_create_58703 visor_charqueue_create 1 58703 NULL
122900 +vx_send_msg_58711 vx_send_msg 0 58711 NULL
122901 +csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
122902 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
122903 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
122904 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
122905 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
122906 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
122907 +isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
122908 +ep_read_58813 ep_read 3 58813 NULL
122909 +command_write_58841 command_write 3 58841 NULL
122910 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
122911 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
122912 +esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
122913 +lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
122914 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
122915 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
122916 +wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
122917 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
122918 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
122919 +init_list_set_59005 init_list_set 3 59005 NULL
122920 +ep_write_59008 ep_write 3 59008 NULL
122921 +lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
122922 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
122923 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
122924 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
122925 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
122926 +regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
122927 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
122928 +sta_tx_latency_stat_table_59122 sta_tx_latency_stat_table 0-4-5 59122 NULL nohasharray
122929 +scsi_io_completion_59122 scsi_io_completion 2 59122 &sta_tx_latency_stat_table_59122
122930 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
122931 +framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
122932 +print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
122933 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
122934 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
122935 +ksize_59176 ksize 0 59176 NULL
122936 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
122937 +ocfs2_move_extent_59187 ocfs2_move_extent 2-5 59187 NULL
122938 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
122939 +check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
122940 +dt3155_read_59226 dt3155_read 3 59226 NULL
122941 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
122942 +nla_len_59258 nla_len 0 59258 NULL
122943 +drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
122944 +btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
122945 +fd_copyout_59323 fd_copyout 3 59323 NULL
122946 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
122947 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 NULL
122948 +__map_request_59350 __map_request 0 59350 NULL
122949 +SyS_getrandom_59366 SyS_getrandom 2 59366 NULL
122950 +f2fs_fallocate_59377 f2fs_fallocate 4-3 59377 NULL
122951 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
122952 +journal_init_dev_59384 journal_init_dev 5 59384 NULL
122953 +__net_get_random_once_59389 __net_get_random_once 2 59389 NULL
122954 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
122955 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
122956 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
122957 +fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
122958 +tipc_recv_stream_59456 tipc_recv_stream 4 59456 NULL
122959 +_iwl_dbgfs_bcast_filters_write_59491 _iwl_dbgfs_bcast_filters_write 3 59491 NULL
122960 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
122961 +C_SYSC_get_mempolicy_59516 C_SYSC_get_mempolicy 3 59516 NULL
122962 +mic_vringh_copy_59523 mic_vringh_copy 4 59523 NULL
122963 +msix_setup_entries_59545 msix_setup_entries 0 59545 NULL
122964 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
122965 +tunables_write_59563 tunables_write 3 59563 NULL
122966 +bio_split_59564 bio_split 2 59564 NULL
122967 +__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
122968 +write_pbl_59583 write_pbl 4 59583 NULL
122969 +memdup_user_59590 memdup_user 2 59590 NULL
122970 +mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
122971 +xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
122972 +ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
122973 +mtrr_write_59622 mtrr_write 3 59622 NULL
122974 +find_first_zero_bit_59636 find_first_zero_bit 0 59636 NULL
122975 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
122976 +hidraw_read_59650 hidraw_read 3 59650 NULL
122977 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
122978 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
122979 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
122980 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
122981 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
122982 +ioperm_get_59701 ioperm_get 4-3 59701 NULL
122983 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
122984 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL nohasharray
122985 +nv94_aux_mask_59740 nv94_aux_mask 2 59740 &ieee80211_if_read_fwded_unicast_59740
122986 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
122987 +strnlen_59746 strnlen 0 59746 NULL
122988 +ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
122989 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
122990 +venus_remove_59781 venus_remove 4 59781 NULL
122991 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
122992 +C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
122993 +ipw_write_59807 ipw_write 3 59807 NULL
122994 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
122995 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
122996 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
122997 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
122998 +biovec_create_pool_59878 biovec_create_pool 1 59878 NULL
122999 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
123000 +l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
123001 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
123002 +kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
123003 +ath10k_read_dfs_stats_59949 ath10k_read_dfs_stats 3 59949 NULL
123004 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 NULL nohasharray
123005 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 &dapm_widget_power_read_file_59950
123006 +il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
123007 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
123008 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
123009 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
123010 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
123011 +copy_items_60009 copy_items 7 60009 NULL
123012 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
123013 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
123014 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
123015 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
123016 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
123017 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
123018 +vcs_size_60050 vcs_size 0 60050 NULL
123019 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
123020 +compat_writev_60063 compat_writev 3 60063 NULL
123021 +ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
123022 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
123023 +usb_os_desc_prepare_interf_dir_60075 usb_os_desc_prepare_interf_dir 2 60075 NULL
123024 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
123025 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
123026 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
123027 +nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
123028 +pcpu_need_to_extend_60133 pcpu_need_to_extend 0 60133 NULL
123029 +__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
123030 +ld_usb_read_60156 ld_usb_read 3 60156 NULL
123031 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
123032 +init_state_60165 init_state 2 60165 NULL
123033 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 NULL nohasharray
123034 +sg_build_sgat_60179 sg_build_sgat 3 60179 &jffs2_alloc_full_dirent_60179
123035 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
123036 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL nohasharray
123037 +arch_setup_msi_irqs_60193 arch_setup_msi_irqs 0 60193 &rx_rx_tkip_replays_read_60193
123038 +qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
123039 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
123040 +irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 2-3 60264 NULL
123041 +display_crc_ctl_write_60273 display_crc_ctl_write 3 60273 NULL
123042 +printer_write_60276 printer_write 3 60276 NULL
123043 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
123044 +getDataLength_60301 getDataLength 0 60301 NULL
123045 +bch_subtract_dirty_60306 bch_subtract_dirty 3-4 60306 NULL
123046 +usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
123047 +__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
123048 +max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
123049 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
123050 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
123051 +ocfs2_zero_extend_60396 ocfs2_zero_extend 3 60396 NULL
123052 +driver_names_read_60399 driver_names_read 3 60399 NULL
123053 +simple_alloc_urb_60420 simple_alloc_urb 3 60420 NULL
123054 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
123055 +kmalloc_60432 kmalloc 1 60432 NULL nohasharray
123056 +tstats_write_60432 tstats_write 3 60432 &kmalloc_60432
123057 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
123058 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
123059 +lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
123060 +compat_SyS_get_mempolicy_60527 compat_SyS_get_mempolicy 3 60527 NULL
123061 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
123062 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
123063 +osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
123064 +xfs_vm_direct_IO_60557 xfs_vm_direct_IO 4 60557 NULL
123065 +tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
123066 +memblock_virt_alloc_try_nid_nopanic_60604 memblock_virt_alloc_try_nid_nopanic 1 60604 NULL
123067 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
123068 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
123069 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
123070 +__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
123071 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
123072 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
123073 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
123074 +raid_status_60755 raid_status 5 60755 NULL
123075 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
123076 +opticon_write_60775 opticon_write 4 60775 NULL
123077 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
123078 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
123079 +nvif_object_init_60848 nvif_object_init 6 60848 NULL
123080 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
123081 +alloc_buf_60864 alloc_buf 3-2 60864 NULL
123082 +generic_writepages_60871 generic_writepages 0 60871 NULL
123083 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
123084 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
123085 +libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
123086 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
123087 +submit_extent_page_60928 submit_extent_page 5 60928 NULL
123088 +pti_char_write_60960 pti_char_write 3 60960 NULL
123089 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
123090 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
123091 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
123092 +generic_file_direct_write_60995 generic_file_direct_write 0 60995 NULL
123093 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
123094 +graph_depth_write_61024 graph_depth_write 3 61024 NULL
123095 +sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
123096 +read_file_ackto_61037 read_file_ackto 3 61037 NULL
123097 +lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
123098 +symtab_init_61050 symtab_init 2 61050 NULL
123099 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
123100 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-2 61062 NULL
123101 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
123102 +get_derived_key_61100 get_derived_key 4 61100 NULL
123103 +i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-4-3-2-1 61104 NULL
123104 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
123105 +__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
123106 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
123107 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
123108 +pair_device_61175 pair_device 4 61175 NULL nohasharray
123109 +event_oom_late_read_61175 event_oom_late_read 3 61175 &pair_device_61175
123110 +dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
123111 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
123112 +srp_create_fr_pool_61207 srp_create_fr_pool 3 61207 NULL
123113 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
123114 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
123115 +v9fs_mmap_file_read_61262 v9fs_mmap_file_read 3 61262 NULL
123116 +kvm_age_hva_61267 kvm_age_hva 2-3 61267 NULL
123117 +find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
123118 +btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &find_get_pages_tag_61270 nohasharray
123119 +ifalias_store_61270 ifalias_store 4 61270 &btrfs_bio_alloc_61270
123120 +hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
123121 +vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
123122 +nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
123123 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
123124 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
123125 +C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
123126 +write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
123127 +st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
123128 +rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
123129 +__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-3-2 61342 NULL
123130 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
123131 +wil_write_file_recovery_61354 wil_write_file_recovery 3 61354 NULL
123132 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
123133 +system_enable_write_61396 system_enable_write 3 61396 NULL
123134 +xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
123135 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
123136 +snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
123137 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
123138 +erst_errno_61526 erst_errno 0 61526 NULL
123139 +proc_write_device_61541 proc_write_device 3 61541 NULL
123140 +compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
123141 +trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
123142 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
123143 +parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
123144 +fan_proc_write_61569 fan_proc_write 3 61569 NULL
123145 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
123146 +ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
123147 +seq_open_private_61589 seq_open_private 3 61589 NULL
123148 +ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-1-2 61591 NULL
123149 +netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
123150 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
123151 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
123152 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
123153 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
123154 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL nohasharray
123155 +tcf_hashinfo_init_61643 tcf_hashinfo_init 2 61643 &snd_pcm_oss_read3_61643
123156 +resize_stripes_61650 resize_stripes 2 61650 NULL
123157 +ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
123158 +insert_one_name_61668 insert_one_name 7 61668 NULL
123159 +qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
123160 +lock_loop_61681 lock_loop 1 61681 NULL
123161 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
123162 +filter_read_61692 filter_read 3 61692 NULL
123163 +SyS_kexec_file_load_61715 SyS_kexec_file_load 3 61715 NULL
123164 +iov_length_61716 iov_length 0 61716 NULL
123165 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
123166 +null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
123167 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
123168 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
123169 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
123170 +mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
123171 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
123172 +regcache_sync_block_61846 regcache_sync_block 5-4 61846 NULL
123173 +ath9k_hw_def_dump_eeprom_61853 ath9k_hw_def_dump_eeprom 5-4 61853 NULL
123174 +__skb_flow_dissect_61855 __skb_flow_dissect 5 61855 NULL
123175 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
123176 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
123177 +get_fw_name_61874 get_fw_name 3 61874 NULL
123178 +btrfs_ioctl_clone_61886 btrfs_ioctl_clone 3-4-5 61886 NULL
123179 +lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
123180 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
123181 +kernfs_name_61910 kernfs_name 3 61910 NULL
123182 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
123183 +au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
123184 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
123185 +efi_get_runtime_map_size_61927 efi_get_runtime_map_size 0 61927 NULL
123186 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
123187 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
123188 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
123189 +fix_read_error_61965 fix_read_error 4 61965 NULL
123190 +ocfs2_quota_write_61972 ocfs2_quota_write 4-5 61972 NULL
123191 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
123192 +cow_file_range_61979 cow_file_range 3 61979 NULL
123193 +dequeue_event_62000 dequeue_event 3 62000 NULL
123194 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
123195 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
123196 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
123197 +SYSC_select_62024 SYSC_select 1 62024 NULL
123198 +comedi_write_array_to_buffer_62032 comedi_write_array_to_buffer 3 62032 NULL
123199 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
123200 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
123201 +do_pselect_62061 do_pselect 1 62061 NULL
123202 +pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
123203 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
123204 +ip_recv_error_62117 ip_recv_error 3 62117 NULL
123205 +generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
123206 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
123207 +qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
123208 +kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
123209 +ql_status_62135 ql_status 5 62135 NULL nohasharray
123210 +device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
123211 +video_usercopy_62151 video_usercopy 2 62151 NULL
123212 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
123213 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
123214 +write_file_dfs_62180 write_file_dfs 3 62180 NULL
123215 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
123216 +rounded_hashtable_size_62198 rounded_hashtable_size 0 62198 NULL
123217 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
123218 +smk_read_syslog_62227 smk_read_syslog 3 62227 NULL
123219 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
123220 +ion_handle_test_dma_62262 ion_handle_test_dma 4-5 62262 NULL
123221 +get_random_int_62279 get_random_int 0 62279 NULL
123222 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
123223 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
123224 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
123225 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
123226 +subseq_list_62332 subseq_list 3-0 62332 NULL
123227 +ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
123228 +flash_write_62354 flash_write 3 62354 NULL
123229 +xfpregs_set_62363 xfpregs_set 4 62363 NULL
123230 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
123231 +altera_irscan_62396 altera_irscan 2 62396 NULL
123232 +set_ssp_62411 set_ssp 4 62411 NULL
123233 +tracing_saved_cmdlines_size_read_62491 tracing_saved_cmdlines_size_read 3 62491 NULL
123234 +srpc_alloc_bulk_62522 srpc_alloc_bulk 2 62522 NULL
123235 +pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
123236 +test_iso_queue_62534 test_iso_queue 5 62534 NULL
123237 +debugfs_read_62535 debugfs_read 3 62535 NULL
123238 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
123239 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
123240 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
123241 +compat_SyS_rt_sigpending_62580 compat_SyS_rt_sigpending 2 62580 NULL
123242 +get_subdir_62581 get_subdir 3 62581 NULL
123243 +dut_mode_write_62630 dut_mode_write 3 62630 NULL
123244 +vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
123245 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
123246 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
123247 +ieee80211_set_probe_resp_62700 ieee80211_set_probe_resp 3 62700 NULL
123248 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
123249 +gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
123250 +rdm_62719 rdm 0 62719 NULL
123251 +obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
123252 +key_replays_read_62746 key_replays_read 3 62746 NULL
123253 +lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
123254 +mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
123255 +mxt_obj_instances_62764 mxt_obj_instances 0 62764 NULL
123256 +copy_page_to_iter_iovec_62770 copy_page_to_iter_iovec 0-3 62770 NULL nohasharray
123257 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 &copy_page_to_iter_iovec_62770
123258 +C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
123259 +ptlrpc_req_set_repsize_62784 ptlrpc_req_set_repsize 2 62784 NULL
123260 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
123261 +dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
123262 +__add_action_62798 __add_action 4 62798 NULL
123263 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
123264 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
123265 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
123266 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
123267 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
123268 +l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
123269 +aoechr_write_62883 aoechr_write 3 62883 NULL
123270 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
123271 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
123272 +getdqbuf_62908 getdqbuf 1 62908 NULL
123273 +ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
123274 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
123275 +nvif_object_mthd_62960 nvif_object_mthd 4 62960 NULL
123276 +hwdep_read_62992 hwdep_read 3 62992 NULL
123277 +kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
123278 +__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
123279 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
123280 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
123281 +unlink1_63059 unlink1 3 63059 NULL
123282 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
123283 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
123284 +sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5 63087 NULL
123285 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
123286 +ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
123287 +iwl_mvm_coex_dump_mbox_63153 iwl_mvm_coex_dump_mbox 4-3-0 63153 NULL
123288 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
123289 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
123290 +vme_master_read_63221 vme_master_read 0 63221 NULL
123291 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
123292 +ptp_read_63251 ptp_read 4 63251 NULL
123293 +xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
123294 +iwl_dbgfs_fw_error_dump_read_63263 iwl_dbgfs_fw_error_dump_read 3 63263 NULL
123295 +raid5_resize_63306 raid5_resize 2 63306 NULL
123296 +nfsd_vfs_read_63307 nfsd_vfs_read 5 63307 NULL
123297 +ath10k_read_fw_dbglog_63323 ath10k_read_fw_dbglog 3 63323 NULL
123298 +proc_info_read_63344 proc_info_read 3 63344 NULL
123299 +nvif_device_new_63358 nvif_device_new 5 63358 NULL
123300 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
123301 +idmouse_read_63374 idmouse_read 3 63374 NULL
123302 +edac_pci_alloc_ctl_info_63388 edac_pci_alloc_ctl_info 1 63388 NULL nohasharray
123303 +usbnet_read_cmd_nopm_63388 usbnet_read_cmd_nopm 7 63388 &edac_pci_alloc_ctl_info_63388
123304 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
123305 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
123306 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
123307 +si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
123308 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
123309 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
123310 +read_kcore_63488 read_kcore 3 63488 NULL
123311 +iwl_dbgfs_bcast_filters_read_63489 iwl_dbgfs_bcast_filters_read 3 63489 NULL
123312 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
123313 +efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 4-5 63529 NULL
123314 +ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
123315 +write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
123316 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
123317 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
123318 +kvm_write_guest_page_63555 kvm_write_guest_page 5 63555 NULL
123319 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
123320 +write_debug_level_63613 write_debug_level 3 63613 NULL
123321 +__spi_validate_63618 __spi_validate 0 63618 NULL
123322 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
123323 +hid_report_len_63637 hid_report_len 0 63637 NULL
123324 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
123325 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
123326 +ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
123327 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
123328 +vbi_read_63673 vbi_read 3 63673 NULL
123329 +write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
123330 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
123331 +btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
123332 +ntb_debugfs_read_63728 ntb_debugfs_read 3 63728 NULL
123333 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
123334 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
123335 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
123336 +spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
123337 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
123338 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
123339 +C_SYSC_process_vm_readv_63811 C_SYSC_process_vm_readv 3-5 63811 NULL
123340 +regmap_multi_reg_write_63826 regmap_multi_reg_write 3 63826 NULL nohasharray
123341 +prepare_copy_63826 prepare_copy 2 63826 &regmap_multi_reg_write_63826
123342 +sel_write_load_63830 sel_write_load 3 63830 NULL
123343 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
123344 +nv10_gpio_intr_mask_63862 nv10_gpio_intr_mask 4-3 63862 NULL
123345 +xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
123346 +uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
123347 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
123348 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
123349 +__team_options_register_63941 __team_options_register 3 63941 NULL
123350 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
123351 +set_bredr_63975 set_bredr 4 63975 NULL
123352 +construct_key_and_link_63985 construct_key_and_link 3 63985 NULL
123353 +rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
123354 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
123355 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
123356 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
123357 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
123358 +nl80211_send_rx_assoc_64040 nl80211_send_rx_assoc 4 64040 NULL
123359 +__sock_create_64069 __sock_create 0 64069 NULL
123360 +get_u8_64076 get_u8 0 64076 NULL
123361 +xilly_malloc_64077 xilly_malloc 2 64077 NULL
123362 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
123363 +vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
123364 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
123365 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
123366 +to_bytes_64103 to_bytes 0-1 64103 NULL
123367 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
123368 +rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
123369 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
123370 +bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
123371 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
123372 +init_bch_64130 init_bch 1-2 64130 NULL
123373 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
123374 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
123375 +number_of_tds_64156 number_of_tds 0 64156 NULL
123376 +bnx2x_vf_mcast_64166 bnx2x_vf_mcast 4 64166 NULL
123377 +cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
123378 +kernfs_iop_setxattr_64220 kernfs_iop_setxattr 4 64220 NULL
123379 +read_pulse_64227 read_pulse 0-3 64227 NULL
123380 +ea_len_64229 ea_len 0 64229 NULL
123381 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
123382 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL nohasharray
123383 +bpf_check_classic_64278 bpf_check_classic 2 64278 &btrfs_file_extent_offset_64278
123384 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
123385 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 NULL nohasharray
123386 +event_id_read_64288 event_id_read 3 64288 &xfs_dir_cilookup_result_64288
123387 +info_debugfs_read_64291 info_debugfs_read 3 64291 NULL
123388 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
123389 +snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
123390 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
123391 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
123392 +ts_write_64336 ts_write 3 64336 NULL
123393 +usbtmc_write_64340 usbtmc_write 3 64340 NULL
123394 +qlcnic_82xx_calculate_msix_vector_64354 qlcnic_82xx_calculate_msix_vector 0 64354 NULL
123395 +user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
123396 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
123397 +reg_create_64372 reg_create 5 64372 NULL nohasharray
123398 +bnx2_enable_msix_64372 bnx2_enable_msix 2 64372 &reg_create_64372
123399 +ilo_write_64378 ilo_write 3 64378 NULL
123400 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
123401 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
123402 +nilfs_alloc_seg_bio_64383 nilfs_alloc_seg_bio 3 64383 NULL
123403 +ir_lirc_transmit_ir_64403 ir_lirc_transmit_ir 3 64403 NULL
123404 +pidlist_allocate_64404 pidlist_allocate 1 64404 NULL
123405 +rx_hdr_overflow_read_64407 rx_hdr_overflow_read 3 64407 NULL
123406 +keyctl_get_security_64418 keyctl_get_security 3 64418 NULL
123407 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
123408 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 NULL
123409 +ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
123410 +single_open_size_64483 single_open_size 4 64483 NULL
123411 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
123412 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
123413 +remove_uuid_64505 remove_uuid 4 64505 NULL
123414 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
123415 +iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
123416 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
123417 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
123418 +SyS_bind_64544 SyS_bind 3 64544 NULL
123419 +rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
123420 +__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3 64557 NULL
123421 +ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 NULL nohasharray
123422 +__spi_sync_64561 __spi_sync 0 64561 &ll_max_rw_chunk_seq_write_64561
123423 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
123424 +kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
123425 +do_erase_64574 do_erase 4 64574 NULL
123426 +fanotify_write_64623 fanotify_write 3 64623 NULL
123427 +_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3 64642 NULL
123428 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
123429 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
123430 +tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
123431 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
123432 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
123433 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
123434 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
123435 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
123436 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
123437 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
123438 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
123439 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
123440 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
123441 +hwdep_write_64776 hwdep_write 3 64776 NULL
123442 +message_for_md_64777 message_for_md 5 64777 NULL
123443 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
123444 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
123445 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
123446 +rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL nohasharray
123447 +nv_mask_64808 nv_mask 0 64808 &rfkill_fop_write_64808
123448 +proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
123449 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
123450 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
123451 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
123452 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
123453 +pci_vc_do_save_buffer_64876 pci_vc_do_save_buffer 0 64876 NULL
123454 +lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
123455 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
123456 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL nohasharray
123457 +tipc_port_iovec_reject_64958 tipc_port_iovec_reject 4 64958 &ip_options_get_from_user_64958
123458 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
123459 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
123460 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
123461 +insert_dent_65034 insert_dent 7 65034 NULL
123462 +snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
123463 +ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
123464 +pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
123465 +__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
123466 +batadv_socket_write_65083 batadv_socket_write 3 65083 NULL
123467 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
123468 +ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0-3 65090 NULL
123469 +usbtest_alloc_urb_65115 usbtest_alloc_urb 3-5 65115 NULL
123470 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
123471 +nouveau_event_create_65229 nouveau_event_create 2-1 65229 NULL
123472 +print_endpoint_stat_65232 print_endpoint_stat 0-4-3 65232 NULL
123473 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
123474 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
123475 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
123476 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
123477 +fat_direct_IO_65295 fat_direct_IO 4 65295 NULL
123478 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
123479 +get_var_len_65304 get_var_len 0 65304 NULL
123480 +unpack_array_65318 unpack_array 0 65318 NULL
123481 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
123482 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
123483 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
123484 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
123485 +SyS_writev_65372 SyS_writev 3 65372 NULL
123486 +__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
123487 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
123488 +__read_vmcore_65402 __read_vmcore 2 65402 NULL
123489 +ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
123490 +device_add_groups_65423 device_add_groups 0 65423 NULL
123491 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
123492 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
123493 +il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
123494 +clear_user_65470 clear_user 2 65470 NULL
123495 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
123496 +lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9 65493 NULL
123497 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
123498 +tree_mod_log_eb_copy_65535 tree_mod_log_eb_copy 6 65535 NULL
123499 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123500 new file mode 100644
123501 index 0000000..560cd7b
123502 --- /dev/null
123503 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash_aux.data
123504 @@ -0,0 +1,92 @@
123505 +spa_set_aux_vdevs_746 spa_set_aux_vdevs 3 746 NULL
123506 +zfs_lookup_2144 zfs_lookup 0 2144 NULL
123507 +mappedread_2627 mappedread 2 2627 NULL
123508 +vdev_disk_dio_alloc_2957 vdev_disk_dio_alloc 1 2957 NULL
123509 +nv_alloc_pushpage_spl_4286 nv_alloc_pushpage_spl 2 4286 NULL
123510 +zpl_xattr_get_4574 zpl_xattr_get 0 4574 NULL
123511 +sa_replace_all_by_template_5699 sa_replace_all_by_template 3 5699 NULL
123512 +dmu_write_6048 dmu_write 4-3 6048 NULL
123513 +dmu_buf_hold_array_6095 dmu_buf_hold_array 4-3 6095 NULL
123514 +update_pages_6225 update_pages 2-3 6225 NULL
123515 +bio_nr_pages_7117 bio_nr_pages 0-2 7117 NULL
123516 +dmu_buf_hold_array_by_bonus_8562 dmu_buf_hold_array_by_bonus 3-2 8562 NULL
123517 +zpios_dmu_write_8858 zpios_dmu_write 4-5 8858 NULL
123518 +ddi_copyout_9401 ddi_copyout 3 9401 NULL
123519 +avl_numnodes_12384 avl_numnodes 0 12384 NULL
123520 +dmu_write_uio_dnode_12473 dmu_write_uio_dnode 3 12473 NULL
123521 +dmu_xuio_init_12866 dmu_xuio_init 2 12866 NULL
123522 +zpl_read_common_14389 zpl_read_common 0 14389 NULL
123523 +dmu_snapshot_realname_14632 dmu_snapshot_realname 4 14632 NULL
123524 +kmem_alloc_debug_14852 kmem_alloc_debug 1 14852 NULL
123525 +kmalloc_node_nofail_15151 kmalloc_node_nofail 1 15151 NULL
123526 +dmu_write_uio_16351 dmu_write_uio 4 16351 NULL
123527 +zfs_log_write_16524 zfs_log_write 6-5 16524 NULL
123528 +sa_build_layouts_16910 sa_build_layouts 3 16910 NULL
123529 +dsl_dir_namelen_17053 dsl_dir_namelen 0 17053 NULL
123530 +kcopy_copy_to_user_17336 kcopy_copy_to_user 5 17336 NULL
123531 +sa_add_layout_entry_17507 sa_add_layout_entry 3 17507 NULL
123532 +sa_attr_table_setup_18029 sa_attr_table_setup 3 18029 NULL
123533 +uiocopy_18680 uiocopy 2 18680 NULL
123534 +dmu_buf_hold_array_by_dnode_19125 dmu_buf_hold_array_by_dnode 2-3 19125 NULL
123535 +zpl_acl_from_xattr_21141 zpl_acl_from_xattr 2 21141 NULL
123536 +dsl_pool_tx_assign_init_22518 dsl_pool_tx_assign_init 2 22518 NULL
123537 +nvlist_lookup_byte_array_22527 nvlist_lookup_byte_array 0 22527 NULL
123538 +sa_replace_all_by_template_locked_22533 sa_replace_all_by_template_locked 3 22533 NULL
123539 +tsd_hash_table_init_22559 tsd_hash_table_init 1 22559 NULL
123540 +spa_vdev_remove_aux_23966 spa_vdev_remove_aux 4 23966 NULL
123541 +zpl_xattr_acl_set_access_24129 zpl_xattr_acl_set_access 4 24129 NULL
123542 +dmu_assign_arcbuf_24622 dmu_assign_arcbuf 2 24622 NULL
123543 +zap_lookup_norm_25166 zap_lookup_norm 9 25166 NULL
123544 +dmu_prealloc_25456 dmu_prealloc 4-3 25456 NULL
123545 +kmalloc_nofail_26347 kmalloc_nofail 1 26347 NULL
123546 +zfsctl_snapshot_zpath_27578 zfsctl_snapshot_zpath 2 27578 NULL
123547 +zpios_dmu_read_30015 zpios_dmu_read 4-5 30015 NULL
123548 +splat_write_30943 splat_write 3 30943 NULL
123549 +zpl_xattr_get_sa_31183 zpl_xattr_get_sa 0 31183 NULL
123550 +dmu_read_uio_31467 dmu_read_uio 4 31467 NULL
123551 +zfs_replay_fuids_31479 zfs_replay_fuids 4 31479 NULL
123552 +spa_history_log_to_phys_31632 spa_history_log_to_phys 0-1 31632 NULL
123553 +__zpl_xattr_get_32601 __zpl_xattr_get 0 32601 NULL
123554 +proc_copyout_string_34049 proc_copyout_string 2 34049 NULL
123555 +nv_alloc_sleep_spl_34544 nv_alloc_sleep_spl 2 34544 NULL
123556 +nv_alloc_nosleep_spl_34761 nv_alloc_nosleep_spl 2 34761 NULL
123557 +zap_leaf_array_match_36922 zap_leaf_array_match 4 36922 NULL
123558 +copyinstr_36980 copyinstr 3 36980 NULL
123559 +zpl_xattr_acl_set_default_37864 zpl_xattr_acl_set_default 4 37864 NULL
123560 +splat_read_38116 splat_read 3 38116 NULL
123561 +sa_setup_38756 sa_setup 4 38756 NULL
123562 +vdev_disk_physio_39898 vdev_disk_physio 3 39898 NULL
123563 +arc_buf_size_39982 arc_buf_size 0 39982 NULL
123564 +kzalloc_nofail_40719 kzalloc_nofail 1 40719 NULL
123565 +fuidstr_to_sid_40777 fuidstr_to_sid 4 40777 NULL
123566 +vdev_raidz_matrix_reconstruct_40852 vdev_raidz_matrix_reconstruct 2-3 40852 NULL
123567 +sa_find_layout_40892 sa_find_layout 4 40892 NULL
123568 +zpl_xattr_get_dir_41918 zpl_xattr_get_dir 0 41918 NULL
123569 +zfs_sa_get_xattr_42600 zfs_sa_get_xattr 0 42600 NULL
123570 +zpl_xattr_acl_set_42808 zpl_xattr_acl_set 4 42808 NULL
123571 +xdr_dec_array_43091 xdr_dec_array 5 43091 NULL
123572 +dsl_dataset_namelen_43136 dsl_dataset_namelen 0 43136 NULL
123573 +kcopy_write_43683 kcopy_write 3 43683 NULL
123574 +uiomove_44355 uiomove 2 44355 NULL
123575 +dmu_read_44418 dmu_read 4-3 44418 NULL
123576 +ddi_copyin_44846 ddi_copyin 3 44846 NULL
123577 +kcopy_do_get_45061 kcopy_do_get 5 45061 NULL
123578 +copyin_45945 copyin 3 45945 NULL
123579 +zil_itx_create_46555 zil_itx_create 2 46555 NULL
123580 +dmu_write_uio_dbuf_48064 dmu_write_uio_dbuf 3 48064 NULL
123581 +blk_rq_pos_48233 blk_rq_pos 0 48233 NULL
123582 +spa_history_write_49650 spa_history_write 3 49650 NULL
123583 +kcopy_copy_pages_to_user_49823 kcopy_copy_pages_to_user 3-4 49823 NULL
123584 +zfs_log_write_50162 zfs_log_write 6-5 50162 NULL
123585 +i_fm_alloc_51038 i_fm_alloc 2 51038 NULL
123586 +copyout_51409 copyout 3 51409 NULL
123587 +zvol_log_write_54898 zvol_log_write 4-3 54898 NULL
123588 +zfs_acl_node_alloc_55641 zfs_acl_node_alloc 1 55641 NULL
123589 +get_nvlist_56685 get_nvlist 2 56685 NULL
123590 +zprop_get_numprops_56820 zprop_get_numprops 0 56820 NULL
123591 +splat_taskq_test4_common_59829 splat_taskq_test4_common 5 59829 NULL
123592 +zfs_replay_domain_cnt_61399 zfs_replay_domain_cnt 0 61399 NULL
123593 +zpios_write_61823 zpios_write 3 61823 NULL
123594 +proc_copyin_string_62019 proc_copyin_string 4 62019 NULL
123595 +random_get_pseudo_bytes_64611 random_get_pseudo_bytes 2 64611 NULL
123596 +zpios_read_64734 zpios_read 3 64734 NULL
123597 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123598 new file mode 100644
123599 index 0000000..95f7abd
123600 --- /dev/null
123601 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin.c
123602 @@ -0,0 +1,259 @@
123603 +/*
123604 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123605 + * Licensed under the GPL v2, or (at your option) v3
123606 + *
123607 + * Homepage:
123608 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123609 + *
123610 + * Documentation:
123611 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123612 + *
123613 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123614 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123615 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123616 + *
123617 + * Usage:
123618 + * $ make
123619 + * $ make run
123620 + */
123621 +
123622 +#include "gcc-common.h"
123623 +#include "size_overflow.h"
123624 +
123625 +int plugin_is_GPL_compatible;
123626 +
123627 +tree report_size_overflow_decl;
123628 +
123629 +tree size_overflow_type_HI;
123630 +tree size_overflow_type_SI;
123631 +tree size_overflow_type_DI;
123632 +tree size_overflow_type_TI;
123633 +
123634 +static struct plugin_info size_overflow_plugin_info = {
123635 + .version = "20140725",
123636 + .help = "no-size-overflow\tturn off size overflow checking\n",
123637 +};
123638 +
123639 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123640 +{
123641 + unsigned int arg_count;
123642 + enum tree_code code = TREE_CODE(*node);
123643 +
123644 + switch (code) {
123645 + case FUNCTION_DECL:
123646 + arg_count = type_num_arguments(TREE_TYPE(*node));
123647 + break;
123648 + case FUNCTION_TYPE:
123649 + case METHOD_TYPE:
123650 + arg_count = type_num_arguments(*node);
123651 + break;
123652 + default:
123653 + *no_add_attrs = true;
123654 + error("%s: %qE attribute only applies to functions", __func__, name);
123655 + return NULL_TREE;
123656 + }
123657 +
123658 + for (; args; args = TREE_CHAIN(args)) {
123659 + tree position = TREE_VALUE(args);
123660 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123661 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123662 + *no_add_attrs = true;
123663 + }
123664 + }
123665 + return NULL_TREE;
123666 +}
123667 +
123668 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
123669 +{
123670 + unsigned int arg_count;
123671 + enum tree_code code = TREE_CODE(*node);
123672 +
123673 + switch (code) {
123674 + case FUNCTION_DECL:
123675 + arg_count = type_num_arguments(TREE_TYPE(*node));
123676 + break;
123677 + case FUNCTION_TYPE:
123678 + case METHOD_TYPE:
123679 + arg_count = type_num_arguments(*node);
123680 + break;
123681 + case FIELD_DECL:
123682 + return NULL_TREE;
123683 + default:
123684 + *no_add_attrs = true;
123685 + error("%qE attribute only applies to functions", name);
123686 + return NULL_TREE;
123687 + }
123688 +
123689 + if (TREE_INT_CST_HIGH(TREE_VALUE(args)) != 0)
123690 + return NULL_TREE;
123691 +
123692 + for (; args; args = TREE_CHAIN(args)) {
123693 + tree position = TREE_VALUE(args);
123694 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_LOW(position) > arg_count ) {
123695 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
123696 + *no_add_attrs = true;
123697 + }
123698 + }
123699 + return NULL_TREE;
123700 +}
123701 +
123702 +static struct attribute_spec size_overflow_attr = {
123703 + .name = "size_overflow",
123704 + .min_length = 1,
123705 + .max_length = -1,
123706 + .decl_required = true,
123707 + .type_required = false,
123708 + .function_type_required = false,
123709 + .handler = handle_size_overflow_attribute,
123710 +#if BUILDING_GCC_VERSION >= 4007
123711 + .affects_type_identity = false
123712 +#endif
123713 +};
123714 +
123715 +static struct attribute_spec intentional_overflow_attr = {
123716 + .name = "intentional_overflow",
123717 + .min_length = 1,
123718 + .max_length = -1,
123719 + .decl_required = true,
123720 + .type_required = false,
123721 + .function_type_required = false,
123722 + .handler = handle_intentional_overflow_attribute,
123723 +#if BUILDING_GCC_VERSION >= 4007
123724 + .affects_type_identity = false
123725 +#endif
123726 +};
123727 +
123728 +static void register_attributes(void __unused *event_data, void __unused *data)
123729 +{
123730 + register_attribute(&size_overflow_attr);
123731 + register_attribute(&intentional_overflow_attr);
123732 +}
123733 +
123734 +static tree create_typedef(tree type, const char* ident)
123735 +{
123736 + tree new_type, decl;
123737 +
123738 + new_type = build_variant_type_copy(type);
123739 + decl = build_decl(BUILTINS_LOCATION, TYPE_DECL, get_identifier(ident), new_type);
123740 + DECL_ORIGINAL_TYPE(decl) = type;
123741 + TYPE_NAME(new_type) = decl;
123742 + return new_type;
123743 +}
123744 +
123745 +// Create the noreturn report_size_overflow() function decl.
123746 +static void size_overflow_start_unit(void __unused *gcc_data, void __unused *user_data)
123747 +{
123748 + tree const_char_ptr_type_node;
123749 + tree fntype;
123750 +
123751 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
123752 +
123753 + size_overflow_type_HI = create_typedef(intHI_type_node, "size_overflow_type_HI");
123754 + size_overflow_type_SI = create_typedef(intSI_type_node, "size_overflow_type_SI");
123755 + size_overflow_type_DI = create_typedef(intDI_type_node, "size_overflow_type_DI");
123756 + size_overflow_type_TI = create_typedef(intTI_type_node, "size_overflow_type_TI");
123757 +
123758 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
123759 + fntype = build_function_type_list(void_type_node,
123760 + const_char_ptr_type_node,
123761 + unsigned_type_node,
123762 + const_char_ptr_type_node,
123763 + const_char_ptr_type_node,
123764 + NULL_TREE);
123765 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
123766 +
123767 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
123768 + TREE_PUBLIC(report_size_overflow_decl) = 1;
123769 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
123770 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
123771 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
123772 +}
123773 +
123774 +
123775 +extern struct gimple_opt_pass pass_dce;
123776 +
123777 +static struct opt_pass *make_dce_pass(void)
123778 +{
123779 +#if BUILDING_GCC_VERSION >= 4009
123780 + return make_pass_dce(g);
123781 +#else
123782 + return &pass_dce.pass;
123783 +#endif
123784 +}
123785 +
123786 +
123787 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
123788 +{
123789 + int i;
123790 + const char * const plugin_name = plugin_info->base_name;
123791 + const int argc = plugin_info->argc;
123792 + const struct plugin_argument * const argv = plugin_info->argv;
123793 + bool enable = true;
123794 + struct register_pass_info insert_size_overflow_asm_pass_info;
123795 + struct register_pass_info __unused dump_before_pass_info;
123796 + struct register_pass_info __unused dump_after_pass_info;
123797 + struct register_pass_info insert_size_overflow_check_info;
123798 + struct register_pass_info dce_pass_info;
123799 + static const struct ggc_root_tab gt_ggc_r_gt_size_overflow[] = {
123800 + {
123801 + .base = &report_size_overflow_decl,
123802 + .nelt = 1,
123803 + .stride = sizeof(report_size_overflow_decl),
123804 + .cb = &gt_ggc_mx_tree_node,
123805 + .pchw = &gt_pch_nx_tree_node
123806 + },
123807 + LAST_GGC_ROOT_TAB
123808 + };
123809 +
123810 + insert_size_overflow_asm_pass_info.pass = make_insert_size_overflow_asm_pass();
123811 + insert_size_overflow_asm_pass_info.reference_pass_name = "ssa";
123812 + insert_size_overflow_asm_pass_info.ref_pass_instance_number = 1;
123813 + insert_size_overflow_asm_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123814 +
123815 + dump_before_pass_info.pass = make_dump_pass();
123816 + dump_before_pass_info.reference_pass_name = "increase_alignment";
123817 + dump_before_pass_info.ref_pass_instance_number = 1;
123818 + dump_before_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123819 +
123820 + insert_size_overflow_check_info.pass = make_insert_size_overflow_check();
123821 + insert_size_overflow_check_info.reference_pass_name = "increase_alignment";
123822 + insert_size_overflow_check_info.ref_pass_instance_number = 1;
123823 + insert_size_overflow_check_info.pos_op = PASS_POS_INSERT_BEFORE;
123824 +
123825 + dump_after_pass_info.pass = make_dump_pass();
123826 + dump_after_pass_info.reference_pass_name = "increase_alignment";
123827 + dump_after_pass_info.ref_pass_instance_number = 1;
123828 + dump_after_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
123829 +
123830 + dce_pass_info.pass = make_dce_pass();
123831 + dce_pass_info.reference_pass_name = "vrp";
123832 + dce_pass_info.ref_pass_instance_number = 1;
123833 + dce_pass_info.pos_op = PASS_POS_INSERT_AFTER;
123834 +
123835 + if (!plugin_default_version_check(version, &gcc_version)) {
123836 + error(G_("incompatible gcc/plugin versions"));
123837 + return 1;
123838 + }
123839 +
123840 + for (i = 0; i < argc; ++i) {
123841 + if (!strcmp(argv[i].key, "no-size-overflow")) {
123842 + enable = false;
123843 + continue;
123844 + }
123845 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
123846 + }
123847 +
123848 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
123849 + if (enable) {
123850 + register_callback(plugin_name, PLUGIN_START_UNIT, &size_overflow_start_unit, NULL);
123851 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_size_overflow);
123852 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
123853 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
123854 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_check_info);
123855 +// register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
123856 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dce_pass_info);
123857 + }
123858 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
123859 +
123860 + return 0;
123861 +}
123862 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123863 new file mode 100644
123864 index 0000000..0888f6c
123865 --- /dev/null
123866 +++ b/tools/gcc/size_overflow_plugin/size_overflow_plugin_hash.c
123867 @@ -0,0 +1,364 @@
123868 +/*
123869 + * Copyright 2011-2014 by Emese Revfy <re.emese@gmail.com>
123870 + * Licensed under the GPL v2, or (at your option) v3
123871 + *
123872 + * Homepage:
123873 + * http://www.grsecurity.net/~ephox/overflow_plugin/
123874 + *
123875 + * Documentation:
123876 + * http://forums.grsecurity.net/viewtopic.php?f=7&t=3043
123877 + *
123878 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
123879 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
123880 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
123881 + *
123882 + * Usage:
123883 + * $ make
123884 + * $ make run
123885 + */
123886 +
123887 +#include "gcc-common.h"
123888 +#include "size_overflow.h"
123889 +
123890 +#include "size_overflow_hash.h"
123891 +#include "size_overflow_hash_aux.h"
123892 +
123893 +#define CODES_LIMIT 32
123894 +
123895 +static unsigned char get_tree_code(const_tree type)
123896 +{
123897 + switch (TREE_CODE(type)) {
123898 + case ARRAY_TYPE:
123899 + return 0;
123900 + case BOOLEAN_TYPE:
123901 + return 1;
123902 + case ENUMERAL_TYPE:
123903 + return 2;
123904 + case FUNCTION_TYPE:
123905 + return 3;
123906 + case INTEGER_TYPE:
123907 + return 4;
123908 + case POINTER_TYPE:
123909 + return 5;
123910 + case RECORD_TYPE:
123911 + return 6;
123912 + case UNION_TYPE:
123913 + return 7;
123914 + case VOID_TYPE:
123915 + return 8;
123916 + case REAL_TYPE:
123917 + return 9;
123918 + case VECTOR_TYPE:
123919 + return 10;
123920 + case REFERENCE_TYPE:
123921 + return 11;
123922 + case OFFSET_TYPE:
123923 + return 12;
123924 + case COMPLEX_TYPE:
123925 + return 13;
123926 + default:
123927 + debug_tree((tree)type);
123928 + gcc_unreachable();
123929 + }
123930 +}
123931 +
123932 +struct function_hash {
123933 + size_t tree_codes_len;
123934 + unsigned char tree_codes[CODES_LIMIT];
123935 + const_tree fndecl;
123936 + unsigned int hash;
123937 +};
123938 +
123939 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
123940 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
123941 +{
123942 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
123943 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
123944 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
123945 +
123946 + unsigned int m = 0x57559429;
123947 + unsigned int n = 0x5052acdb;
123948 + const unsigned int *key4 = (const unsigned int *)key;
123949 + unsigned int h = len;
123950 + unsigned int k = len + seed + n;
123951 + unsigned long long p;
123952 +
123953 + while (len >= 8) {
123954 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
123955 + len -= 8;
123956 + }
123957 + if (len >= 4) {
123958 + cwmixb(key4[0]) key4 += 1;
123959 + len -= 4;
123960 + }
123961 + if (len)
123962 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
123963 + cwmixb(h ^ (k + n));
123964 + return k ^ h;
123965 +
123966 +#undef cwfold
123967 +#undef cwmixa
123968 +#undef cwmixb
123969 +}
123970 +
123971 +static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
123972 +{
123973 + unsigned int fn, codes, seed = 0;
123974 +
123975 + fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
123976 + codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
123977 +
123978 + fn_hash_data->hash = fn ^ codes;
123979 +}
123980 +
123981 +static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
123982 +{
123983 + gcc_assert(type != NULL_TREE);
123984 + gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
123985 +
123986 + while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
123987 + fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
123988 + fn_hash_data->tree_codes_len++;
123989 + type = TREE_TYPE(type);
123990 + }
123991 +}
123992 +
123993 +static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
123994 +{
123995 + const_tree result;
123996 +
123997 + gcc_assert(node != NULL_TREE);
123998 +
123999 + if (DECL_P(node)) {
124000 + result = DECL_RESULT(node);
124001 + if (result != NULL_TREE)
124002 + return set_node_codes(TREE_TYPE(result), fn_hash_data);
124003 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
124004 + }
124005 +
124006 + gcc_assert(TYPE_P(node));
124007 +
124008 + if (TREE_CODE(node) == FUNCTION_TYPE)
124009 + return set_result_codes(TREE_TYPE(node), fn_hash_data);
124010 +
124011 + return set_node_codes(node, fn_hash_data);
124012 +}
124013 +
124014 +static void set_function_codes(struct function_hash *fn_hash_data)
124015 +{
124016 + const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
124017 + enum tree_code code = TREE_CODE(type);
124018 +
124019 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
124020 +
124021 + set_result_codes(fn_hash_data->fndecl, fn_hash_data);
124022 +
124023 + for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
124024 + set_node_codes(TREE_VALUE(arg), fn_hash_data);
124025 +}
124026 +
124027 +static const struct size_overflow_hash *get_proper_hash_chain(const struct size_overflow_hash *entry, const char *func_name)
124028 +{
124029 + while (entry) {
124030 + if (!strcmp(entry->name, func_name))
124031 + return entry;
124032 + entry = entry->next;
124033 + }
124034 + return NULL;
124035 +}
124036 +
124037 +const struct size_overflow_hash *get_function_hash(const_tree fndecl)
124038 +{
124039 + const struct size_overflow_hash *entry;
124040 + struct function_hash fn_hash_data;
124041 + const char *func_name;
124042 +
124043 + // skip builtins __builtin_constant_p
124044 + if (DECL_BUILT_IN(fndecl))
124045 + return NULL;
124046 +
124047 + fn_hash_data.fndecl = fndecl;
124048 + fn_hash_data.tree_codes_len = 0;
124049 +
124050 + set_function_codes(&fn_hash_data);
124051 + gcc_assert(fn_hash_data.tree_codes_len != 0);
124052 +
124053 + func_name = DECL_NAME_POINTER(fn_hash_data.fndecl);
124054 + set_hash(func_name, &fn_hash_data);
124055 +
124056 + entry = size_overflow_hash[fn_hash_data.hash];
124057 + entry = get_proper_hash_chain(entry, func_name);
124058 + if (entry)
124059 + return entry;
124060 + entry = size_overflow_hash_aux[fn_hash_data.hash];
124061 + return get_proper_hash_chain(entry, func_name);
124062 +}
124063 +
124064 +static void print_missing_msg(const_tree func, unsigned int argnum)
124065 +{
124066 + location_t loc;
124067 + const char *curfunc;
124068 + struct function_hash fn_hash_data;
124069 +
124070 + fn_hash_data.fndecl = DECL_ORIGIN(func);
124071 + fn_hash_data.tree_codes_len = 0;
124072 +
124073 + loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
124074 + curfunc = DECL_NAME_POINTER(fn_hash_data.fndecl);
124075 +
124076 + set_function_codes(&fn_hash_data);
124077 + set_hash(curfunc, &fn_hash_data);
124078 +
124079 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
124080 +}
124081 +
124082 +unsigned int find_arg_number_tree(const_tree arg, const_tree func)
124083 +{
124084 + tree var;
124085 + unsigned int argnum = 1;
124086 +
124087 + if (TREE_CODE(arg) == SSA_NAME)
124088 + arg = SSA_NAME_VAR(arg);
124089 +
124090 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var), argnum++) {
124091 + if (!operand_equal_p(arg, var, 0) && strcmp(DECL_NAME_POINTER(var), DECL_NAME_POINTER(arg)))
124092 + continue;
124093 + if (!skip_types(var))
124094 + return argnum;
124095 + }
124096 +
124097 + return CANNOT_FIND_ARG;
124098 +}
124099 +
124100 +static const char *get_asm_string(const_gimple stmt)
124101 +{
124102 + if (!stmt)
124103 + return NULL;
124104 + if (gimple_code(stmt) != GIMPLE_ASM)
124105 + return NULL;
124106 +
124107 + return gimple_asm_string(stmt);
124108 +}
124109 +
124110 +bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
124111 +{
124112 + const char *str;
124113 +
124114 + str = get_asm_string(stmt);
124115 + if (!str)
124116 + return false;
124117 + return !strncmp(str, TURN_OFF_ASM_STR, sizeof(TURN_OFF_ASM_STR) - 1);
124118 +}
124119 +
124120 +bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
124121 +{
124122 + const char *str;
124123 +
124124 + str = get_asm_string(stmt);
124125 + if (!str)
124126 + return false;
124127 + return !strncmp(str, YES_ASM_STR, sizeof(YES_ASM_STR) - 1);
124128 +}
124129 +
124130 +bool is_size_overflow_asm(const_gimple stmt)
124131 +{
124132 + const char *str;
124133 +
124134 + str = get_asm_string(stmt);
124135 + if (!str)
124136 + return false;
124137 + return !strncmp(str, OK_ASM_STR, sizeof(OK_ASM_STR) - 1);
124138 +}
124139 +
124140 +bool is_a_return_check(const_tree node)
124141 +{
124142 + if (TREE_CODE(node) == FUNCTION_DECL)
124143 + return true;
124144 +
124145 + gcc_assert(TREE_CODE(node) == PARM_DECL);
124146 + return false;
124147 +}
124148 +
124149 +// Get the argnum of a function decl, if node is a return then the argnum is 0
124150 +unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
124151 +{
124152 + if (is_a_return_check(node))
124153 + return 0;
124154 + else
124155 + return find_arg_number_tree(node, orig_fndecl);
124156 +}
124157 +
124158 +unsigned int get_correct_arg_count(unsigned int argnum, const_tree fndecl)
124159 +{
124160 + const struct size_overflow_hash *hash;
124161 + unsigned int new_argnum;
124162 + tree arg;
124163 + const_tree origarg;
124164 +
124165 + if (argnum == 0)
124166 + return argnum;
124167 +
124168 + hash = get_function_hash(fndecl);
124169 + if (hash && hash->param & (1U << argnum))
124170 + return argnum;
124171 +
124172 + if (DECL_EXTERNAL(fndecl))
124173 + return argnum;
124174 +
124175 + origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
124176 + argnum--;
124177 + while (origarg && argnum) {
124178 + origarg = TREE_CHAIN(origarg);
124179 + argnum--;
124180 + }
124181 + gcc_assert(argnum == 0);
124182 + gcc_assert(origarg != NULL_TREE);
124183 +
124184 + for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
124185 + if (operand_equal_p(origarg, arg, 0) || !strcmp(DECL_NAME_POINTER(origarg), DECL_NAME_POINTER(arg)))
124186 + return new_argnum;
124187 +
124188 + return CANNOT_FIND_ARG;
124189 +}
124190 +
124191 +static bool is_in_hash_table(const_tree fndecl, unsigned int num)
124192 +{
124193 + const struct size_overflow_hash *hash;
124194 +
124195 + hash = get_function_hash(fndecl);
124196 + if (hash && (hash->param & (1U << num)))
124197 + return true;
124198 + return false;
124199 +}
124200 +
124201 +/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
124202 + * If the function is missing everywhere then print the missing message into stderr.
124203 + */
124204 +bool is_missing_function(const_tree orig_fndecl, unsigned int num)
124205 +{
124206 + switch (DECL_FUNCTION_CODE(orig_fndecl)) {
124207 +#if BUILDING_GCC_VERSION >= 4008
124208 + case BUILT_IN_BSWAP16:
124209 +#endif
124210 + case BUILT_IN_BSWAP32:
124211 + case BUILT_IN_BSWAP64:
124212 + case BUILT_IN_EXPECT:
124213 + case BUILT_IN_MEMCMP:
124214 + return false;
124215 + default:
124216 + break;
124217 + }
124218 +
124219 + // skip test.c
124220 + if (strcmp(DECL_NAME_POINTER(current_function_decl), "coolmalloc")) {
124221 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
124222 + warning(0, "unnecessary size_overflow attribute on: %s\n", DECL_NAME_POINTER(orig_fndecl));
124223 + }
124224 +
124225 + if (is_in_hash_table(orig_fndecl, num))
124226 + return false;
124227 +
124228 + print_missing_msg(orig_fndecl, num);
124229 + return true;
124230 +}
124231 +
124232 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
124233 new file mode 100644
124234 index 0000000..924652b
124235 --- /dev/null
124236 +++ b/tools/gcc/stackleak_plugin.c
124237 @@ -0,0 +1,395 @@
124238 +/*
124239 + * Copyright 2011-2014 by the PaX Team <pageexec@freemail.hu>
124240 + * Licensed under the GPL v2
124241 + *
124242 + * Note: the choice of the license means that the compilation process is
124243 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
124244 + * but for the kernel it doesn't matter since it doesn't link against
124245 + * any of the gcc libraries
124246 + *
124247 + * gcc plugin to help implement various PaX features
124248 + *
124249 + * - track lowest stack pointer
124250 + *
124251 + * TODO:
124252 + * - initialize all local variables
124253 + *
124254 + * BUGS:
124255 + * - none known
124256 + */
124257 +
124258 +#include "gcc-common.h"
124259 +
124260 +int plugin_is_GPL_compatible;
124261 +
124262 +static int track_frame_size = -1;
124263 +static const char track_function[] = "pax_track_stack";
124264 +static const char check_function[] = "pax_check_alloca";
124265 +static tree track_function_decl, check_function_decl;
124266 +static bool init_locals;
124267 +
124268 +static struct plugin_info stackleak_plugin_info = {
124269 + .version = "201408011900",
124270 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
124271 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
124272 +};
124273 +
124274 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
124275 +{
124276 + gimple check_alloca;
124277 + tree alloca_size;
124278 +
124279 + // insert call to void pax_check_alloca(unsigned long size)
124280 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
124281 + check_alloca = gimple_build_call(check_function_decl, 1, alloca_size);
124282 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
124283 +}
124284 +
124285 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
124286 +{
124287 + gimple track_stack;
124288 +
124289 + // insert call to void pax_track_stack(void)
124290 + track_stack = gimple_build_call(track_function_decl, 0);
124291 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
124292 +}
124293 +
124294 +static bool is_alloca(gimple stmt)
124295 +{
124296 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
124297 + return true;
124298 +
124299 +#if BUILDING_GCC_VERSION >= 4007
124300 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
124301 + return true;
124302 +#endif
124303 +
124304 + return false;
124305 +}
124306 +
124307 +static unsigned int execute_stackleak_tree_instrument(void)
124308 +{
124309 + basic_block bb, entry_bb;
124310 + bool prologue_instrumented = false, is_leaf = true;
124311 +
124312 + entry_bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb;
124313 +
124314 + // 1. loop through BBs and GIMPLE statements
124315 + FOR_EACH_BB_FN(bb, cfun) {
124316 + gimple_stmt_iterator gsi;
124317 +
124318 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124319 + gimple stmt;
124320 +
124321 + stmt = gsi_stmt(gsi);
124322 +
124323 + if (is_gimple_call(stmt))
124324 + is_leaf = false;
124325 +
124326 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
124327 + if (!is_alloca(stmt))
124328 + continue;
124329 +
124330 + // 2. insert stack overflow check before each __builtin_alloca call
124331 + stackleak_check_alloca(&gsi);
124332 +
124333 + // 3. insert track call after each __builtin_alloca call
124334 + stackleak_add_instrumentation(&gsi);
124335 + if (bb == entry_bb)
124336 + prologue_instrumented = true;
124337 + }
124338 + }
124339 +
124340 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
124341 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
124342 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
124343 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
124344 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
124345 + return 0;
124346 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
124347 + return 0;
124348 +
124349 + // 4. insert track call at the beginning
124350 + if (!prologue_instrumented) {
124351 + gimple_stmt_iterator gsi;
124352 +
124353 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124354 + if (dom_info_available_p(CDI_DOMINATORS))
124355 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124356 + gsi = gsi_start_bb(bb);
124357 + stackleak_add_instrumentation(&gsi);
124358 + }
124359 +
124360 + return 0;
124361 +}
124362 +
124363 +static unsigned int execute_stackleak_final(void)
124364 +{
124365 + rtx insn, next;
124366 +
124367 + if (cfun->calls_alloca)
124368 + return 0;
124369 +
124370 + // keep calls only if function frame is big enough
124371 + if (get_frame_size() >= track_frame_size)
124372 + return 0;
124373 +
124374 + // 1. find pax_track_stack calls
124375 + for (insn = get_insns(); insn; insn = next) {
124376 + // 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))
124377 + rtx body;
124378 +
124379 + next = NEXT_INSN(insn);
124380 + if (!CALL_P(insn))
124381 + continue;
124382 + body = PATTERN(insn);
124383 + if (GET_CODE(body) != CALL)
124384 + continue;
124385 + body = XEXP(body, 0);
124386 + if (GET_CODE(body) != MEM)
124387 + continue;
124388 + body = XEXP(body, 0);
124389 + if (GET_CODE(body) != SYMBOL_REF)
124390 + continue;
124391 +// if (strcmp(XSTR(body, 0), track_function))
124392 + if (SYMBOL_REF_DECL(body) != track_function_decl)
124393 + continue;
124394 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124395 + // 2. delete call
124396 + delete_insn_and_edges(insn);
124397 +#if BUILDING_GCC_VERSION >= 4007
124398 + if (GET_CODE(next) == NOTE && NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
124399 + insn = next;
124400 + next = NEXT_INSN(insn);
124401 + delete_insn_and_edges(insn);
124402 + }
124403 +#endif
124404 + }
124405 +
124406 +// print_simple_rtl(stderr, get_insns());
124407 +// print_rtl(stderr, get_insns());
124408 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
124409 +
124410 + return 0;
124411 +}
124412 +
124413 +static bool gate_stackleak_track_stack(void)
124414 +{
124415 + tree section;
124416 +
124417 + if (ix86_cmodel != CM_KERNEL)
124418 + return false;
124419 +
124420 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
124421 + if (section && TREE_VALUE(section)) {
124422 + section = TREE_VALUE(TREE_VALUE(section));
124423 +
124424 + if (!strncmp(TREE_STRING_POINTER(section), ".init.text", 10))
124425 + return false;
124426 + if (!strncmp(TREE_STRING_POINTER(section), ".devinit.text", 13))
124427 + return false;
124428 + if (!strncmp(TREE_STRING_POINTER(section), ".cpuinit.text", 13))
124429 + return false;
124430 + if (!strncmp(TREE_STRING_POINTER(section), ".meminit.text", 13))
124431 + return false;
124432 + }
124433 +
124434 + return track_frame_size >= 0;
124435 +}
124436 +
124437 +static void stackleak_start_unit(void *gcc_data, void *user_data)
124438 +{
124439 + tree fntype;
124440 +
124441 + // void pax_track_stack(void)
124442 + fntype = build_function_type_list(void_type_node, NULL_TREE);
124443 + track_function_decl = build_fn_decl(track_function, fntype);
124444 + DECL_ASSEMBLER_NAME(track_function_decl); // for LTO
124445 + TREE_PUBLIC(track_function_decl) = 1;
124446 + DECL_EXTERNAL(track_function_decl) = 1;
124447 + DECL_ARTIFICIAL(track_function_decl) = 1;
124448 +
124449 + // void pax_check_alloca(unsigned long)
124450 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
124451 + check_function_decl = build_fn_decl(check_function, fntype);
124452 + DECL_ASSEMBLER_NAME(check_function_decl); // for LTO
124453 + TREE_PUBLIC(check_function_decl) = 1;
124454 + DECL_EXTERNAL(check_function_decl) = 1;
124455 + DECL_ARTIFICIAL(check_function_decl) = 1;
124456 +}
124457 +
124458 +#if BUILDING_GCC_VERSION >= 4009
124459 +static const struct pass_data stackleak_tree_instrument_pass_data = {
124460 +#else
124461 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
124462 + .pass = {
124463 +#endif
124464 + .type = GIMPLE_PASS,
124465 + .name = "stackleak_tree_instrument",
124466 +#if BUILDING_GCC_VERSION >= 4008
124467 + .optinfo_flags = OPTGROUP_NONE,
124468 +#endif
124469 +#if BUILDING_GCC_VERSION >= 4009
124470 + .has_gate = true,
124471 + .has_execute = true,
124472 +#else
124473 + .gate = gate_stackleak_track_stack,
124474 + .execute = execute_stackleak_tree_instrument,
124475 + .sub = NULL,
124476 + .next = NULL,
124477 + .static_pass_number = 0,
124478 +#endif
124479 + .tv_id = TV_NONE,
124480 + .properties_required = PROP_gimple_leh | PROP_cfg,
124481 + .properties_provided = 0,
124482 + .properties_destroyed = 0,
124483 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
124484 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa | TODO_rebuild_cgraph_edges
124485 +#if BUILDING_GCC_VERSION < 4009
124486 + }
124487 +#endif
124488 +};
124489 +
124490 +#if BUILDING_GCC_VERSION >= 4009
124491 +static const struct pass_data stackleak_final_rtl_opt_pass_data = {
124492 +#else
124493 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
124494 + .pass = {
124495 +#endif
124496 + .type = RTL_PASS,
124497 + .name = "stackleak_final",
124498 +#if BUILDING_GCC_VERSION >= 4008
124499 + .optinfo_flags = OPTGROUP_NONE,
124500 +#endif
124501 +#if BUILDING_GCC_VERSION >= 4009
124502 + .has_gate = true,
124503 + .has_execute = true,
124504 +#else
124505 + .gate = gate_stackleak_track_stack,
124506 + .execute = execute_stackleak_final,
124507 + .sub = NULL,
124508 + .next = NULL,
124509 + .static_pass_number = 0,
124510 +#endif
124511 + .tv_id = TV_NONE,
124512 + .properties_required = 0,
124513 + .properties_provided = 0,
124514 + .properties_destroyed = 0,
124515 + .todo_flags_start = 0,
124516 + .todo_flags_finish = TODO_dump_func
124517 +#if BUILDING_GCC_VERSION < 4009
124518 + }
124519 +#endif
124520 +};
124521 +
124522 +#if BUILDING_GCC_VERSION >= 4009
124523 +namespace {
124524 +class stackleak_tree_instrument_pass : public gimple_opt_pass {
124525 +public:
124526 + stackleak_tree_instrument_pass() : gimple_opt_pass(stackleak_tree_instrument_pass_data, g) {}
124527 + bool gate() { return gate_stackleak_track_stack(); }
124528 + unsigned int execute() { return execute_stackleak_tree_instrument(); }
124529 +};
124530 +
124531 +class stackleak_final_rtl_opt_pass : public rtl_opt_pass {
124532 +public:
124533 + stackleak_final_rtl_opt_pass() : rtl_opt_pass(stackleak_final_rtl_opt_pass_data, g) {}
124534 + bool gate() { return gate_stackleak_track_stack(); }
124535 + unsigned int execute() { return execute_stackleak_final(); }
124536 +};
124537 +}
124538 +
124539 +static opt_pass *make_stackleak_tree_instrument_pass(void)
124540 +{
124541 + return new stackleak_tree_instrument_pass();
124542 +}
124543 +
124544 +static opt_pass *make_stackleak_final_rtl_opt_pass(void)
124545 +{
124546 + return new stackleak_final_rtl_opt_pass();
124547 +}
124548 +#else
124549 +static struct opt_pass *make_stackleak_tree_instrument_pass(void)
124550 +{
124551 + return &stackleak_tree_instrument_pass.pass;
124552 +}
124553 +
124554 +static struct opt_pass *make_stackleak_final_rtl_opt_pass(void)
124555 +{
124556 + return &stackleak_final_rtl_opt_pass.pass;
124557 +}
124558 +#endif
124559 +
124560 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124561 +{
124562 + const char * const plugin_name = plugin_info->base_name;
124563 + const int argc = plugin_info->argc;
124564 + const struct plugin_argument * const argv = plugin_info->argv;
124565 + int i;
124566 + struct register_pass_info stackleak_tree_instrument_pass_info;
124567 + struct register_pass_info stackleak_final_pass_info;
124568 + static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
124569 + {
124570 + .base = &track_function_decl,
124571 + .nelt = 1,
124572 + .stride = sizeof(track_function_decl),
124573 + .cb = &gt_ggc_mx_tree_node,
124574 + .pchw = &gt_pch_nx_tree_node
124575 + },
124576 + {
124577 + .base = &check_function_decl,
124578 + .nelt = 1,
124579 + .stride = sizeof(check_function_decl),
124580 + .cb = &gt_ggc_mx_tree_node,
124581 + .pchw = &gt_pch_nx_tree_node
124582 + },
124583 + LAST_GGC_ROOT_TAB
124584 + };
124585 +
124586 + stackleak_tree_instrument_pass_info.pass = make_stackleak_tree_instrument_pass();
124587 +// stackleak_tree_instrument_pass_info.reference_pass_name = "tree_profile";
124588 + stackleak_tree_instrument_pass_info.reference_pass_name = "optimized";
124589 + stackleak_tree_instrument_pass_info.ref_pass_instance_number = 1;
124590 + stackleak_tree_instrument_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124591 +
124592 + stackleak_final_pass_info.pass = make_stackleak_final_rtl_opt_pass();
124593 + stackleak_final_pass_info.reference_pass_name = "final";
124594 + stackleak_final_pass_info.ref_pass_instance_number = 1;
124595 + stackleak_final_pass_info.pos_op = PASS_POS_INSERT_BEFORE;
124596 +
124597 + if (!plugin_default_version_check(version, &gcc_version)) {
124598 + error(G_("incompatible gcc/plugin versions"));
124599 + return 1;
124600 + }
124601 +
124602 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
124603 +
124604 + for (i = 0; i < argc; ++i) {
124605 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
124606 + if (!argv[i].value) {
124607 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124608 + continue;
124609 + }
124610 + track_frame_size = atoi(argv[i].value);
124611 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
124612 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124613 + continue;
124614 + }
124615 + if (!strcmp(argv[i].key, "initialize-locals")) {
124616 + if (argv[i].value) {
124617 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
124618 + continue;
124619 + }
124620 + init_locals = true;
124621 + continue;
124622 + }
124623 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124624 + }
124625 +
124626 + register_callback(plugin_name, PLUGIN_START_UNIT, &stackleak_start_unit, NULL);
124627 + register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL, (void *)&gt_ggc_r_gt_stackleak);
124628 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
124629 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
124630 +
124631 + return 0;
124632 +}
124633 diff --git a/tools/gcc/structleak_plugin.c b/tools/gcc/structleak_plugin.c
124634 new file mode 100644
124635 index 0000000..4ee2231
124636 --- /dev/null
124637 +++ b/tools/gcc/structleak_plugin.c
124638 @@ -0,0 +1,274 @@
124639 +/*
124640 + * Copyright 2013-2014 by PaX Team <pageexec@freemail.hu>
124641 + * Licensed under the GPL v2
124642 + *
124643 + * Note: the choice of the license means that the compilation process is
124644 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
124645 + * but for the kernel it doesn't matter since it doesn't link against
124646 + * any of the gcc libraries
124647 + *
124648 + * gcc plugin to forcibly initialize certain local variables that could
124649 + * otherwise leak kernel stack to userland if they aren't properly initialized
124650 + * by later code
124651 + *
124652 + * Homepage: http://pax.grsecurity.net/
124653 + *
124654 + * Usage:
124655 + * $ # for 4.5/4.6/C based 4.7
124656 + * $ 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
124657 + * $ # for C++ based 4.7/4.8+
124658 + * $ 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
124659 + * $ gcc -fplugin=./structleak_plugin.so test.c -O2
124660 + *
124661 + * TODO: eliminate redundant initializers
124662 + * increase type coverage
124663 + */
124664 +
124665 +#include "gcc-common.h"
124666 +
124667 +// unused C type flag in all versions 4.5-4.9
124668 +#define TYPE_USERSPACE(TYPE) TYPE_LANG_FLAG_3(TYPE)
124669 +
124670 +int plugin_is_GPL_compatible;
124671 +
124672 +static struct plugin_info structleak_plugin_info = {
124673 + .version = "201401260140",
124674 + .help = "disable\tdo not activate plugin\n",
124675 +};
124676 +
124677 +static tree handle_user_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
124678 +{
124679 + *no_add_attrs = true;
124680 +
124681 + // check for types? for now accept everything linux has to offer
124682 + if (TREE_CODE(*node) != FIELD_DECL)
124683 + return NULL_TREE;
124684 +
124685 + *no_add_attrs = false;
124686 + return NULL_TREE;
124687 +}
124688 +
124689 +static struct attribute_spec user_attr = {
124690 + .name = "user",
124691 + .min_length = 0,
124692 + .max_length = 0,
124693 + .decl_required = false,
124694 + .type_required = false,
124695 + .function_type_required = false,
124696 + .handler = handle_user_attribute,
124697 +#if BUILDING_GCC_VERSION >= 4007
124698 + .affects_type_identity = true
124699 +#endif
124700 +};
124701 +
124702 +static void register_attributes(void *event_data, void *data)
124703 +{
124704 + register_attribute(&user_attr);
124705 +// register_attribute(&force_attr);
124706 +}
124707 +
124708 +static tree get_field_type(tree field)
124709 +{
124710 + return strip_array_types(TREE_TYPE(field));
124711 +}
124712 +
124713 +static bool is_userspace_type(tree type)
124714 +{
124715 + tree field;
124716 +
124717 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
124718 + tree fieldtype = get_field_type(field);
124719 + enum tree_code code = TREE_CODE(fieldtype);
124720 +
124721 + if (code == RECORD_TYPE || code == UNION_TYPE)
124722 + if (is_userspace_type(fieldtype))
124723 + return true;
124724 +
124725 + if (lookup_attribute("user", DECL_ATTRIBUTES(field)))
124726 + return true;
124727 + }
124728 + return false;
124729 +}
124730 +
124731 +static void finish_type(void *event_data, void *data)
124732 +{
124733 + tree type = (tree)event_data;
124734 +
124735 + if (TYPE_USERSPACE(type))
124736 + return;
124737 +
124738 + if (is_userspace_type(type))
124739 + TYPE_USERSPACE(type) = 1;
124740 +}
124741 +
124742 +static void initialize(tree var)
124743 +{
124744 + basic_block bb;
124745 + gimple_stmt_iterator gsi;
124746 + tree initializer;
124747 + gimple init_stmt;
124748 +
124749 + // this is the original entry bb before the forced split
124750 + // TODO: check further BBs in case more splits occured before us
124751 + bb = ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb->next_bb;
124752 +
124753 + // first check if the variable is already initialized, warn otherwise
124754 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
124755 + gimple stmt = gsi_stmt(gsi);
124756 + tree rhs1;
124757 +
124758 + // we're looking for an assignment of a single rhs...
124759 + if (!gimple_assign_single_p(stmt))
124760 + continue;
124761 + rhs1 = gimple_assign_rhs1(stmt);
124762 +#if BUILDING_GCC_VERSION >= 4007
124763 + // ... of a non-clobbering expression...
124764 + if (TREE_CLOBBER_P(rhs1))
124765 + continue;
124766 +#endif
124767 + // ... to our variable...
124768 + if (gimple_get_lhs(stmt) != var)
124769 + continue;
124770 + // if it's an initializer then we're good
124771 + if (TREE_CODE(rhs1) == CONSTRUCTOR)
124772 + return;
124773 + }
124774 +
124775 + // these aren't the 0days you're looking for
124776 +// inform(DECL_SOURCE_LOCATION(var), "userspace variable will be forcibly initialized");
124777 +
124778 + // build the initializer expression
124779 + initializer = build_constructor(TREE_TYPE(var), NULL);
124780 +
124781 + // build the initializer stmt
124782 + init_stmt = gimple_build_assign(var, initializer);
124783 + gsi = gsi_start_bb(ENTRY_BLOCK_PTR_FOR_FN(cfun)->next_bb);
124784 + gsi_insert_before(&gsi, init_stmt, GSI_NEW_STMT);
124785 + update_stmt(init_stmt);
124786 +}
124787 +
124788 +static unsigned int handle_function(void)
124789 +{
124790 + basic_block bb;
124791 + unsigned int ret = 0;
124792 + tree var;
124793 + unsigned int i;
124794 +
124795 + // split the first bb where we can put the forced initializers
124796 + bb = split_block_after_labels(ENTRY_BLOCK_PTR_FOR_FN(cfun))->dest;
124797 + if (dom_info_available_p(CDI_DOMINATORS))
124798 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR_FOR_FN(cfun));
124799 +
124800 + // enumarate all local variables and forcibly initialize our targets
124801 + FOR_EACH_LOCAL_DECL(cfun, i, var) {
124802 + tree type = TREE_TYPE(var);
124803 +
124804 + gcc_assert(DECL_P(var));
124805 + if (!auto_var_in_fn_p(var, current_function_decl))
124806 + continue;
124807 +
124808 + // only care about structure types
124809 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
124810 + continue;
124811 +
124812 + // if the type is of interest, examine the variable
124813 + if (TYPE_USERSPACE(type))
124814 + initialize(var);
124815 + }
124816 +
124817 + return ret;
124818 +}
124819 +
124820 +#if BUILDING_GCC_VERSION >= 4009
124821 +static const struct pass_data structleak_pass_data = {
124822 +#else
124823 +static struct gimple_opt_pass structleak_pass = {
124824 + .pass = {
124825 +#endif
124826 + .type = GIMPLE_PASS,
124827 + .name = "structleak",
124828 +#if BUILDING_GCC_VERSION >= 4008
124829 + .optinfo_flags = OPTGROUP_NONE,
124830 +#endif
124831 +#if BUILDING_GCC_VERSION >= 4009
124832 + .has_gate = false,
124833 + .has_execute = true,
124834 +#else
124835 + .gate = NULL,
124836 + .execute = handle_function,
124837 + .sub = NULL,
124838 + .next = NULL,
124839 + .static_pass_number = 0,
124840 +#endif
124841 + .tv_id = TV_NONE,
124842 + .properties_required = PROP_cfg,
124843 + .properties_provided = 0,
124844 + .properties_destroyed = 0,
124845 + .todo_flags_start = 0,
124846 + .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
124847 +#if BUILDING_GCC_VERSION < 4009
124848 + }
124849 +#endif
124850 +};
124851 +
124852 +#if BUILDING_GCC_VERSION >= 4009
124853 +namespace {
124854 +class structleak_pass : public gimple_opt_pass {
124855 +public:
124856 + structleak_pass() : gimple_opt_pass(structleak_pass_data, g) {}
124857 + unsigned int execute() { return handle_function(); }
124858 +};
124859 +}
124860 +
124861 +static opt_pass *make_structleak_pass(void)
124862 +{
124863 + return new structleak_pass();
124864 +}
124865 +#else
124866 +static struct opt_pass *make_structleak_pass(void)
124867 +{
124868 + return &structleak_pass.pass;
124869 +}
124870 +#endif
124871 +
124872 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
124873 +{
124874 + int i;
124875 + const char * const plugin_name = plugin_info->base_name;
124876 + const int argc = plugin_info->argc;
124877 + const struct plugin_argument * const argv = plugin_info->argv;
124878 + bool enable = true;
124879 + struct register_pass_info structleak_pass_info;
124880 +
124881 + structleak_pass_info.pass = make_structleak_pass();
124882 + structleak_pass_info.reference_pass_name = "ssa";
124883 + structleak_pass_info.ref_pass_instance_number = 1;
124884 + structleak_pass_info.pos_op = PASS_POS_INSERT_AFTER;
124885 +
124886 + if (!plugin_default_version_check(version, &gcc_version)) {
124887 + error(G_("incompatible gcc/plugin versions"));
124888 + return 1;
124889 + }
124890 +
124891 + if (strcmp(lang_hooks.name, "GNU C")) {
124892 + inform(UNKNOWN_LOCATION, G_("%s supports C only"), plugin_name);
124893 + enable = false;
124894 + }
124895 +
124896 + for (i = 0; i < argc; ++i) {
124897 + if (!strcmp(argv[i].key, "disable")) {
124898 + enable = false;
124899 + continue;
124900 + }
124901 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
124902 + }
124903 +
124904 + register_callback(plugin_name, PLUGIN_INFO, NULL, &structleak_plugin_info);
124905 + if (enable) {
124906 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &structleak_pass_info);
124907 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
124908 + }
124909 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
124910 +
124911 + return 0;
124912 +}
124913 diff --git a/tools/include/linux/compiler.h b/tools/include/linux/compiler.h
124914 index 88461f0..6fb70a0 100644
124915 --- a/tools/include/linux/compiler.h
124916 +++ b/tools/include/linux/compiler.h
124917 @@ -35,6 +35,14 @@
124918 # define unlikely(x) __builtin_expect(!!(x), 0)
124919 #endif
124920
124921 +#ifndef __size_overflow
124922 +# define __size_overflow(...)
124923 +#endif
124924 +
124925 +#ifndef __intentional_overflow
124926 +# define __intentional_overflow(...)
124927 +#endif
124928 +
124929 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
124930
124931 #endif /* _TOOLS_LINUX_COMPILER_H */
124932 diff --git a/tools/lib/api/Makefile b/tools/lib/api/Makefile
124933 index 36c08b1..87c72d1 100644
124934 --- a/tools/lib/api/Makefile
124935 +++ b/tools/lib/api/Makefile
124936 @@ -21,7 +21,7 @@ LIB_OBJS += $(OUTPUT)fd/array.o
124937
124938 LIBFILE = libapikfs.a
124939
124940 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124941 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
124942 EXTLIBS = -lelf -lpthread -lrt -lm
124943 ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
124944 ALL_LDFLAGS = $(LDFLAGS)
124945 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
124946 index 6789d788..4afd019e 100644
124947 --- a/tools/perf/util/include/asm/alternative-asm.h
124948 +++ b/tools/perf/util/include/asm/alternative-asm.h
124949 @@ -5,4 +5,7 @@
124950
124951 #define altinstruction_entry #
124952
124953 + .macro pax_force_retaddr rip=0, reload=0
124954 + .endm
124955 +
124956 #endif
124957 diff --git a/tools/virtio/linux/uaccess.h b/tools/virtio/linux/uaccess.h
124958 index 0a578fe..b81f62d 100644
124959 --- a/tools/virtio/linux/uaccess.h
124960 +++ b/tools/virtio/linux/uaccess.h
124961 @@ -13,7 +13,7 @@ static inline void __chk_user_ptr(const volatile void *p, size_t size)
124962 ({ \
124963 typeof(ptr) __pu_ptr = (ptr); \
124964 __chk_user_ptr(__pu_ptr, sizeof(*__pu_ptr)); \
124965 - ACCESS_ONCE(*(__pu_ptr)) = x; \
124966 + ACCESS_ONCE_RW(*(__pu_ptr)) = x; \
124967 0; \
124968 })
124969
124970 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
124971 index 3cee7b1..29cb7d8 100644
124972 --- a/virt/kvm/kvm_main.c
124973 +++ b/virt/kvm/kvm_main.c
124974 @@ -78,12 +78,17 @@ LIST_HEAD(vm_list);
124975
124976 static cpumask_var_t cpus_hardware_enabled;
124977 static int kvm_usage_count = 0;
124978 -static atomic_t hardware_enable_failed;
124979 +static atomic_unchecked_t hardware_enable_failed;
124980
124981 struct kmem_cache *kvm_vcpu_cache;
124982 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
124983
124984 -static __read_mostly struct preempt_ops kvm_preempt_ops;
124985 +static void kvm_sched_in(struct preempt_notifier *pn, int cpu);
124986 +static void kvm_sched_out(struct preempt_notifier *pn, struct task_struct *next);
124987 +static struct preempt_ops kvm_preempt_ops = {
124988 + .sched_in = kvm_sched_in,
124989 + .sched_out = kvm_sched_out,
124990 +};
124991
124992 struct dentry *kvm_debugfs_dir;
124993
124994 @@ -786,7 +791,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
124995 /* We can read the guest memory with __xxx_user() later on. */
124996 if ((mem->slot < KVM_USER_MEM_SLOTS) &&
124997 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
124998 - !access_ok(VERIFY_WRITE,
124999 + !access_ok_noprefault(VERIFY_WRITE,
125000 (void __user *)(unsigned long)mem->userspace_addr,
125001 mem->memory_size)))
125002 goto out;
125003 @@ -1690,9 +1695,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
125004
125005 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
125006 {
125007 - const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
125008 + int r;
125009 + unsigned long addr;
125010
125011 - return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
125012 + addr = gfn_to_hva(kvm, gfn);
125013 + if (kvm_is_error_hva(addr))
125014 + return -EFAULT;
125015 + r = __clear_user((void __user *)addr + offset, len);
125016 + if (r)
125017 + return -EFAULT;
125018 + mark_page_dirty(kvm, gfn);
125019 + return 0;
125020 }
125021 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
125022
125023 @@ -1941,7 +1954,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
125024 return 0;
125025 }
125026
125027 -static struct file_operations kvm_vcpu_fops = {
125028 +static file_operations_no_const kvm_vcpu_fops __read_only = {
125029 .release = kvm_vcpu_release,
125030 .unlocked_ioctl = kvm_vcpu_ioctl,
125031 #ifdef CONFIG_COMPAT
125032 @@ -2650,7 +2663,7 @@ out:
125033 }
125034 #endif
125035
125036 -static struct file_operations kvm_vm_fops = {
125037 +static file_operations_no_const kvm_vm_fops __read_only = {
125038 .release = kvm_vm_release,
125039 .unlocked_ioctl = kvm_vm_ioctl,
125040 #ifdef CONFIG_COMPAT
125041 @@ -2721,7 +2734,7 @@ out:
125042 return r;
125043 }
125044
125045 -static struct file_operations kvm_chardev_ops = {
125046 +static file_operations_no_const kvm_chardev_ops __read_only = {
125047 .unlocked_ioctl = kvm_dev_ioctl,
125048 .compat_ioctl = kvm_dev_ioctl,
125049 .llseek = noop_llseek,
125050 @@ -2747,7 +2760,7 @@ static void hardware_enable_nolock(void *junk)
125051
125052 if (r) {
125053 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
125054 - atomic_inc(&hardware_enable_failed);
125055 + atomic_inc_unchecked(&hardware_enable_failed);
125056 printk(KERN_INFO "kvm: enabling virtualization on "
125057 "CPU%d failed\n", cpu);
125058 }
125059 @@ -2803,10 +2816,10 @@ static int hardware_enable_all(void)
125060
125061 kvm_usage_count++;
125062 if (kvm_usage_count == 1) {
125063 - atomic_set(&hardware_enable_failed, 0);
125064 + atomic_set_unchecked(&hardware_enable_failed, 0);
125065 on_each_cpu(hardware_enable_nolock, NULL, 1);
125066
125067 - if (atomic_read(&hardware_enable_failed)) {
125068 + if (atomic_read_unchecked(&hardware_enable_failed)) {
125069 hardware_disable_all_nolock();
125070 r = -EBUSY;
125071 }
125072 @@ -3213,7 +3226,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
125073 kvm_arch_vcpu_put(vcpu);
125074 }
125075
125076 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
125077 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
125078 struct module *module)
125079 {
125080 int r;
125081 @@ -3260,7 +3273,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
125082 if (!vcpu_align)
125083 vcpu_align = __alignof__(struct kvm_vcpu);
125084 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
125085 - 0, NULL);
125086 + SLAB_USERCOPY, NULL);
125087 if (!kvm_vcpu_cache) {
125088 r = -ENOMEM;
125089 goto out_free_3;
125090 @@ -3270,9 +3283,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
125091 if (r)
125092 goto out_free;
125093
125094 + pax_open_kernel();
125095 kvm_chardev_ops.owner = module;
125096 kvm_vm_fops.owner = module;
125097 kvm_vcpu_fops.owner = module;
125098 + pax_close_kernel();
125099
125100 r = misc_register(&kvm_dev);
125101 if (r) {
125102 @@ -3282,9 +3297,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
125103
125104 register_syscore_ops(&kvm_syscore_ops);
125105
125106 - kvm_preempt_ops.sched_in = kvm_sched_in;
125107 - kvm_preempt_ops.sched_out = kvm_sched_out;
125108 -
125109 r = kvm_init_debug();
125110 if (r) {
125111 printk(KERN_ERR "kvm: create debugfs files failed\n");
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)